Upgrage to 0.6.22tizen_7.0_m2_releasetizen_6.5.m2_releasesubmit/tizen_6.5/20211028.163501submit/tizen/20201026.023621accepted/tizen/unified/20201028.123852accepted/tizen/7.0/unified/hotfix/20221116.110951accepted/tizen/7.0/unified/20221110.063417accepted/tizen/6.5/unified/20211029.013555tizen_7.0_hotfixtizen_7.0tizen_6.5accepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unifiedaccepted/tizen_6.5_unified

Change-Id: I19b63acfb173b87854929a93779071e580f8bb98
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

187 files changed, 28902 insertions, 36295 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 0000000..202f57e
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,27 @@
+# AppVeyor CI configuration file https://www.appveyor.com
+environment:
+  CYGWIN_MIRROR: http://cygwin.mirror.constant.com
+  matrix:
+  - CONFIG: cygwin
+  - CONFIG: cygwin64
+  - CONFIG: msys2
+
+install:
+- cmd: if [%CONFIG%]==[cygwin] (
+    C:\cygwin\setup-x86.exe -qgnNdO -l C:\cygwin\var\cache\setup -R c:\cygwin -s "%CYGWIN_MIRROR%" -P libiconv-devel )
+- cmd: if [%CONFIG%]==[cygwin64] (
+    C:\cygwin64\setup-x86_64.exe -qgnNdO -l C:\cygwin64\var\cache\setup -R c:\cygwin64 -s "%CYGWIN_MIRROR%" -P libiconv-devel )
+- cmd: if [%CONFIG%]==[msys2] (
+    set "PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%" )
+
+build_script:
+- cmd: if not [%CONFIG%]==[msys2] (
+    C:\%CONFIG%\bin\bash -e -l -c "cd $APPVEYOR_BUILD_FOLDER && autoreconf -sif && ./configure --prefix=$HOME --disable-dependency-tracking && make V=1 LDFLAGS='-lintl' && make V=1 install" )
+- cmd: if [%CONFIG%]==[msys2] (
+    bash -lc "set -x; cd $APPVEYOR_BUILD_FOLDER && autoreconf -sivf && ./configure --prefix=$HOME/install --disable-dependency-tracking && make V=1 && make V=1 install" )
+
+test_script:
+- cmd: if not [%CONFIG%]==[msys2] (
+    C:\%CONFIG%\bin\bash -e -l -c "cd $APPVEYOR_BUILD_FOLDER && make V=1 check" )
+- cmd: if [%CONFIG%]==[msys2] (
+    bash -lc "cd $APPVEYOR_BUILD_FOLDER && make V=1 check" )
diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 0000000..aaa3221
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,31 @@
+# Cirrus CI configuration
+# https://cirrus-ci.com/github/libexif/libexif
+
+task:
+  name: FreeBSD
+  freebsd_instance:
+    matrix:
+      # There isn't a stable 13.0 image yet (2019-12)
+      image_family: freebsd-13-0-snap
+      image_family: freebsd-12-1
+      # The stable 11.3 image causes "Agent is not responding" so use a snapshot
+      image_family: freebsd-11-3-snap
+
+  env:
+    # Set to 10 instead of 1 to avoid problems when new commits are submitted
+    # during a run.
+    CIRRUS_CLONE_DEPTH: 10
+    CFLAGS: -Wall -Wextra -O2
+    MAKE_FLAGS: -j 2
+
+  pkginstall_script:
+    - pkg install -y autoconf automake libtool gettext-tools gettext-runtime
+  configure_script:
+    - autoreconf -sivf
+    - ./configure --disable-dependency-tracking CFLAGS="$CFLAGS" || { tail -300 config.log; false; }
+  compile_script:
+    - make V=1
+  test_script:
+    - make V=1 check
+  install_script:
+    - make V=1 install
diff --git a/.gbs.conf b/.gbs.conf
new file mode 100644
index 0000000..632247a
--- /dev/null
+++ b/.gbs.conf
@@ -0,0 +1,3 @@
+[general]
+upstream_branch = upstream/master
+upstream_tag = libexif-0_6_22-release
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7ce644e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,67 @@
+# CVS default ignores begin
+tags
+TAGS
+.make.state
+.nse_depinfo
+*~
+#*
+.#*
+,*
+_$*
+*$
+*.old
+*.bak
+*.BAK
+*.orig
+*.rej
+.del-*
+*.a
+*.olb
+*.o
+*.obj
+*.so
+*.exe
+*.Z
+*.elc
+*.ln
+core
+# CVS default ignores end
+m4
+auto-m4
+intl
+autom4te.cache
+configure.scan
+autoscan.log
+*.tar.gz
+*.tar.bz2
+Makefile
+Makefile.in
+aclocal.m4
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+config.rpath
+configure
+install-sh
+*.pc
+*.spec
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+stamp-h
+stamp-h1
+stamp-h.in
+conftest
+conftest.c
+ABOUT-NLS
+ar-lib
+compile
+depcomp
+INSTALL
+test-driver
+ChangeLog.git
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ce0b95d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,240 @@
+# Travis CI configuration file
+
+sudo: false
+
+language: c
+
+git:
+  # Set to 10 instead of 1 to avoid problems when the most recent commits have [skip ci]
+  depth: 10
+
+# Install autopoint on Ubuntu (needed for gettext)
+# This is ignored on bionic for some reason (see below).
+addons:
+  apt:
+    packages:
+    - autopoint
+
+env:
+  # More configurations are configured in the matrix section
+  matrix:
+    - CONFIG=normal
+    - CONFIG=c90
+    - CONFIG=stackprotect
+    - CONFIG=disable-nls
+  global:
+    - MAKEFLAGS='-j 2'
+
+compiler:
+  - clang
+  - gcc
+
+os:
+  - linux
+  - osx
+
+matrix:
+  include:
+  - env: CONFIG=normal DIST=bionic
+    os: linux
+    dist: bionic
+    compiler: gcc
+  - env: CONFIG=normal DIST=bionic
+    os: linux
+    dist: bionic
+    compiler: clang
+  - env: CONFIG=clang6 DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: clang
+    addons:
+      apt:
+        packages:
+          - autopoint
+          - clang-6.0
+  - env: CONFIG=clang8 DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: clang
+    addons:
+      apt:
+        sources:
+          - llvm-toolchain-trusty-8
+        packages:
+          - autopoint
+          - clang-8
+  - env: CONFIG=clang9 DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: clang
+    addons:
+      apt:
+        sources:
+          sourceline:
+            - deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main
+          key_url:
+            - https://apt.llvm.org/llvm-snapshot.gpg.key
+        packages:
+          - autopoint
+          - clang-9
+  - env: CONFIG=clang10 DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: clang
+    addons:
+      apt:
+        sources:
+          sourceline:
+            - deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main
+          key_url:
+            - https://apt.llvm.org/llvm-snapshot.gpg.key
+        packages:
+          - autopoint
+          - clang-10
+  - env: CONFIG=gcc8 DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+          sourceline:
+            - ppa:ubuntu-toolchain-r/test
+        packages:
+          - autopoint
+          - g++-8
+  - env: CONFIG=gcc9 DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+          sourceline:
+            - ppa:ubuntu-toolchain-r/test
+        packages:
+          - autopoint
+          - g++-9
+  - env: CONFIG=arm-cross DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - autopoint
+          - gcc-4.8-arm-linux-gnueabihf
+          - libc6-dev-armhf-cross
+  - env: CONFIG=musl DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - autopoint
+          - musl-tools
+  - env: CONFIG=sanitize DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: clang
+    addons:
+      apt:
+        sources:
+          sourceline:
+            - deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main
+          key_url:
+            - https://apt.llvm.org/llvm-snapshot.gpg.key
+        packages:
+          - autopoint
+          - clang-10
+          - libtool
+    # Required for -fsanitize=undefined
+    # see https://github.com/travis-ci/travis-ci/issues/9033
+    sudo: required
+  - env: CONFIG=coverage DIST=xenial
+    os: linux
+    dist: xenial
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - autopoint
+          - libpopt-dev
+          - subversion
+    cache:
+      directories:
+        - $HOME/failmalloc
+  - env: CONFIG=normal DIST=bionic
+    arch: arm64
+    os: linux
+    dist: bionic
+    compiler: gcc
+  - env: CONFIG=normal DIST=bionic
+    arch: ppc64le
+    os: linux
+    dist: bionic
+    compiler: gcc
+
+before_install:
+  # The apt addons section is ignored on bionic for some reason
+  - if [ "$DIST" = "bionic" ] ; then sudo apt-get install -y autopoint gettext libtool; fi
+
+install:
+  - |
+    if [ "$CONFIG" = "coverage" ] ; then
+      set -e
+      pip install --user cpp-coveralls
+      cd "$HOME"
+      git clone --depth=1 https://github.com/libexif/libexif-testsuite.git
+      cd libexif-testsuite
+      mkdir src
+      ln -s "$TRAVIS_BUILD_DIR" src/libexif
+      ./build-config.sh
+      autoreconf -sivf
+      cd "$HOME"
+      # Failmalloc for improved test coverage
+      if [ ! -e "$HOME/failmalloc/lib/libfailmalloc.so.0" ] ; then
+        curl -fsSORL --retry 8 https://download.savannah.nongnu.org/releases/failmalloc/failmalloc-1.0.tar.gz
+        tar xaf failmalloc-1.0.tar.gz
+        cd failmalloc-1.0
+        # Fix compiling with modern glibc
+        sed -i -e 's/\(__malloc_initialize_hook\)/volatile \1/' failmalloc.c
+        # Disable failmalloc on program exit so system code can run unimpeded
+        sed -i -e '/failmalloc_init/,${/failmalloc_install/aatexit(failmalloc_uninstall);
+        }' failmalloc.c
+        ./configure --prefix="$HOME/failmalloc" --disable-dependency-tracking
+        make
+        make install
+      fi
+      cd "$TRAVIS_BUILD_DIR"
+    fi
+
+script:
+  # Ensure brew gettext is in the PATH so autopoint is found on OS X
+  - PATH="$PATH:/usr/local/opt/gettext/bin" autoreconf -sivf
+  - if [ "$CONFIG" = "normal" ] ; then CFLAGS='-Wall -Wextra -O3'; fi
+  - if [ "$CONFIG" = "c90" ] ; then CFLAGS='-std=iso9899:1990 -D_XOPEN_SOURCE=500 -Wall -Wextra -O3'; fi
+  - if [ "$CONFIG" = "stackprotect" ] ; then CFLAGS='-g -O0 -fstack-protector-all'; fi
+  - if [ "$CONFIG" = "disable-nls" ] ; then CFLAGS='-Wall -Wextra -O3'; CONFIGURE_OPTS='--disable-nls'; fi
+  - if [ "$CONFIG" = "clang6" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=clang-6.0; fi
+  - if [ "$CONFIG" = "clang8" ] ; then CFLAGS='-Wall -Wextra -Wno-error=switch -O3'; MAKE_OPTS="CFLAGS+=-Werror CFLAGS+=${CFLAGS// / CFLAGS+=}"; export CC=clang-8; fi
+  - if [ "$CONFIG" = "clang9" ] ; then CFLAGS='-Wall -Wextra -Wno-error=switch -O3'; MAKE_OPTS="CFLAGS+=-Werror CFLAGS+=${CFLAGS// / CFLAGS+=}"; export CC=clang-9; fi
+  - if [ "$CONFIG" = "clang10" ] ; then CFLAGS='-Wall -Wextra -Wno-error=switch -O3'; MAKE_OPTS="CFLAGS+=-Werror CFLAGS+=${CFLAGS// / CFLAGS+=}"; export CC=clang-10; fi
+  - if [ "$CONFIG" = "gcc8" ] ; then CFLAGS='-Wall -Wextra -Wno-error=switch -Wno-error=implicit-fallthrough -O3'; MAKE_OPTS="CFLAGS+=-Werror CFLAGS+=${CFLAGS// / CFLAGS+=}"; export CC=gcc-8; fi
+  - if [ "$CONFIG" = "gcc9" ] ; then CFLAGS='-Wall -Wextra -Wno-error=switch -Wno-error=implicit-fallthrough -O3'; MAKE_OPTS="CFLAGS+=-Werror CFLAGS+=${CFLAGS// / CFLAGS+=}"; export CC=gcc-9; fi
+  - if [ "$CONFIG" = "arm-cross" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=arm-linux-gnueabihf-gcc-4.8; CONFIGURE_OPTS='--host=arm-linux-gnueabihf'; fi
+  - if [ "$CONFIG" = "musl" ] ; then CFLAGS='-Wall -Wextra -O3'; export CC=musl-gcc; CONFIGURE_OPTS='--disable-shared'; fi
+  - if [ "$CONFIG" = "sanitize" ] ; then CFLAGS='-g -Wall -Wextra -fsanitize=address -fsanitize=undefined -fsanitize-address-use-after-scope'; export CC=clang-10; export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_leaks=1; fi
+  - if [ "$CONFIG" = "coverage" ] ; then cd "$HOME"/libexif-testsuite; CFLAGS=--coverage; CONFIGURE_OPTS="LDFLAGS=--coverage --with-failmalloc=$HOME/failmalloc/lib"; fi
+  - ./configure --prefix="$HOME"/install --disable-dependency-tracking CFLAGS="$CFLAGS" $CONFIGURE_OPTS || { tail -n 300 config.log; false; }
+
+  - make V=1 $MAKE_OPTS
+  # Skip tests when cross compiling.
+  - if [ "$CONFIG" != "arm-cross" ] ; then make V=1 $MAKE_OPTS check || { tail -n 300 test*/test-suite.log src/libexif/test*/test-suite.log; false; }; fi
+  - make V=1 $MAKE_OPTS install
+
+  - if [ "$CONFIG" = "coverage" ] ; then cd "$TRAVIS_BUILD_DIR"; fi
+
+after_success:
+  - if [ "$CONFIG" = "coverage" ] ; then coveralls --build-root libexif --exclude test --exclude contrib --gcov-options '\-lp'; fi
diff --git a/AUTHORS b/AUTHORS
index 127a5b4..f4f217f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,3 +2,5 @@ Lutz Mueller <urc8@rz.uni-karlsruhe.de>
 Jan Patera <patera@users.sourceforge.net>
 Hans Ulrich Niedermann <gp@n-dimensional.de>
 Hubert Figuiere <hub@figuiere.net>
+Dan Fandrich <dan@coneharvesters.com>
+Marcus Meissner <marcus@jet.franken.de>
diff --git a/ChangeLog b/ChangeLog
index b9b01d7..0c46100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2016-09-01  Dan Fandrich <dan@coneharvesters.com>
+	* po/sv.po: Updated Swedish translation by Sebastian Rasmussen
+	* Updated many translations from launchpad.net
+	* Added new translation from launchpad.net's "yakkety" translations:
+	* po/ms.po: Added Malay translation by abuyop
+
+2014-01-05  Dan Fandrich <dan@coneharvesters.com>
+
+	* po/es.po: Updated Spanish translation by Antonio Ceballos
+
+2013-07-13  Dan Fandrich <dan@coneharvesters.com>
+
+	* Fixed a C89 compatibility issue (bug #117 reported by
+	  Guenter Knauf)
+	* po/da.po: Updated Danish translation by Joe Hansen
+	* po/de.po: Updated German translation by Christian Kirbach
+	* po/fr.po: Updated French translation by Frédéric Marchal
+	* po/uk.po: Updated Ukrainian translation by Yuri Chornoivan
+
+2013-02-23  Dan Fandrich <dan@coneharvesters.com>
+
+	* po/pl.po: Updated Polish translation by Jakub Bogusz
+
 2012-07-12  Dan Fandrich <dan@coneharvesters.com>
 
 	* Fixed some buffer overflows in exif_entry_format_value()
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 7d1c323..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,365 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index 20ce5df..0f4d040 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,43 +12,35 @@ EXTRA_DIST += libexif-uninstalled.pc.in
 
 ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
 
-#doc_DATA = README AUTHORS NEWS ChangeLog ABOUT-NLS COPYING
+EXTRA_DIST += SECURITY.md
+#doc_DATA = README AUTHORS NEWS ChangeLog ABOUT-NLS COPYING SECURITY.md
 
 #######################################################################
 # Help for the maintainer
 #
 
 # Simulate something like
-#   EXTRA_DIST_IF_EXIST = ChangeLog.cvs
-# If present, ship ChangeLog.cvs in source tarball.
+#   EXTRA_DIST_IF_EXIST = ChangeLog.git
+# If present, ship ChangeLog.git in source tarball.
 # If not present, don't ship it.
 dist-hook:
-	if test -f $(srcdir)/ChangeLog.cvs; then \
-		cp -p $(srcdir)/ChangeLog.cvs $(distdir)/ChangeLog.cvs; \
+	if test -f $(srcdir)/ChangeLog.git; then \
+		cp -p $(srcdir)/ChangeLog.git $(distdir)/ChangeLog.git; \
 	fi
 
-.PHONY: cvs-changelog
-cvs-changelog: $(srcdir)/ChangeLog.cvs
+.PHONY: git-changelog
+git-changelog: $(srcdir)/ChangeLog.git
 
-.PHONY: $(srcdir)/ChangeLog.cvs
-$(srcdir)/ChangeLog.cvs:
-	if test -f "$(srcdir)/cvs2cl.usermap"; then \
-		usermap="--usermap ./cvs2cl.usermap"; \
-	else \
-		usermap=""; \
-	fi; \
-	(cd "$(srcdir)" && cvs2cl $${usermap} --utc --domain users.sourceforge.net -f "ChangeLog.cvs")
+.PHONY: $(srcdir)/ChangeLog.git
+$(srcdir)/ChangeLog.git:
+	(cd "$(srcdir)" && git2cl > $@)
 
-.PHONY: cvs-tag-release
-cvs-tag-release:
+.PHONY: git-tag-release
+git-tag-release:
 	@tag="$$(echo "$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-release" | sed 's|\.|_|g')"; \
-	echo "Are you sure you want to CVS tag \`$${tag}' your source files?"; \
+	echo "Are you sure you want to git tag \`$${tag}' your source files?"; \
 	echo "Press Ctrl-C to abort, Enter to continue."; \
 	read; \
-	cd "$(srcdir)" && cvs tag "$${tag}"
-
-.PHONY: upload-release
-upload-release:
-	echo ncftpput upload.sourceforge.net incoming/ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).*
+	cd "$(srcdir)" && git tag "$${tag}"
 
 # End of Makefile.am.
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 152ea26..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,897 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/libexif-uninstalled.pc.in $(srcdir)/libexif.pc.in \
-	$(srcdir)/libexif.spec.in $(top_srcdir)/configure ABOUT-NLS \
-	AUTHORS COPYING ChangeLog INSTALL NEWS config.guess \
-	config.rpath config.sub depcomp install-sh ltmain.sh missing \
-	mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libexif.spec libexif.pc libexif-uninstalled.pc
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)"
-DATA = $(doc_DATA) $(noinst_DATA) $(pkgconfig_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = m4m po libexif test doc binary contrib
-EXTRA_DIST = @PACKAGE_TARNAME@.spec README-Win32.txt libexif.pc.in \
-	libexif-uninstalled.pc.in
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libexif.pc
-noinst_DATA = libexif-uninstalled.pc
-ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
-doc_DATA = README AUTHORS NEWS ChangeLog ABOUT-NLS COPYING
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-libexif.spec: $(top_builddir)/config.status $(srcdir)/libexif.spec.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-libexif.pc: $(top_builddir)/config.status $(srcdir)/libexif.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-libexif-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libexif-uninstalled.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-docDATA: $(doc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-	done
-
-uninstall-docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docdir)" && rm -f $$files
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@case `sed 15q $(srcdir)/NEWS` in \
-	*"$(VERSION)"*) : ;; \
-	*) \
-	  echo "NEWS not updated; not releasing" 1>&2; \
-	  exit 1;; \
-	esac
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-docDATA install-pkgconfigDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-docDATA uninstall-pkgconfigDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-docDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkgconfigDATA install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-docDATA \
-	uninstall-pkgconfigDATA
-
-
-#######################################################################
-# Help for the maintainer
-#
-
-# Simulate something like
-#   EXTRA_DIST_IF_EXIST = ChangeLog.cvs
-# If present, ship ChangeLog.cvs in source tarball.
-# If not present, don't ship it.
-dist-hook:
-	if test -f $(srcdir)/ChangeLog.cvs; then \
-		cp -p $(srcdir)/ChangeLog.cvs $(distdir)/ChangeLog.cvs; \
-	fi
-
-.PHONY: cvs-changelog
-cvs-changelog: $(srcdir)/ChangeLog.cvs
-
-.PHONY: $(srcdir)/ChangeLog.cvs
-$(srcdir)/ChangeLog.cvs:
-	if test -f "$(srcdir)/cvs2cl.usermap"; then \
-		usermap="--usermap ./cvs2cl.usermap"; \
-	else \
-		usermap=""; \
-	fi; \
-	(cd "$(srcdir)" && cvs2cl $${usermap} --utc --domain users.sourceforge.net -f "ChangeLog.cvs")
-
-.PHONY: cvs-tag-release
-cvs-tag-release:
-	@tag="$$(echo "$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-release" | sed 's|\.|_|g')"; \
-	echo "Are you sure you want to CVS tag \`$${tag}' your source files?"; \
-	echo "Press Ctrl-C to abort, Enter to continue."; \
-	read; \
-	cd "$(srcdir)" && cvs tag "$${tag}"
-
-.PHONY: upload-release
-upload-release:
-	echo ncftpput upload.sourceforge.net incoming/ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).*
-
-# End of Makefile.am.
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/NEWS b/NEWS
index b7aceb1..67260a5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+libexif-0.6.22 (2020-05-18):
+  * New translations: ms
+  * Updated translations for most languages
+  * Fixed C89 compatibility
+  * Fixed warnings on recent versions of autoconf
+  * Some useful EXIF 2.3 tag added:
+    * EXIF_TAG_GAMMA
+    * EXIF_TAG_COMPOSITE_IMAGE
+    * EXIF_TAG_SOURCE_IMAGE_NUMBER_OF_COMPOSITE_IMAGE
+    * EXIF_TAG_SOURCE_EXPOSURE_TIMES_OF_COMPOSITE_IMAGE
+    * EXIF_TAG_GPS_H_POSITIONING_ERROR
+    * EXIF_TAG_CAMERA_OWNER_NAME
+    * EXIF_TAG_BODY_SERIAL_NUMBER
+    * EXIF_TAG_LENS_SPECIFICATION
+    * EXIF_TAG_LENS_MAKE
+    * EXIF_TAG_LENS_MODEL
+    * EXIF_TAG_LENS_SERIAL_NUMBER
+  * Lots of fixes exposed by fuzzers like AFL, ClusterFuzz, OSSFuzz and others.
+    * CVE-2018-20030: Fix for recursion DoS
+    * CVE-2020-13114: Time consumption DoS when parsing canon array markers
+    * CVE-2020-13113: Potential use of uninitialized memory 
+    * CVE-2020-13112: Various buffer overread fixes due to integer overflows in maker notes
+    * CVE-2020-0093: read overflow
+    * CVE-2019-9278: replaced integer overflow checks the compiler could optimize away by safer constructs
+    * CVE-2020-12767: fixed division by zero 
+    * CVE-2016-6328: fixed integer overflow when parsing maker notes
+    * CVE-2017-7544: fixed buffer overread
+
 libexif-0.6.21 (2012-07-12):
   * New translations: en_AU, uk
   * Updated translations: cs, da, de, en_CA, nl, pl, sk, sv, vi
diff --git a/README b/README
index 13683cc..858b63e 100644
--- a/README
+++ b/README
@@ -37,7 +37,7 @@ USAGE
 -----
 
 We have documented the libexif API using doxygen and are making
-the results available at http://libexif.sourceforge.net/api/
+the results available at https://libexif.github.io/api/
 
 The short test programs in the test directory illustrates how to create
 valid EXIF data from scratch, how to save EXIF data and how to load EXIF
@@ -47,7 +47,7 @@ us at <libexif-devel@lists.sourceforge.net> if you have any questions
 on how to use libexif.
 
 To link to libexif into your own package, we recommend using the
-pkgconfig utility (cf. http://www.freedesktop.org/wiki/Software/pkg-config/ For
+pkgconfig utility (cf. https://www.freedesktop.org/wiki/Software/pkg-config/ For
 your convenience, libexif both provides libexif-uninstalled.pc and
 installs libexif.pc.
 
@@ -55,18 +55,18 @@ installs libexif.pc.
 FRONTENDS
 ---------
 
-Right now, I know of the following frontends to libexif:
+Here are a few frontends to libexif:
  - exif:     A small command-line utility to show EXIF information in JPEG
-             files (http://www.sourceforge.net/projects/libexif).
+             files (https://github.com/libexif/libexif).
  - gexif:    A GTK+ frontend for editing EXIF data
-             (http://www.sourceforge.net/projects/libexif).
- - gphoto2:  A command-line frontend to libgphoto2, a library to access a 
+             (https://github.com/libexif/gexif).
+ - gphoto2:  A command-line frontend to libgphoto2, a library to access a
              wide range of digital cameras (http://www.gphoto.org).
  - gtkam:    A GTK+ frontend to libgphoto2 (http://www.gphoto.org).
  - thirdeye: Digital photos organizer and driver for eComStation
              (http://ecomstation.ru/thirdeye).
  - digikam:  digital photo management application for KDE
-             (http://www.digikam.org/)
+             (https://www.digikam.org/)
 
 If you would like to migrate your program to use libexif or add EXIF support
 to it, don't hesitate to contact the authors.
@@ -75,10 +75,10 @@ to it, don't hesitate to contact the authors.
 LIBRARIES
 ---------
 
-I know of the following libraries that use or have been inspired by libexif:
+The following libraries use or have been inspired by libexif:
  - libexif-gtk: library of widgets to help display EXIF tags in GTK
-   programs (part of the libexif project)
- - pel: PHP-Code (http://pel.sourceforge.net)
+   programs (https://github.com/libexif/libexif-gtk).
+ - pel: PHP-Code (https://github.com/lsolesen/pel/)
 
 
 BUILDING
@@ -91,7 +91,7 @@ to build. Building from the source tar ball usually involves the commands:
   make
   sudo make install
 
-When building from source out of CVS, something like the following will be
+When building from source out of git, something like the following will be
 necessary:
 
   gettextize
@@ -135,14 +135,14 @@ INTERNATIONALIZATION
 The libexif translations are made by volunteers working on their own,
 either directly with the libexif project or through one of two translation
 coordination sites, the Translation Project
-<http://translationproject.org/domain/libexif.html> and Launchpad
-<https://translations.edge.launchpad.net/ubuntu/precise/+source/libexif/+pots/libexif-12>.
+<https://translationproject.org/domain/libexif.html> and Launchpad
+<https://translations.edge.launchpad.net/ubuntu/bionic/+source/libexif/+pots/libexif-12>.
 Any updates to language translations coordinated by the Translation Project
 must be made through their web site, but all other languages can be
 updated either through Launchpad (preferred) or by sending updates to
 the libexif developers mailing list directly.  As of this writing, the
 following languages must be updated through the Translation Project:
-cs da de es fr it ja nl pl sk sv uk vi
+cs da de es fr it ja nl pl pt sk sv uk vi
 
 If you are interested in translating libexif into a new language, we
 recommend that you join one of the above translation groups and take
@@ -168,7 +168,7 @@ LINKS
 Some links you might want to check out if you are interested in further
 information about EXIF.
 
- - http://drewnoakes.com/code/exif: metadata extraction framework in Java
- - http://www.exif.org: information about the EXIF standard.
- - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/index.html: Looks
+ - https://drewnoakes.com/code/exif: metadata extraction framework in Java
+ - https://www.exif.org: information about the EXIF standard.
+ - https://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/index.html: Looks
    like libexif in Perl. Seems to support a lot of MakerNotes.
diff --git a/README-Win32.txt b/README-Win32.txt
index 45a16af..58ff1a1 100644
--- a/README-Win32.txt
+++ b/README-Win32.txt
@@ -1,7 +1,7 @@
 If this is a combined source/binary distribution tree, then you can find
 
-   * the binary DLL     in the subdirectory  binary/bin/
-   * the include files  in the subdirectory  binary/include/
+   * the binary DLL     in the subdirectory  binary-dist/bin/
+   * the include files  in the subdirectory  binary-dist/include/
 
 As for building libexif yourself on or for Win32, you can
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..2d335a9
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,43 @@
+# Security overview
+
+## General
+
+libexif is a software library to process EXIF datablobs, which are usually
+embedded in JPEG files.
+
+It allows reading, writing, changing, and extraction (binary and textual versions)
+of this data.
+
+
+## Attack Surface
+
+Any data blob put into the library should be assumed untrusted and
+potentially malicious.
+
+ABI parameters can be considered trusted.
+
+The primary attack scenario is processing of files for EXIF content
+extraction (displaying) via unattended services, up to and including
+webservices where files can be uploaded by potential attackers.
+
+## Bugs considered security issues
+
+(Mostly for CVE assigments rules.)
+
+Triggering memory corruption of any form is considered in scope.
+Triggering endless loops is considered in scope. (would block services)
+Triggering unintentional aborts is considered in scope.
+
+Common library usage patterns are in scope.
+
+Crashes during writing out of data as EXIF could be in scope.
+
+## Bugs not considered security issues
+
+Crashes caused by debugging functionality are not in scope.
+
+## Bugreports
+
+Bugreports can be filed as github issues.
+
+If you want to report an embargoed security bug report, reach out to dan@coneharvesters.com.
diff --git a/auto-m4/.gitignore b/auto-m4/.gitignore
new file mode 100644
index 0000000..0f4126c
--- /dev/null
+++ b/auto-m4/.gitignore
@@ -0,0 +1 @@
+*.m4
diff --git a/binary-dist/.gitignore b/binary-dist/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/binary-dist/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/binary/Makefile.am b/binary-dist/Makefile.am
index 067716b..75e644b 100644
--- a/binary/Makefile.am
+++ b/binary-dist/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = include bin
 SH_DIST_HOOK = dist-ship-binary-hook
 dist-ship-binary-hook include bin:
 	cd "$(top_builddir)" && $(MAKE) includedir="$(PWD)/include" DESTDIR="" prefix="$(PWD)/tmp" install
-	mkdir -p "$(PWD)/bin"
+	$(MKDIR_P) "$(PWD)/bin"
 	cp "$(PWD)/tmp/bin/"*.dll "bin/"
 
 endif
diff --git a/binary/Makefile.in b/binary/Makefile.in
deleted file mode 100644
index 4a37830..0000000
--- a/binary/Makefile.in
+++ /dev/null
@@ -1,409 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = binary
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@SHIP_BINARIES_TRUE@EXTRA_DIST = include bin
-@SHIP_BINARIES_TRUE@SH_DIST_HOOK = dist-ship-binary-hook
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binary/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu binary/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	dist-hook distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am
-
-@SHIP_BINARIES_TRUE@dist-ship-binary-hook include bin:
-@SHIP_BINARIES_TRUE@	cd "$(top_builddir)" && $(MAKE) includedir="$(PWD)/include" DESTDIR="" prefix="$(PWD)/tmp" install
-@SHIP_BINARIES_TRUE@	mkdir -p "$(PWD)/bin"
-@SHIP_BINARIES_TRUE@	cp "$(PWD)/tmp/bin/"*.dll "bin/"
-
-dist-hook: $(SH_DIST_HOOK)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/configure.ac b/configure.ac
index a3ac72f..11b0e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,33 +1,14 @@
 AC_PREREQ(2.59)
-AC_INIT([EXIF library], [0.6.21], [libexif-devel@lists.sourceforge.net], [libexif])
+AC_INIT([EXIF library], [0.6.22], [libexif-devel@lists.sourceforge.net], [libexif])
 AC_CONFIG_SRCDIR([libexif/exif-data.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])
-AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 dist-zip check-news])
+AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 dist-zip check-news subdir-objects])
 AM_MAINTAINER_MODE
 
 # Use the silent-rules feature when possible.
 m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
-AM_SILENT_RULES([no])
-
-# Checks for programs.
-m4_pattern_allow([AM_PROG_AR])
-AM_PROG_AR
-
-if test ! -d "$srcdir/m4m"; then
-AC_MSG_ERROR([
-You are missing the m4m/ directory in your top
-$PACKAGE_TARNAME source directory.
-
-You are probably using an ill-maintained CVS tree.
-Running
-
-    cd $srcdir
-    cvs co m4m
-
-and re-running autogen.sh might help.
-])
-fi
+AM_SILENT_RULES([yes])
 
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG([Build])
@@ -64,9 +45,10 @@ dnl 15:3:0   added exif_loader_get_buf (for 0.6.18)
 dnl 15:3:1   0.6.19
 dnl 15:3:2   0.6.20
 dnl 15:3:3   0.6.21
+dnl 15:3:4   0.6.22
 LIBEXIF_CURRENT=15
 LIBEXIF_AGE=3
-LIBEXIF_REVISION=3
+LIBEXIF_REVISION=4
 AC_SUBST([LIBEXIF_AGE])
 AC_SUBST([LIBEXIF_REVISION])
 AC_SUBST([LIBEXIF_CURRENT])
@@ -74,14 +56,16 @@ AC_SUBST([LIBEXIF_CURRENT_MIN],[`expr $LIBEXIF_CURRENT - $LIBEXIF_AGE`])
 LIBEXIF_VERSION_INFO="$LIBEXIF_CURRENT:$LIBEXIF_REVISION:$LIBEXIF_AGE"
 AC_SUBST([LIBEXIF_VERSION_INFO])
 
-AC_PROG_CC
+AM_PROG_CC_C_O
 AC_C_CONST
 AC_C_INLINE
 dnl FIXME: AC_LIBTOOL_WIN32_DLL
+AM_PROG_AR
 AM_PROG_LIBTOOL
 AM_CPPFLAGS="$CPPFLAGS"
 GP_CONFIG_MSG([Compiler],[${CC}])
 
+AC_SYS_LARGEFILE
 
 dnl Create a stdint.h-like file containing size-specific integer definitions
 dnl that will always be available
@@ -103,10 +87,6 @@ AC_ARG_ENABLE([ship-binaries],
 AM_CONDITIONAL([SHIP_BINARIES],[$ship_binaries])
 GP_CONFIG_MSG([Ship binaries in tarball],[$ship_binaries])
 
-enable_docs=false
-AM_CONDITIONAL([BUILD_DOCS],[$enable_docs])
-AM_CONDITIONAL([HAVE_DOXYGEN],[$enable_docs])
-
 
 dnl ---------------------------------------------------------------------------
 dnl Whether -lm is required for our math functions
@@ -126,25 +106,23 @@ dnl ---------------------------------------------------------------------------
 LIBS_orig="$LIBS"
 LIBS="$LIBS -lm"
 AC_MSG_CHECKING([for math functions in libm])
-AC_LINK_IFELSE([
-	#include <math.h>
-	int main() {
-	  double s = sqrt(0);
-	  double p = pow(s,s);
-	  return (int)p;
-	}
-], [AC_MSG_RESULT(yes)], [
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
+	  #include <math.h>
+	  ],[
+	    double s = sqrt(0);
+	    double p = pow(s,s);
+	  ])],
+	[AC_MSG_RESULT(yes)], [
 	AC_MSG_RESULT(no)
 	LIBS="$LIBS_orig"
 	AC_MSG_CHECKING([for math functions without libm])
-	AC_LINK_IFELSE([
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([
 		#include <math.h>
-		int main() {
+		],[
 		  double s = sqrt(0);
 		  double p = pow(s,s);
-		  return (int)p;
-		}
-	], [
+		])],
+	[
 		AC_MSG_RESULT(yes)
 	],[
 		AC_MSG_RESULT(no)
@@ -152,6 +130,9 @@ AC_LINK_IFELSE([
 	])
 ])
 
+# Check whether libfailmalloc is available for tests
+CHECK_FAILMALLOC
+
 # doc support
 GP_CHECK_DOC_DIR
 GP_CHECK_DOXYGEN
@@ -185,7 +166,7 @@ AM_CONDITIONAL([ENABLE_INTERNAL_DOCS], [test "x${set_enable_internal_docs}" = "x
 # ---------------------------------------------------------------------------
 # i18n support
 # ---------------------------------------------------------------------------
-ALL_LINGUAS="be bs cs da de en_AU en_CA en_GB es fr it ja nl pl pt pt_BR ru sk sq sr sv tr uk vi zh_CN"
+ALL_LINGUAS="be bs cs da de en_AU en_CA en_GB es fr it ja ms nl pl pt pt_BR ru sk sq sr sv tr uk vi zh_CN"
 AM_PO_SUBDIRS
 GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT_MIN}],
                 [Lutz Mueller and others])
@@ -227,6 +208,7 @@ AC_CONFIG_FILES([  po/Makefile.in
   libexif.spec
   libexif/Makefile
   test/Makefile
+  test/check-vars.sh
   test/nls/Makefile
   m4m/Makefile
   doc/Makefile
@@ -234,7 +216,7 @@ AC_CONFIG_FILES([  po/Makefile.in
   doc/Doxyfile-internals
   libexif.pc
   libexif-uninstalled.pc
-  binary/Makefile
+  binary-dist/Makefile
   contrib/Makefile
   contrib/examples/Makefile
 ])
diff --git a/contrib/.gitignore b/contrib/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/contrib/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
deleted file mode 100644
index d6c0bc3..0000000
--- a/contrib/Makefile.in
+++ /dev/null
@@ -1,604 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = contrib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = examples
-
-# The c++ and aolserver contrib directories are out of date and are
-# are pointless to distribute in the offical source release.
-EXTRA_DIST = watcom/Makefile watcom/_stdint.h
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu contrib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/contrib/aolserver/Makefile b/contrib/aolserver/Makefile
new file mode 100644
index 0000000..41e8685
--- /dev/null
+++ b/contrib/aolserver/Makefile
@@ -0,0 +1,23 @@
+NSHOME   =  /home/aol31
+
+EXIFDIR  = ..
+
+#
+# Module name
+#
+MOD      =  nsexif.so
+
+#
+# Objects to build
+#
+OBJS     =  nsexif.o
+
+#
+# Installation directory for data files
+#
+MODDIR   =  nsexif
+MODLIBS  =  -L.. -lexif
+
+CFLAGS += -I$(EXIFDIR)
+
+include $(NSHOME)/include/Makefile.module
diff --git a/contrib/aolserver/nsexif.c b/contrib/aolserver/nsexif.c
new file mode 100644
index 0000000..ed77ffd
--- /dev/null
+++ b/contrib/aolserver/nsexif.c
@@ -0,0 +1,143 @@
+/*
+
+Copyright (c) 2000 Curtis Galloway
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+This is a loadable module for the AOLserver web server that provides
+an interface to the EXIF tag parsing library.
+
+It adds one Tcl command into the AOLserver Tcl interpreter:
+
+  ns_exif <file>
+
+It returns the ID of an ns_set that contains the tag names and values
+from the EXIF file.
+
+*/
+
+#include "ns.h"
+
+#include "exif.h"
+
+#define BUFSIZE  1024
+
+static void
+rec_put(Ns_Set *set, exif_record_t *rec)
+{
+  char buf[BUFSIZE];
+  char *str = buf;
+
+  switch (rec->rec_type) {
+  case 's':
+    str = rec->rec_data.s;
+    break;
+  case 'f':
+    snprintf(buf, BUFSIZE, "%f", rec->rec_data.f);
+    break;
+  case 'g':
+    snprintf(buf, BUFSIZE, "%g", rec->rec_data.f);
+    break;
+  case 'l':
+    snprintf(buf, BUFSIZE, "%ld", rec->rec_data.l);
+    break;
+  case 'r':
+    snprintf(buf, BUFSIZE, "%d/%d", rec->rec_data.r.num,
+	    rec->rec_data.r.denom);
+    break;
+  default:
+    snprintf(buf, BUFSIZE, "<Unknown record type '%c'>", rec->rec_type);
+    break;
+  }
+  Ns_SetPut(set, rec->rec_name, str);
+}
+
+static int
+Tcl_ReadExifDataCmd (
+		     ClientData    clientData,
+		     Tcl_Interp   *interp,
+		     int           argc,
+		     char        **argv)
+{
+  exif_data_t *d;
+  int i;
+  Ns_Set *rset;
+
+  d = exif_parse_file(argv[1]);
+  if (d == NULL) {
+    Tcl_AppendResult(interp, "Could not process file '", argv[1], "'", NULL);
+    return TCL_ERROR;
+  }
+  rset = Ns_SetCreate("exif");
+
+  for (i=0; i<d->n_recs; i++) {
+    rec_put(rset, &d->recs[i]);
+  }
+
+  Ns_TclEnterSet(interp, rset, NS_TCL_SET_TEMPORARY | NS_TCL_SET_DYNAMIC);
+  exif_free_data(d);
+  return TCL_OK;
+}
+
+
+/*----------------------------------------------------------------------
+ *
+ *  Tcl_InitExif --
+ *
+ *  Initialize the Tcl command.
+ *
+ *----------------------------------------------------------------------
+ */
+void
+Tcl_InitExif (interp)
+    Tcl_Interp *interp;
+{
+  Tcl_CreateCommand (interp, "ns_exif", Tcl_ReadExifDataCmd, 
+		     NULL, NULL);
+}
+
+static int
+nsexif_interp_init (Tcl_Interp *interp, void *dummy)
+{
+  Tcl_InitExif(interp);
+  return TCL_OK;
+}
+
+
+int
+Ns_ModuleInit(char *hServer, char *hModule)
+{
+  char *configPath;
+
+  Ns_Log( Notice, "%s module starting", hModule);
+
+  exif_init((void *(*)(int))Ns_Malloc,
+	    (void (*)(void *))Ns_Free,
+	    (void *(*)(void *, int))Ns_Realloc);
+
+  configPath = Ns_ConfigGetPath(hServer, hModule, NULL);
+  /*  if (!Ns_ConfigGetBool (configPath, "Debug", &debug_p))
+      debug_p = DEFAULT_DEBUG; */
+
+  Ns_TclInitInterps (hServer, nsexif_interp_init, NULL);
+  return NS_OK;
+}
+
+int Ns_ModuleVersion = 1;
diff --git a/contrib/c++/Makefile b/contrib/c++/Makefile
new file mode 100644
index 0000000..7315071
--- /dev/null
+++ b/contrib/c++/Makefile
@@ -0,0 +1,54 @@
+BOOST_PYTHON_LIB = -L/usr/local/boost_1_29_0/lib -lboost_python
+BOOST_INCLUDES = -I/usr/local/boost_1_29_0/src
+dynmoddir = `pwd`/local
+
+CXX = g++
+CXXFLAGS := -O2 -Wall
+CPPFLAGS := -I/usr/include/python2.2
+
+LIBTOOL = $(SHELL) ./libtool
+LIBCXX = $(LIBTOOL) --tag=CXX --mode=compile $(CXX)
+LINKCXX = $(LIBTOOL) --tag=CXX --mode=link $(CXX)
+LINKCXXLIB = $(LINKCXX) -rpath $(dynmoddir)
+LINKCXXMODULE = $(LINKCXXLIB) -module -avoid-version
+LIBINSTALL = $(LIBTOOL) --mode=install /bin/install -c -p
+INSTALL = /bin/install -c -p
+
+TARGET = exif.la
+
+OBJS = \
+    exif_module.lo
+
+all: $(TARGET)
+
+install: $(TARGET)
+	$(INSTALL) -d $(dynmoddir)
+	$(LIBINSTALL) $(TARGET) $(dynmoddir)
+
+$(TARGET): $(OBJS)
+	$(LINKCXXMODULE) -o $(TARGET) $(OBJS) $(BOOST_PYTHON_LIB) -lexif
+
+clean::
+	rm -rf .libs *.o *.so *.lo *.ld $(TARGET)
+
+%.o: %.cxx
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $*.cxx
+
+%.lo: %.cxx
+	$(LIBCXX) $(CXXFLAGS) $(CPPFLAGS) -c $*.cxx
+
+%.d: %.cxx
+	@echo updating header dependencies for $*.cxx
+	@rm -f $*.d
+	@$(CXX) -M $(CXXFLAGS) $(CPPFLAGS) -c $*.cxx | sed "s@$*.o@$*.d $*.o@" > $*.d \
+        || { rm -f $*.d; exit 1; }
+
+%.ld: %.cxx
+	@echo updating header dependencies for $*.cxx
+	@rm -f $*.ld
+	@$(CXX) -M $(CXXFLAGS) $(CPPFLAGS) -c $*.cxx | sed "s@$*.o@$*.ld $*.lo@" > $*.ld \
+        || { rm -f $*.ld; exit 1; }
+
+ifneq "$(MAKECMDGOALS)" "clean"
+include $(patsubst %.lo, %.ld, $(OBJS))
+endif
diff --git a/contrib/c++/exif.hxx b/contrib/c++/exif.hxx
new file mode 100644
index 0000000..2ac4225
--- /dev/null
+++ b/contrib/c++/exif.hxx
@@ -0,0 +1,536 @@
+/* exif.hxx
+ *
+ * Copyright  2002,2003 Hans Meine <hans_meine@gmx.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
+ */
+
+#ifndef EXIF_HXX
+#define EXIF_HXX
+
+#include <libexif/exif-entry.h>
+#include <libexif/exif-content.h>
+#include <libexif/exif-ifd.h>
+#include <libexif/exif-data.h>
+#include <libexif/exif-format.h>
+#include <libexif/exif-utils.h>
+#include <stdexcept>
+#include <string>
+
+namespace Exif {
+
+#ifndef EXIF_NO_EXCEPTIONS
+struct InvalidIndex : std::runtime_error
+{
+    InvalidIndex(const std::string& s)
+    : std::runtime_error(s) {}
+};
+
+struct InvalidFormat : std::runtime_error
+{
+    InvalidFormat(const std::string& s)
+    : std::runtime_error(s) {}
+};
+
+struct IOError : std::runtime_error
+{
+    IOError(const std::string& s)
+    : std::runtime_error(s) {}
+};
+#endif // EXIF_NO_EXCEPTIONS
+
+struct Entry
+{
+    ExifEntry *entry_;
+
+        // construct an empty entry, FIXME: is this needed in the public API?
+    Entry()
+    : entry_(exif_entry_new())
+    {}
+
+        // construct an entry for the given tag
+    Entry(ExifTag tag)
+    : entry_(exif_entry_new())
+    {
+        exif_entry_initialize(entry_, tag);
+    }
+
+        // copy constructor
+    Entry(Entry const &other)
+    : entry_(other.entry_)
+    {
+        exif_entry_ref(entry_);
+    }
+
+        // internal, do not use directly
+    Entry(ExifEntry *entry)
+    : entry_(entry)
+    {
+        exif_entry_ref(entry_);
+    }
+
+    ~Entry()
+    {
+        exif_entry_unref(entry_);
+    }
+
+    Entry &operator=(Entry const &other)
+    {
+        exif_entry_unref(entry_);
+        entry_ = other.entry_;
+        exif_entry_ref(entry_);
+        return *this;
+    }
+
+    ExifTag tag() const
+    {
+        return entry_->tag;
+    }
+
+/*
+    void setTag(ExifTag tag)
+    {
+        entry_->tag = tag;
+    }
+*/
+
+    ExifFormat format() const
+    {
+        return entry_->format;
+    }
+
+/*
+    void setFormat(ExifFormat format)
+    {
+        entry_->format = format;
+    }
+*/
+
+    unsigned long components() const
+    {
+        return entry_->components;
+    }
+
+/*
+    void setComponents(unsigned long components)
+    {
+        entry_->components = components;
+    }
+
+    void initialize(ExifTag tag)
+    {
+        exif_entry_initialize(entry_, tag);
+    }
+*/
+
+    ExifByte getByte(unsigned int index) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_BYTE)
+            throw InvalidFormat(
+                "Exif::Entry::getByte(): Format is not EXIF_FORMAT_BYTE");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::getByte: component index out of range");
+#endif
+        return *(entry_->data
+                 + index * exif_format_get_size(entry_->format));
+    }
+
+    const ExifAscii getAscii() const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_ASCII)
+            throw InvalidFormat(
+                "Exif::Entry::getAscii(): Format is not EXIF_FORMAT_ASCII");
+#endif
+        return (ExifAscii)entry_->data;
+    }
+
+    ExifShort getShort(unsigned int index) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_SHORT)
+            throw InvalidFormat(
+                "Exif::Entry::getShort(): Format is not EXIF_FORMAT_SHORT");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::getShort: component index out of range");
+#endif
+        return exif_get_short(entry_->data
+                              + index * exif_format_get_size(entry_->format),
+                              exif_data_get_byte_order(entry_->parent->parent));
+    }
+
+    ExifLong getLong(unsigned int index) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_LONG)
+            throw InvalidFormat(
+                "Exif::Entry::getLong(): Format is not EXIF_FORMAT_LONG");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::getLong: component index out of range");
+#endif
+        return exif_get_long(entry_->data
+                             + index * exif_format_get_size(entry_->format),
+                             exif_data_get_byte_order(entry_->parent->parent));
+    }
+
+    ExifSLong getSLong(unsigned int index) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_SLONG)
+            throw InvalidFormat(
+                "Exif::Entry::getSLong(): Format is not EXIF_FORMAT_SLONG");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::getSLong: component index out of range");
+#endif
+        return exif_get_slong(entry_->data
+                              + index * exif_format_get_size(entry_->format),
+                              exif_data_get_byte_order(entry_->parent->parent));
+    }
+
+    ExifRational getRational(unsigned int index) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_RATIONAL)
+            throw InvalidFormat(
+                "Exif::Entry::getRational(): Format is not EXIF_FORMAT_RATIONAL");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::getRational: component index out of range");
+#endif
+        return exif_get_rational(entry_->data
+                                 + index * exif_format_get_size(entry_->format),
+                                 exif_data_get_byte_order(entry_->parent->parent));
+    }
+
+    ExifSRational getSRational(unsigned int index) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_SRATIONAL)
+            throw InvalidFormat(
+                "Exif::Entry::getSRational(): Format is not EXIF_FORMAT_SRATIONAL");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::getSRational: component index out of range");
+#endif
+        return exif_get_srational(entry_->data
+                                  + index * exif_format_get_size(entry_->format),
+                                  exif_data_get_byte_order(entry_->parent->parent));
+    }
+
+    void setByte(unsigned int index, ExifByte value) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_BYTE)
+            throw InvalidFormat(
+                "Exif::Entry::setByte(): Format is not EXIF_FORMAT_BYTE");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::setByte: component index out of range");
+#endif
+        *(entry_->data
+          + index * exif_format_get_size(entry_->format)) = value;
+    }
+
+/*
+    const ExifAscii setAscii() const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_ASCII)
+            throw InvalidFormat(
+                "Exif::Entry::setAscii(): Format is not EXIF_FORMAT_ASCII");
+#endif
+        return (ExifAscii)entry_->data;
+    }
+*/
+
+    void setShort(unsigned int index, ExifShort value) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_SHORT)
+            throw InvalidFormat(
+                "Exif::Entry::setShort(): Format is not EXIF_FORMAT_SHORT");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::setShort: component index out of range");
+#endif
+        return exif_set_short(entry_->data
+                              + index * exif_format_get_size(entry_->format),
+                              exif_data_get_byte_order(entry_->parent->parent),
+                              value);
+    }
+
+    void setLong(unsigned int index, ExifLong value) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_LONG)
+            throw InvalidFormat(
+                "Exif::Entry::setLong(): Format is not EXIF_FORMAT_LONG");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::setLong: component index out of range");
+#endif
+        return exif_set_long(entry_->data
+                             + index * exif_format_get_size(entry_->format),
+                             exif_data_get_byte_order(entry_->parent->parent),
+                             value);
+    }
+
+    void setSLong(unsigned int index, ExifSLong value) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_SLONG)
+            throw InvalidFormat(
+                "Exif::Entry::setSLong(): Format is not EXIF_FORMAT_SLONG");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::setSLong: component index out of range");
+#endif
+        return exif_set_slong(entry_->data
+                              + index * exif_format_get_size(entry_->format),
+                              exif_data_get_byte_order(entry_->parent->parent),
+                              value);
+    }
+
+    void setRational(unsigned int index, ExifRational value) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_RATIONAL)
+            throw InvalidFormat(
+                "Exif::Entry::setRational(): Format is not EXIF_FORMAT_RATIONAL");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::setRational: component index out of range");
+#endif
+        return exif_set_rational(entry_->data
+                                 + index * exif_format_get_size(entry_->format),
+                                 exif_data_get_byte_order(entry_->parent->parent),
+                                 value);
+    }
+
+    void setSRational(unsigned int index, ExifSRational value) const
+    {
+#ifndef EXIF_NO_EXCEPTIONS
+        if(entry_->format != EXIF_FORMAT_SRATIONAL)
+            throw InvalidFormat(
+                "Exif::Entry::setSRational(): Format is not EXIF_FORMAT_SRATIONAL");
+        if(index >= components())
+            throw InvalidIndex(
+                "Exif::setSRational: component index out of range");
+#endif
+        return exif_set_srational(entry_->data
+                                  + index * exif_format_get_size(entry_->format),
+                                  exif_data_get_byte_order(entry_->parent->parent),
+                                  value);
+    }
+
+    const char *value()
+    {
+        return exif_entry_get_value(entry_);
+    }
+
+    const char *briefValue()
+    {
+        return exif_entry_get_value_brief(entry_);
+    }
+
+    void dump(unsigned int indent = 0) const
+    {
+        exif_entry_dump(entry_, indent);
+    }
+};
+
+struct Content
+{
+    ExifContent *content_;
+
+    Content()
+    : content_(exif_content_new())
+    {}
+
+    Content(Content const &other)
+    : content_(other.content_)
+    {
+        exif_content_ref(content_);
+    }
+
+        // internal, do not use directly
+    Content(ExifContent *content)
+    : content_(content)
+    {
+        exif_content_ref(content_);
+    }
+
+    ~Content()
+    {
+        exif_content_unref(content_);
+    }
+
+    Content &operator=(Content const &other)
+    {
+        exif_content_unref(content_);
+        content_ = other.content_;
+        exif_content_ref(content_);
+        return *this;
+    }
+
+    Entry operator[](ExifTag tag)
+    {
+        ExifEntry *result = exif_content_get_entry(content_, tag);
+        if(result)
+            return Entry(result);
+#ifndef EXIF_NO_EXCEPTIONS
+        throw InvalidIndex(
+            "Exif::Content: IFD does not contain given tag");
+#endif
+        return Entry();
+    }
+
+    Entry operator[](unsigned int index)
+    {
+        if(index < size())
+            return Entry(content_->entries[index]);
+#ifndef EXIF_NO_EXCEPTIONS
+        throw InvalidIndex(
+            "Exif::Content: numeric entry index out of range");
+#endif // EXIF_NO_EXCEPTIONS
+        return Entry();
+    }
+
+    unsigned int size() const
+    {
+        // FIXME: content_ should never be NULL, so this is unneeded!?
+        return content_ ? content_->count : 0;
+    }
+
+    void add(Entry &entry)
+    {
+        exif_content_add_entry(content_, entry.entry_);
+    }
+
+    void remove(Entry &entry)
+    {
+        exif_content_remove_entry(content_, entry.entry_);
+    }
+
+        // for your convenience
+    const char *value(ExifTag tag)
+    {
+        return exif_content_get_value(content_, tag);
+    }
+
+        // for your convenience
+    const char *briefValue(ExifTag tag)
+    {
+        return exif_content_get_value_brief(content_, tag);
+    }
+
+    void dump(unsigned int indent = 0) const
+    {
+        exif_content_dump(content_, indent);
+    }
+};
+
+struct Data
+{
+    ExifData *data_;
+
+    Data()
+    : data_(exif_data_new())
+    {}
+
+    Data(const char *path, bool *success = 0)
+    : data_(exif_data_new_from_file(path))
+    {
+        if(success)
+            *success = data_;
+#ifndef EXIF_NO_EXCEPTIONS
+        else
+            if(!data_)
+                throw IOError("Exif::Data: Could not load file");
+#endif // EXIF_NO_EXCEPTIONS
+        if(!data_)
+            exif_data_new();
+    }
+
+    Data(const unsigned char *data,
+         unsigned int size)
+    : data_(exif_data_new_from_data(data, size))
+    {}
+
+    Data(Data const &other)
+    : data_(other.data_)
+    {
+        exif_data_ref(data_);
+    }
+
+    ~Data()
+    {
+        exif_data_unref(data_);
+    }
+
+    Data &operator=(Data const &other)
+    {
+        exif_data_unref(data_);
+        data_ = other.data_;
+        exif_data_ref(data_);
+        return *this;
+    }
+
+    void save(unsigned char **d, unsigned int *size)
+    {
+        exif_data_save_data(data_, d, size);
+    }
+
+    unsigned int size() const
+    {
+        return EXIF_IFD_COUNT;
+    }
+
+    Content operator[](unsigned int index)
+    {
+        if(index < size())
+            return Content(data_->ifd[index]);
+#ifndef EXIF_NO_EXCEPTIONS
+        throw InvalidIndex(
+            "Exif::Data: IFD index out of range");
+#endif // EXIF_NO_EXCEPTIONS
+        return Content();
+    }
+
+    ExifByteOrder byteOrder() const
+    {
+        return exif_data_get_byte_order(data_);
+    }
+
+    void setByteOrder(ExifByteOrder bo) const
+    {
+        exif_data_set_byte_order(data_, bo);
+    }
+
+    void dump()
+    {
+        exif_data_dump(data_);
+    }
+};
+
+} // namespace Exif
+
+#endif // EXIF_HXX
diff --git a/contrib/c++/exif_module.cxx b/contrib/c++/exif_module.cxx
new file mode 100644
index 0000000..e50221f
--- /dev/null
+++ b/contrib/c++/exif_module.cxx
@@ -0,0 +1,524 @@
+/* exif-content.c
+ *
+ * Copyright  2002,2003 Hans Meine <hans_meine@gmx.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
+ */
+
+#include "exif.hxx"
+#include <string>
+#include <iostream>
+
+#include <Python.h>
+#include <boost/python.hpp>
+using namespace boost::python;
+
+template<class Wrapper, class Pointer>
+struct WrappedObjectIterator
+{
+	//typedef Wrapper value_type;
+	Pointer *it_, *end_;
+
+	WrappedObjectIterator(Pointer *it, Pointer *end)
+		: it_(it), end_(end)
+	{}
+
+	Wrapper next()
+	{
+		if(it_ == end_)
+		{
+			PyErr_SetString(PyExc_StopIteration, "iterator exhausted");
+			throw_error_already_set();
+		}
+		return Wrapper(*it_++);
+	}
+};
+
+struct PythonEntry : public Exif::Entry
+{
+	PythonEntry() {}
+	PythonEntry(Exif::Entry const &other) : Exif::Entry(other) {}
+
+	object component(long index) const
+	{
+		switch(format())
+		{
+		case EXIF_FORMAT_BYTE:
+			return object(getByte(index));
+		case EXIF_FORMAT_SHORT:
+			return object(getShort(index));
+		case EXIF_FORMAT_LONG:
+			return object(getLong(index));
+		case EXIF_FORMAT_SLONG:
+			return object(getSLong(index));
+		case EXIF_FORMAT_RATIONAL:
+			return object(getRational(index));
+		case EXIF_FORMAT_SRATIONAL:
+			return object(getSRational(index));
+		case EXIF_FORMAT_ASCII:
+			//std::cerr << "returning " << entry_->size << " bytes of data..\n";
+			//std::cerr << " (copied into " << std::string((char *)data, entry_->size).size() << "-character string)\n";
+			return object(std::string((char *)entry_->data, entry_->size));
+		default:
+			break;
+		}
+		return object();
+	}
+
+	object data() const
+	{
+		if((format() == EXIF_FORMAT_ASCII) || (components()==1))
+			return component(0);
+		else
+		{
+			list result;
+			for(unsigned int i=0; i<components(); ++i)
+				result.append(component(i));
+			return result;
+		}
+	}
+
+	template<class Type>
+	Type extractComponent(unsigned int index, object value,
+						  const char *errorString)
+	{
+		extract<Type> extr(value);
+		if(!extr.check())
+		{
+			PyErr_SetString(PyExc_TypeError, errorString);
+			throw_error_already_set();
+		}
+		return extr();
+	}
+
+	void setComponent(unsigned int index, object value)
+	{
+		unsigned char *data= entry_->data
+							 + index * exif_format_get_size(format());
+		ExifByteOrder bo = exif_data_get_byte_order(entry_->parent->parent);
+
+		switch(format())
+		{
+		case EXIF_FORMAT_BYTE:
+			*data= extractComponent<ExifByte>(index, value, "invalid assignment to data: could not convert value to byte format");
+			break;
+		case EXIF_FORMAT_SHORT:
+			exif_set_short(data, bo, extractComponent<ExifShort>(index, value, "invalid assignment to data: could not convert value to short format"));
+			break;
+		case EXIF_FORMAT_LONG:
+			exif_set_long(data, bo, extractComponent<ExifLong>(index, value, "invalid assignment to data: could not convert value to long format"));
+			break;
+		case EXIF_FORMAT_SLONG:
+			exif_set_slong(data, bo, extractComponent<ExifSLong>(index, value, "invalid assignment to data: could not convert value to signed long format"));
+			break;
+		case EXIF_FORMAT_RATIONAL:
+			exif_set_rational(data, bo, extractComponent<ExifRational>(index, value, "invalid assignment to data: could not convert value to rational format (2-tuple expected)"));
+			break;
+		case EXIF_FORMAT_SRATIONAL:
+			exif_set_srational(data, bo, extractComponent<ExifSRational>(index, value, "invalid assignment to data: could not convert value to signed rational format (2-tuple expected)"));
+			break;
+		case EXIF_FORMAT_ASCII: // handled in setData directly
+		case EXIF_FORMAT_UNDEFINED:
+			break;
+		}
+		return;
+	}
+
+	void setData(object data)
+	{
+		if(format() == EXIF_FORMAT_ASCII)
+		{
+			extract<std::string> xstr(data);
+			if(xstr.check())
+			{
+				std::string s= xstr();
+				if(entry_->data)
+					free(entry_->data);
+				entry_->components= s.size();
+				//std::cerr << "assigning " << s.size() << "-character string..\n";
+				entry_->size=
+					exif_format_get_size(format()) * entry_->components;
+				entry_->data= (unsigned char *)malloc(entry_->size);
+				memcpy(entry_->data, s.data(), entry_->size);
+				entry_->data[entry_->size]= 0;
+			}
+			else
+			{
+				PyErr_SetString(PyExc_TypeError,
+								"invalid assignment to data of ASCII format entry: string expected");
+				throw_error_already_set();
+			}
+		}
+		else
+		{
+			if(components()==1)
+				setComponent(0, data);
+			else
+			{
+				extract<list> xlist(data);
+				if(xlist.check())
+				{
+					list l= xlist();
+					for(unsigned i=0; i<components(); ++i)
+						setComponent(i, l[i]);
+				}
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+									"invalid assignment to data of entry with more than one component: list expected");
+					throw_error_already_set();
+				}
+			}
+		}
+	}
+};
+
+struct PythonContent : public Exif::Content
+{
+	typedef WrappedObjectIterator<PythonEntry, ExifEntry *> iterator;
+
+	PythonContent() {}
+	PythonContent(Exif::Content const &other) : Exif::Content(other) {}
+
+	PythonEntry entry(object index)
+	{
+		// TODO: use Exif::Content::entry() functions
+
+		extract<ExifTag> xtag(index);
+		if(xtag.check())
+		{
+			ExifTag index= xtag();
+			for(unsigned int i=0; i<size(); i++)
+			{
+				if(content_->entries[i]->tag == index)
+					return Exif::Entry(content_->entries[i]);
+			}
+			PyErr_SetString(PyExc_KeyError,
+							"tag not present in IFD content");
+			throw_error_already_set();
+		}
+		extract<int> xint(index);
+		if(xint.check())
+		{
+			int index= xint();
+			if((index>=0) && (index<(long)size()))
+				return Exif::Entry(content_->entries[index]);
+			if((index<0) && (index>=-(long)size()))
+				return Exif::Entry(content_->entries[size()+index]);
+			PyErr_SetString(PyExc_IndexError,
+							"invalid integer index into IFD content");
+			throw_error_already_set();
+		}
+		PyErr_SetString(PyExc_TypeError,
+						"invalid index into EXIF data (integer or IFD expected)");
+		throw_error_already_set();
+		return Exif::Entry(); // never reached
+	}
+
+	iterator __iter__()
+	{
+		// FIXME: the public API is exif_content_foreach,
+		// relying on memory layout here!
+		return iterator(content_->entries,
+						content_->entries + content_->count);
+	}
+};
+
+struct PythonData : public Exif::Data
+{
+	typedef WrappedObjectIterator<PythonContent, ExifContent *> iterator;
+	bool success_;
+
+	PythonData() {}
+	PythonData(const char *path)
+	: Exif::Data(path, &success_)
+	{
+		if(!success_)
+		{
+			PyErr_SetFromErrno(PyExc_IOError);
+			//PyErr_SetString(PyExc_IOError, "");
+			throw_error_already_set();
+		}
+	}
+	PythonData(const unsigned char *data,
+			   unsigned int size) : Exif::Data(data, size) {}
+	PythonData(Exif::Data const &other) : Exif::Data(other) {}
+
+	PythonContent ifdContent(object index)
+	{
+		extract<ExifIfd> xifd(index);
+		if(xifd.check())
+		{
+			ExifIfd index= xifd();
+			if(index<EXIF_IFD_COUNT)
+				return Exif::Content(data_->ifd[index]);
+			PyErr_SetString(PyExc_IndexError,
+							"invalid IFD index into EXIF data");
+			throw_error_already_set();
+		}
+		extract<int> xint(index);
+		if(xint.check())
+		{
+			int index= xint();
+			if((index>=0) && (index<(long)size()))
+				return Exif::Content(data_->ifd[index]);
+			if((index<0) && (index>=-(long)size()))
+				return Exif::Content(data_->ifd[size()+index]);
+			PyErr_SetString(PyExc_IndexError,
+							"invalid integer index into EXIF data");
+			throw_error_already_set();
+		}
+		PyErr_SetString(PyExc_TypeError,
+						"invalid index into EXIF data (integer or IFD expected)");
+		throw_error_already_set();
+		return Exif::Content(); // never reached
+	}
+
+	iterator __iter__()
+	{
+		return iterator(data_->ifd, data_->ifd + EXIF_IFD_COUNT);
+	}
+};
+
+template<class Rational, class Component>
+struct RationalConverter
+{
+	RationalConverter()
+	{
+		converter::registry::insert(&convertible, &construct,
+									type_id<Rational>());
+	}
+
+    static void* convertible(PyObject* obj)
+    {
+		extract<tuple> xtup(obj);
+		if(xtup.check())
+		{
+			tuple t= xtup();
+			if((t.attr("__len__")() == 2) &&
+			   extract<Component>(t[0]).check() &&
+			   extract<Component>(t[1]).check())
+			{
+				Rational *result = new Rational;
+				result->numerator =   extract<Component>(t[0])();
+				result->denominator = extract<Component>(t[1])();
+				return result;
+			}
+		}
+		return NULL;
+    }
+
+    static void construct(PyObject* obj, converter::rvalue_from_python_stage1_data* data)
+    {
+		Rational const* r =
+			static_cast<Rational*>(data->convertible);
+        void* storage =
+			((converter::rvalue_from_python_storage<Rational>*)data)->storage.bytes;
+        new (storage) Rational();
+		((Rational*)storage)->numerator = r->numerator;
+		((Rational*)storage)->denominator = r->denominator;
+        data->convertible = storage;
+		delete r;
+	}
+
+	static PyObject *convert(Rational r)
+	{
+		tuple t= make_tuple(r.numerator, r.denominator);
+		PyObject *result= t.ptr();
+		Py_INCREF(result);
+		return result;
+	}
+};
+
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(entrydumps, Exif::Entry::dump, 0, 1)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(contentdumps, Exif::Content::dump, 0, 1)
+
+BOOST_PYTHON_MODULE(exif)
+{
+	RationalConverter<ExifRational, ExifLong>();
+	RationalConverter<ExifSRational, ExifSLong>();
+	to_python_converter<ExifRational,
+		RationalConverter<ExifRational, ExifLong> >();
+	to_python_converter<ExifSRational,
+		RationalConverter<ExifSRational, ExifSLong> >();
+
+	enum_<ExifByteOrder>("ByteOrder")
+		.value("MOTOROLA", EXIF_BYTE_ORDER_MOTOROLA)
+		.value("INTEL", EXIF_BYTE_ORDER_INTEL);
+
+	def("name", &exif_byte_order_get_name);
+
+	enum_<ExifIfd>("IFD")
+		.value("ZERO", EXIF_IFD_0)
+		.value("ONE", EXIF_IFD_1)
+		.value("EXIF", EXIF_IFD_EXIF)
+		.value("GPS", EXIF_IFD_GPS)
+		.value("INTEROPERABILITY", EXIF_IFD_INTEROPERABILITY);
+	//.value("COUNT", EXIF_IFD_COUNT)
+
+	def("name", &exif_ifd_get_name);
+
+	enum_<ExifFormat>("Format")
+		.value("BYTE", EXIF_FORMAT_BYTE)
+		.value("ASCII", EXIF_FORMAT_ASCII)
+		.value("SHORT", EXIF_FORMAT_SHORT)
+		.value("LONG", EXIF_FORMAT_LONG)
+		.value("RATIONAL", EXIF_FORMAT_RATIONAL)
+		.value("UNDEFINED", EXIF_FORMAT_UNDEFINED)
+		.value("SLONG", EXIF_FORMAT_SLONG)
+		.value("SRATIONAL", EXIF_FORMAT_SRATIONAL);
+
+	def("name", &exif_format_get_name);
+	def("size", &exif_format_get_size);
+
+	enum_<ExifTag>("Tag")
+		.value("INTEROPERABILITY_INDEX", EXIF_TAG_INTEROPERABILITY_INDEX)
+		.value("INTEROPERABILITY_VERSION", EXIF_TAG_INTEROPERABILITY_VERSION)
+		.value("IMAGE_WIDTH", EXIF_TAG_IMAGE_WIDTH)
+		.value("IMAGE_LENGTH", EXIF_TAG_IMAGE_LENGTH)
+		.value("BITS_PER_SAMPLE", EXIF_TAG_BITS_PER_SAMPLE)
+		.value("COMPRESSION", EXIF_TAG_COMPRESSION)
+		.value("PHOTOMETRIC_INTERPRETATION", EXIF_TAG_PHOTOMETRIC_INTERPRETATION)
+		.value("FILL_ORDER", EXIF_TAG_FILL_ORDER)
+		.value("DOCUMENT_NAME", EXIF_TAG_DOCUMENT_NAME)
+		.value("IMAGE_DESCRIPTION", EXIF_TAG_IMAGE_DESCRIPTION)
+		.value("MAKE", EXIF_TAG_MAKE)
+		.value("MODEL", EXIF_TAG_MODEL)
+		.value("STRIP_OFFSETS", EXIF_TAG_STRIP_OFFSETS)
+		.value("ORIENTATION", EXIF_TAG_ORIENTATION)
+		.value("SAMPLES_PER_PIXEL", EXIF_TAG_SAMPLES_PER_PIXEL)
+		.value("ROWS_PER_STRIP", EXIF_TAG_ROWS_PER_STRIP)
+		.value("STRIP_BYTE_COUNTS", EXIF_TAG_STRIP_BYTE_COUNTS)
+		.value("X_RESOLUTION", EXIF_TAG_X_RESOLUTION)
+		.value("Y_RESOLUTION", EXIF_TAG_Y_RESOLUTION)
+		.value("PLANAR_CONFIGURATION", EXIF_TAG_PLANAR_CONFIGURATION)
+		.value("RESOLUTION_UNIT", EXIF_TAG_RESOLUTION_UNIT)
+		.value("TRANSFER_FUNCTION", EXIF_TAG_TRANSFER_FUNCTION)
+		.value("SOFTWARE", EXIF_TAG_SOFTWARE)
+		.value("DATE_TIME", EXIF_TAG_DATE_TIME)
+		.value("ARTIST", EXIF_TAG_ARTIST)
+		.value("WHITE_POINT", EXIF_TAG_WHITE_POINT)
+		.value("PRIMARY_CHROMATICITIES", EXIF_TAG_PRIMARY_CHROMATICITIES)
+		.value("TRANSFER_RANGE", EXIF_TAG_TRANSFER_RANGE)
+		.value("JPEG_PROC", EXIF_TAG_JPEG_PROC)
+		.value("JPEG_INTERCHANGE_FORMAT", EXIF_TAG_JPEG_INTERCHANGE_FORMAT)
+		.value("JPEG_INTERCHANGE_FORMAT_LENGTH", EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH)
+		.value("YCBCR_COEFFICIENTS", EXIF_TAG_YCBCR_COEFFICIENTS)
+		.value("YCBCR_SUB_SAMPLING", EXIF_TAG_YCBCR_SUB_SAMPLING)
+		.value("YCBCR_POSITIONING", EXIF_TAG_YCBCR_POSITIONING)
+		.value("REFERENCE_BLACK_WHITE", EXIF_TAG_REFERENCE_BLACK_WHITE)
+		.value("RELATED_IMAGE_FILE_FORMAT", EXIF_TAG_RELATED_IMAGE_FILE_FORMAT)
+		.value("RELATED_IMAGE_WIDTH", EXIF_TAG_RELATED_IMAGE_WIDTH)
+		.value("RELATED_IMAGE_LENGTH", EXIF_TAG_RELATED_IMAGE_LENGTH)
+		.value("CFA_REPEAT_PATTERN_DIM", EXIF_TAG_CFA_REPEAT_PATTERN_DIM)
+		.value("CFA_PATTERN", EXIF_TAG_CFA_PATTERN)
+		.value("BATTERY_LEVEL", EXIF_TAG_BATTERY_LEVEL)
+		.value("COPYRIGHT", EXIF_TAG_COPYRIGHT)
+		.value("EXPOSURE_TIME", EXIF_TAG_EXPOSURE_TIME)
+		.value("FNUMBER", EXIF_TAG_FNUMBER)
+		.value("IPTC_NAA", EXIF_TAG_IPTC_NAA)
+		.value("EXIF_IFD_POINTER", EXIF_TAG_EXIF_IFD_POINTER)
+		.value("INTER_COLOR_PROFILE", EXIF_TAG_INTER_COLOR_PROFILE)
+		.value("EXPOSURE_PROGRAM", EXIF_TAG_EXPOSURE_PROGRAM)
+		.value("SPECTRAL_SENSITIVITY", EXIF_TAG_SPECTRAL_SENSITIVITY)
+		.value("GPS_INFO_IFD_POINTER", EXIF_TAG_GPS_INFO_IFD_POINTER)
+		.value("ISO_SPEED_RATINGS", EXIF_TAG_ISO_SPEED_RATINGS)
+		.value("OECF", EXIF_TAG_OECF)
+		.value("EXIF_VERSION", EXIF_TAG_EXIF_VERSION)
+		.value("DATE_TIME_ORIGINAL", EXIF_TAG_DATE_TIME_ORIGINAL)
+		.value("DATE_TIME_DIGITIZED", EXIF_TAG_DATE_TIME_DIGITIZED)
+		.value("COMPONENTS_CONFIGURATION", EXIF_TAG_COMPONENTS_CONFIGURATION)
+		.value("COMPRESSED_BITS_PER_PIXEL", EXIF_TAG_COMPRESSED_BITS_PER_PIXEL)
+		.value("SHUTTER_SPEED_VALUE", EXIF_TAG_SHUTTER_SPEED_VALUE)
+		.value("APERTURE_VALUE", EXIF_TAG_APERTURE_VALUE)
+		.value("BRIGHTNESS_VALUE", EXIF_TAG_BRIGHTNESS_VALUE)
+		.value("EXPOSURE_BIAS_VALUE", EXIF_TAG_EXPOSURE_BIAS_VALUE)
+		.value("MAX_APERTURE_VALUE", EXIF_TAG_MAX_APERTURE_VALUE)
+		.value("SUBJECT_DISTANCE", EXIF_TAG_SUBJECT_DISTANCE)
+		.value("METERING_MODE", EXIF_TAG_METERING_MODE)
+		.value("LIGHT_SOURCE", EXIF_TAG_LIGHT_SOURCE)
+		.value("FLASH", EXIF_TAG_FLASH)
+		.value("FOCAL_LENGTH", EXIF_TAG_FOCAL_LENGTH)
+		.value("SUBJECT_AREA", EXIF_TAG_SUBJECT_AREA)
+		.value("MAKER_NOTE", EXIF_TAG_MAKER_NOTE)
+		.value("USER_COMMENT", EXIF_TAG_USER_COMMENT)
+		.value("SUBSEC_TIME", EXIF_TAG_SUBSEC_TIME)
+		.value("SUB_SEC_TIME_ORIGINAL", EXIF_TAG_SUB_SEC_TIME_ORIGINAL)
+		.value("SUB_SEC_TIME_DIGITIZED", EXIF_TAG_SUB_SEC_TIME_DIGITIZED)
+		.value("FLASH_PIX_VERSION", EXIF_TAG_FLASH_PIX_VERSION)
+		.value("COLOR_SPACE", EXIF_TAG_COLOR_SPACE)
+		.value("PIXEL_X_DIMENSION", EXIF_TAG_PIXEL_X_DIMENSION)
+		.value("PIXEL_Y_DIMENSION", EXIF_TAG_PIXEL_Y_DIMENSION)
+		.value("RELATED_SOUND_FILE", EXIF_TAG_RELATED_SOUND_FILE)
+		.value("INTEROPERABILITY_IFD_POINTER", EXIF_TAG_INTEROPERABILITY_IFD_POINTER)
+		.value("FLASH_ENERGY", EXIF_TAG_FLASH_ENERGY)
+		.value("SPATIAL_FREQUENCY_RESPONSE", EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE)
+		.value("FOCAL_PLANE_X_RESOLUTION", EXIF_TAG_FOCAL_PLANE_X_RESOLUTION)
+		.value("FOCAL_PLANE_Y_RESOLUTION", EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION)
+		.value("FOCAL_PLANE_RESOLUTION_UNIT", EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT)
+		.value("SUBJECT_LOCATION", EXIF_TAG_SUBJECT_LOCATION)
+		.value("EXPOSURE_INDEX", EXIF_TAG_EXPOSURE_INDEX)
+		.value("SENSING_METHOD", EXIF_TAG_SENSING_METHOD)
+		.value("FILE_SOURCE", EXIF_TAG_FILE_SOURCE)
+		.value("SCENE_TYPE", EXIF_TAG_SCENE_TYPE)
+		.value("NEW_CFA_PATTERN", EXIF_TAG_NEW_CFA_PATTERN)
+		.value("CUSTOM_RENDERED", EXIF_TAG_CUSTOM_RENDERED)
+		.value("EXPOSURE_MODE", EXIF_TAG_EXPOSURE_MODE)
+		.value("WHITE_BALANCE", EXIF_TAG_WHITE_BALANCE)
+		.value("DIGITAL_ZOOM_RATIO", EXIF_TAG_DIGITAL_ZOOM_RATIO)
+		.value("FOCAL_LENGTH_IN_35MM_FILM", EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM)
+		.value("SCENE_CAPTURE_TYPE", EXIF_TAG_SCENE_CAPTURE_TYPE)
+		.value("GAIN_CONTROL", EXIF_TAG_GAIN_CONTROL)
+		.value("CONTRAST", EXIF_TAG_CONTRAST)
+		.value("SATURATION", EXIF_TAG_SATURATION)
+		.value("SHARPNESS", EXIF_TAG_SHARPNESS)
+		.value("DEVICE_SETTING_DESCRIPTION", EXIF_TAG_DEVICE_SETTING_DESCRIPTION)
+		.value("SUBJECT_DISTANCE_RANGE", EXIF_TAG_SUBJECT_DISTANCE_RANGE)
+		.value("IMAGE_UNIQUE_ID", EXIF_TAG_IMAGE_UNIQUE_ID);
+
+	def("name", &exif_tag_get_name);
+	def("title", &exif_tag_get_title);
+	def("description", &exif_tag_get_description);
+
+	class_<PythonEntry>("Entry")
+		.add_property("tag", &Exif::Entry::tag)
+		.add_property("format", &Exif::Entry::format)
+		.add_property("components", &Exif::Entry::components)
+		.add_property("data", &PythonEntry::data,
+					  &PythonEntry::setData)
+		.def("value", &Exif::Entry::value)
+		.def("briefValue", &Exif::Entry::briefValue)
+		.def("dump", &Exif::Entry::dump);//, entrydumps());
+
+	class_<PythonContent::iterator>("ContentIterator", no_init)
+		.def("next", &PythonContent::iterator::next);
+	class_<PythonContent>("Content")
+		.def("__len__", &Exif::Content::size)
+		.def("__getitem__", &PythonContent::entry)
+		.def("__iter__", &PythonContent::__iter__)
+ 		.def("dump", &Exif::Content::dump);//, contentdumps());
+
+	class_<PythonData::iterator>("DataIterator", no_init)
+		.def("next", &PythonData::iterator::next);
+	class_<PythonData>("Data")
+		.def(init<const char *>())
+		.def(init<const unsigned char *, unsigned int>())
+		.def("__len__", &Exif::Data::size)
+		.def("__getitem__", &PythonData::ifdContent)
+		.def("__iter__", &PythonData::__iter__)
+		.def("byteOrder", &Exif::Data::byteOrder)
+		.def("dump", &Exif::Data::dump);
+}
diff --git a/contrib/examples/.gitignore b/contrib/examples/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/contrib/examples/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/contrib/examples/Makefile.in b/contrib/examples/Makefile.in
deleted file mode 100644
index ab630af..0000000
--- a/contrib/examples/Makefile.in
+++ /dev/null
@@ -1,552 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-check_PROGRAMS = photographer$(EXEEXT) thumbnail$(EXEEXT) \
-	write-exif$(EXEEXT)
-subdir = contrib/examples
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-photographer_SOURCES = photographer.c
-photographer_OBJECTS = photographer.$(OBJEXT)
-photographer_LDADD = $(LDADD)
-photographer_DEPENDENCIES = $(top_builddir)/libexif/libexif.la
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-thumbnail_SOURCES = thumbnail.c
-thumbnail_OBJECTS = thumbnail.$(OBJEXT)
-thumbnail_LDADD = $(LDADD)
-thumbnail_DEPENDENCIES = $(top_builddir)/libexif/libexif.la
-write_exif_SOURCES = write-exif.c
-write_exif_OBJECTS = write-exif.$(OBJEXT)
-write_exif_LDADD = $(LDADD)
-write_exif_DEPENDENCIES = $(top_builddir)/libexif/libexif.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = photographer.c thumbnail.c write-exif.c
-DIST_SOURCES = photographer.c thumbnail.c write-exif.c
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Example programs with dependencies other than plain libexif
-COMPLICATED_EXAMPLES = cam_features.c
-
-# Build just the simple examples as a sanity check, but include them all in
-# the source archive
-EXTRA_DIST = $(COMPLICATED_EXAMPLES)
-LDADD = $(top_builddir)/libexif/libexif.la
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu contrib/examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-photographer$(EXEEXT): $(photographer_OBJECTS) $(photographer_DEPENDENCIES) 
-	@rm -f photographer$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(photographer_OBJECTS) $(photographer_LDADD) $(LIBS)
-thumbnail$(EXEEXT): $(thumbnail_OBJECTS) $(thumbnail_DEPENDENCIES) 
-	@rm -f thumbnail$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(thumbnail_OBJECTS) $(thumbnail_LDADD) $(LIBS)
-write-exif$(EXEEXT): $(write_exif_OBJECTS) $(write_exif_DEPENDENCIES) 
-	@rm -f write-exif$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(write_exif_OBJECTS) $(write_exif_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/photographer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thumbnail.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write-exif.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/contrib/examples/write-exif.c b/contrib/examples/write-exif.c
index 894cdb6..bae2786 100644
--- a/contrib/examples/write-exif.c
+++ b/contrib/examples/write-exif.c
@@ -193,7 +193,7 @@ static ExifEntry *create_tag(ExifData *exif, ExifIfd ifd, ExifTag tag, size_t le
 	return entry;
 }
 
-int main(int argc, char **argv)
+int main ()
 {
 	int rc = 1;
 	FILE *f;
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..2e6c796
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+.libs
+.deps
+*.o
+*.lo
+Doxyfile
+Doxyfile-internals
diff --git a/doc/Doxyfile-internals.in b/doc/Doxyfile-internals.in
index bbf3d75..0dda68c 100644
--- a/doc/Doxyfile-internals.in
+++ b/doc/Doxyfile-internals.in
@@ -1,1216 +1,2443 @@
-# Doxyfile 1.4.2
+# Doxyfile 1.8.13
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = "@PACKAGE_NAME@ (@PACKAGE_TARNAME@) Internals"
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER         = "@PACKAGE_VERSION@"
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = @DOXYGEN_OUTPUT_DIR@
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
-# Swedish, and Ukrainian.
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
-ABBREVIATE_BRIEF       = 
+ABBREVIATE_BRIEF       =
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        = @top_srcdir@
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = YES
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
-ALIASES                = 
+TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = YES
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = YES
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = YES
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
 
-SHOW_DIRECTORIES       = YES
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from the 
-# version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the progam writes to standard output 
-# is used as the file version. See the manual for examples.
+SHOW_NAMESPACES        = YES
 
-FILE_VERSION_FILTER    = 
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = YES
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @top_srcdir@/libexif \
+                         @top_srcdir@/test
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
-INPUT                  = @top_srcdir@/libexif @top_srcdir@/test
+INPUT_ENCODING         = UTF-8
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
 
-FILE_PATTERNS          = *.h *.c
+FILE_PATTERNS          = *.h \
+                         *.c
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
-EXCLUDE                = 
+EXCLUDE                =
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
-EXAMPLE_PATH           = 
+EXCLUDE_SYMBOLS        =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATH           =
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
-EXAMPLE_RECURSIVE      = NO
+EXAMPLE_PATTERNS       =
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
-IMAGE_PATH             = 
+EXAMPLE_RECURSIVE      = NO
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
-INPUT_FILTER           = 
+IMAGE_PATH             =
 
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = YES
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = YES
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          = _
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = @HTML_APIDOC_INTERNALS_DIR@
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
 # standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 @MAINTAINER_MODE_TRUE@HTML_FOOTER            = @srcdir@/footer.html
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
-# of the generated HTML documentation.
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = YES
+ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = 
+LATEX_EXTRA_STYLESHEET =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           = 
+LATEX_EXTRA_FILES      =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_SOURCE_CODE        = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_SCHEMA             = 
+XML_PROGRAMLISTING     = YES
 
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
 
-XML_DTD                = 
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
+GENERATE_DOCBOOK       = NO
 
-XML_PROGRAMLISTING     = YES
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = 
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
 # powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
 
 HAVE_DOT               = @HAVE_DOT@
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = YES
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = png
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
-DOT_PATH               = 
+MSCFILE_DIRS           =
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
 
-DOTFILE_DIRS           = 
+DIAFILE_DIRS           =
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+PLANTUML_JAR_PATH      =
 
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+PLANTUML_CFG_FILE      =
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that a graph may be further truncated if the graph's 
-# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
-# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
-# the graph is not depth-constrained.
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, which results in a white background. 
-# Warning: Depending on the platform used, enabling this option may lead to 
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
 # read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index d340ac6..fbdd649 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1,1216 +1,2442 @@
-# Doxyfile 1.4.2
+# Doxyfile 1.8.13
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = "@PACKAGE_NAME@ (@PACKAGE_TARNAME@) API"
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER         = "@PACKAGE_VERSION@"
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = @DOXYGEN_OUTPUT_DIR@
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
-# Swedish, and Ukrainian.
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
-ABBREVIATE_BRIEF       = 
+ABBREVIATE_BRIEF       =
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        = @top_srcdir@
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = YES
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
-ALIASES                = 
+TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = NO
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
 
-SHOW_DIRECTORIES       = YES
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from the 
-# version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the progam writes to standard output 
-# is used as the file version. See the manual for examples.
+SHOW_NAMESPACES        = YES
 
-FILE_VERSION_FILTER    = 
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = YES
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @top_srcdir@/libexif
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
 
-FILE_PATTERNS          = *.h *.c
+FILE_PATTERNS          = *.h \
+                         *.c
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = NO
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
-EXCLUDE                = 
+EXCLUDE                =
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
-EXAMPLE_PATH           = 
+EXCLUDE_SYMBOLS        =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATH           =
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
-EXAMPLE_RECURSIVE      = NO
+EXAMPLE_PATTERNS       =
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
-IMAGE_PATH             = 
+EXAMPLE_RECURSIVE      = NO
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
-INPUT_FILTER           = 
+IMAGE_PATH             =
 
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = YES
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          = _
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = @HTML_APIDOC_DIR@
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
 # standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 @MAINTAINER_MODE_TRUE@HTML_FOOTER            = @srcdir@/footer.html
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
-# of the generated HTML documentation.
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = YES
+ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = 
+LATEX_EXTRA_STYLESHEET =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           = 
+LATEX_EXTRA_FILES      =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_SOURCE_CODE        = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_SCHEMA             = 
+XML_PROGRAMLISTING     = YES
 
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
 
-XML_DTD                = 
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
+GENERATE_DOCBOOK       = NO
 
-XML_PROGRAMLISTING     = YES
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = 
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
 # powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
 
 HAVE_DOT               = @HAVE_DOT@
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = NO
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = png
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
-DOT_PATH               = 
+MSCFILE_DIRS           =
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
 
-DOTFILE_DIRS           = 
+DIAFILE_DIRS           =
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+PLANTUML_JAR_PATH      =
 
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+PLANTUML_CFG_FILE      =
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that a graph may be further truncated if the graph's 
-# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
-# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
-# the graph is not depth-constrained.
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, which results in a white background. 
-# Warning: Depending on the platform used, enabling this option may lead to 
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
 # read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/doc/Makefile.in b/doc/Makefile.in
deleted file mode 100644
index 3268e29..0000000
--- a/doc/Makefile.in
+++ /dev/null
@@ -1,535 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-########################################################################
-# Conditional rules, depending on tool availability
-########################################################################
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_1 = $(HTML_APIDOC_DIR).uploaded
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_2 = $(HTML_APIDOC_DIR).stamp
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_3 = $(HTML_APIDOC_DIR).tar.gz
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_4 = $(HTML_APIDOC_INTERNALS_DIR).uploaded
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_5 = $(HTML_APIDOC_INTERNALS_DIR).stamp
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_6 = $(HTML_APIDOC_INTERNALS_DIR).tar.gz
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_7 = install-apidocs-internals
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_8 = uninstall-apidocs-internals
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_9 = install-apidocs
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_10 = uninstall-apidocs
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@am__append_11 = clean-apidocs
-subdir = doc
-DIST_COMMON = $(srcdir)/Doxyfile-internals.in $(srcdir)/Doxyfile.in \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = Doxyfile Doxyfile-internals
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(docdir)"
-DATA = $(doc_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DOXYGEN_FILES = 
-DOXYGEN_STAMPS = $(am__append_2) $(am__append_5)
-DOXYGEN_UPLOAD = $(am__append_1) $(am__append_4)
-DOXYGEN_INSTALL_TARGETS = $(am__append_7) $(am__append_9)
-DOXYGEN_UNINSTALL_TARGETS = $(am__append_8) $(am__append_10)
-DOXYGEN_CLEAN_TARGETS = $(am__append_11)
-DOXYGEN_TARBALLS = $(am__append_3) $(am__append_6)
-
-########################################################################
-# Common part
-########################################################################
-EXTRA_DIST = Doxyfile.in Doxyfile-internals.in footer.html README.apidocs $(HTML_APIDOC_DIR).tar.gz
-doc_DATA = $(DOXYGEN_FILES)
-CLEANFILES = $(DOXYGEN_FILES) $(DOXYGEN_STAMPS)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Doxyfile-internals: $(top_builddir)/config.status $(srcdir)/Doxyfile-internals.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-docDATA: $(doc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-	done
-
-uninstall-docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docdir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA) all-local
-installdirs:
-	for dir in "$(DESTDIR)$(docdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local install-docDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-docDATA uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-docDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-docDATA uninstall-local
-
-
-# FIXME: Depending on the source files would be sufficient, but only
-#        maintainable with a completely non-recursive build.
-#        Depending on libexif.la works at least.
-$(top_builddir)/libexif/libexif.la:
-	cd $(top_builddir)/libexif && $(MAKE) libexif.la
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@$(HTML_APIDOC_DIR).stamp: Doxyfile $(top_builddir)/libexif/libexif.la
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	$(DOXYGEN) $<
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	echo > $@
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@$(HTML_APIDOC_DIR).tar.gz: $(HTML_APIDOC_DIR).stamp
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	(cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_DIR) | GZIP=--best gzip -c) > $@
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@$(HTML_APIDOC_INTERNALS_DIR).stamp: Doxyfile-internals $(top_builddir)/libexif/libexif.la
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	$(DOXYGEN) $<
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	echo > $@
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@$(HTML_APIDOC_INTERNALS_DIR).tar.gz: $(HTML_APIDOC_INTERNALS_DIR).stamp
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	(cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_INTERNALS_DIR) | GZIP=--best gzip -c) > $@
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@install-apidocs-internals: $(HTML_APIDOC_INTERNALS_DIR).stamp
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	mkdir -p "$(DESTDIR)$(docdir)"
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	find "$(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)" \
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@		\( -type d -exec chmod 0755 {} \; \) -or \
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@		\( -type f -exec chmod 0644 {} \; \)
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	(unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_INTERNALS_DIR)") \
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@		| (cd "$(DESTDIR)$(docdir)" && tar xpf -)
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@uninstall-apidocs-internals:
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	rm -rf "$(DESTDIR)$(docdir)/$(HTML_APIDOC_INTERNALS_DIR)"
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@install-apidocs: $(HTML_APIDOC_DIR).stamp
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	mkdir -p "$(DESTDIR)$(docdir)"
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	find "$(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)" \
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@		\( -type d -exec chmod 0755 {} \; \) -or \
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@		\( -type f -exec chmod 0644 {} \; \)
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	(unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_DIR)") \
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@		| (cd "$(DESTDIR)$(docdir)" && tar xpf -)
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@uninstall-apidocs:
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	rm -rf "$(DESTDIR)$(docdir)/$(HTML_APIDOC_DIR)"
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@clean-apidocs:
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	rm -rf $(DOXYGEN_OUTPUT_DIR)
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	rm -f $(HTML_APIDOC_DIR).tar.gz $(HTML_APIDOC_INTERNALS_DIR).tar.gz
-
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@$(DOXYGEN_UPLOAD): $(DOXYGEN_STAMPS)
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	find $(DOXYGEN_OUTPUT_DIR) \( -type d -exec chmod a+rx,go-w,g+s {} \; \) \
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@		-or \( -type f -exec chmod a+r {} \; \)
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/api/
-@BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/internals/
-@BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@	ssh "sf" "find /home/groups/l/li/libexif/htdocs/internals /home/groups/l/li/libexif/htdocs/api \( -type d -exec chgrp libexif {} \; -exec chmod g+rwxs,a+rx {} \; \) -or \( -type f -exec chgrp libexif {} \; -exec chmod g+rw {} \; \( -name '*.html' -or -name '*.png' -or -name '*.php' -or -name '*.jpg' -or -name '*.css' -name '*.dot' -name '*.map' \) -exec chmod a+r {} \; \)"
-
-all-local: $(DOXYGEN_STAMPS)
-
-install-data-local: $(DOXYGEN_INSTALL_TARGETS)
-
-uninstall-local: $(DOXYGEN_UNINSTALL_TARGETS)
-
-clean-local: $(DOXYGEN_CLEAN_TARGETS)
-
-upload: $(DOXYGEN_UPLOAD)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/doc/footer.html b/doc/footer.html
index 52ba8ab..dd88ecd 100644
--- a/doc/footer.html
+++ b/doc/footer.html
@@ -2,9 +2,7 @@
 
 <hr size="1">
 <address style="text-align: right;">
-<a href="http://sourceforge.net" title="Hosted by SourceForge.net" target="_top">
-<img src="http://sourceforge.net/sflogo.php?group_id=12272&amp;type=1"
-width="88" height="31" border="0" align="top" alt="SourceForge.net Logo" /></a>
+<a href="https://libexif.github.io" target="_top">libexif</a>
 
 <small>Generated by&nbsp;<a href="http://www.doxygen.org/" target="_top"><img src="doxygen.png" alt="doxygen" align="middle" border="0">
 </a>
diff --git a/doc/libexif-api.html.tar.gz b/doc/libexif-api.html.tar.gz
deleted file mode 100644
index 0463958..0000000
--- a/doc/libexif-api.html.tar.gz
+++ /dev/null
diff --git a/packaging/libexif.manifest b/libexif.manifest
index 97e8c31..97e8c31 100644
--- a/packaging/libexif.manifest
+++ b/libexif.manifest
diff --git a/libexif.spec.in b/libexif.spec.in
index 48930b1..2dbedc6 100644
--- a/libexif.spec.in
+++ b/libexif.spec.in
@@ -2,8 +2,8 @@ Name: @PACKAGE@
 Summary: EXIF tag library
 Version: @VERSION@
 Release: 1
-Source: http://prdownloads.sourceforge.net/libexif/%{name}-%{version}.tar.bz2
-Url: http://sourceforge.net/projects/libexif/
+Source: https://prdownloads.sourceforge.net/libexif/%{name}-%{version}.tar.bz2
+Url: https://libexif.github.io/
 Group: System Environment/Libraries
 License: LGPL
 # replaced Packager: header, as most people making packages will be somebody
diff --git a/libexif/.gitignore b/libexif/.gitignore
new file mode 100644
index 0000000..02334b0
--- /dev/null
+++ b/libexif/.gitignore
@@ -0,0 +1,10 @@
+Makefile
+Makefile.in
+.libs
+.deps
+libexif.la
+*.o
+*.lo
+*.la
+libexif.pc
+_stdint.h
diff --git a/libexif/Makefile.am b/libexif/Makefile.am
index 108116b..dde00ac 100644
--- a/libexif/Makefile.am
+++ b/libexif/Makefile.am
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
 EXTRA_DIST =
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
diff --git a/libexif/Makefile.in b/libexif/Makefile.in
deleted file mode 100644
index 1156f64..0000000
--- a/libexif/Makefile.in
+++ /dev/null
@@ -1,856 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(libexifinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/canon/Makefile-files \
-	$(srcdir)/fuji/Makefile-files $(srcdir)/olympus/Makefile-files \
-	$(srcdir)/pentax/Makefile-files
-subdir = libexif
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)" \
-	"$(DESTDIR)$(libexifincludedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-am_libexif_la_OBJECTS = exif-byte-order.lo exif-content.lo \
-	exif-data.lo exif-entry.lo exif-format.lo exif-ifd.lo \
-	exif-loader.lo exif-log.lo exif-mem.lo exif-mnote-data.lo \
-	exif-tag.lo exif-utils.lo
-libexif_la_OBJECTS = $(am_libexif_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-libexif_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libexif_la_LDFLAGS) $(LDFLAGS) -o $@
-libmnote_canon_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libmnote_canon_la_OBJECTS = exif-mnote-data-canon.lo \
-	mnote-canon-entry.lo mnote-canon-tag.lo
-libmnote_canon_la_OBJECTS = $(am_libmnote_canon_la_OBJECTS)
-libmnote_fuji_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libmnote_fuji_la_OBJECTS = mnote-fuji-entry.lo \
-	exif-mnote-data-fuji.lo mnote-fuji-tag.lo
-libmnote_fuji_la_OBJECTS = $(am_libmnote_fuji_la_OBJECTS)
-libmnote_olympus_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libmnote_olympus_la_OBJECTS = mnote-olympus-entry.lo \
-	exif-mnote-data-olympus.lo mnote-olympus-tag.lo
-libmnote_olympus_la_OBJECTS = $(am_libmnote_olympus_la_OBJECTS)
-libmnote_pentax_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libmnote_pentax_la_OBJECTS = mnote-pentax-entry.lo \
-	exif-mnote-data-pentax.lo mnote-pentax-tag.lo
-libmnote_pentax_la_OBJECTS = $(am_libmnote_pentax_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libexif_la_SOURCES) $(libmnote_canon_la_SOURCES) \
-	$(libmnote_fuji_la_SOURCES) $(libmnote_olympus_la_SOURCES) \
-	$(libmnote_pentax_la_SOURCES)
-DIST_SOURCES = $(libexif_la_SOURCES) $(libmnote_canon_la_SOURCES) \
-	$(libmnote_fuji_la_SOURCES) $(libmnote_olympus_la_SOURCES) \
-	$(libmnote_pentax_la_SOURCES)
-HEADERS = $(libexifinclude_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = exif-system.h exif.h libexif.sym
-
-# The -no-undefined makes it possible to build DLLs for Windows,
-# or shared libraries for Tru64 or AIX (according to the autobook
-# chapter on "Portable Library Design"). It doesn't seem to hurt
-# elsewhere, so we can leave it in.
-lib_LTLIBRARIES = libexif.la
-
-# -*- Makefile -*-
-
-# -*- Makefile -*-
-
-# -*- Makefile -*-
-
-# -*- Makefile -*-
-noinst_LTLIBRARIES = libmnote-canon.la libmnote-fuji.la \
-	libmnote-olympus.la libmnote-pentax.la
-libmnote_canon_la_SOURCES = \
-	canon/exif-mnote-data-canon.c canon/exif-mnote-data-canon.h \
-	canon/mnote-canon-entry.c canon/mnote-canon-entry.h \
-	canon/mnote-canon-tag.c canon/mnote-canon-tag.h
-
-libmnote_canon_la_LIBADD = $(LTLIBINTL)
-libmnote_fuji_la_SOURCES = \
-	fuji/mnote-fuji-entry.c fuji/mnote-fuji-entry.h \
-	fuji/exif-mnote-data-fuji.c fuji/exif-mnote-data-fuji.h \
-	fuji/mnote-fuji-tag.c fuji/mnote-fuji-tag.h
-
-libmnote_fuji_la_LIBADD = $(LTLIBINTL)
-libmnote_olympus_la_SOURCES = \
-	olympus/mnote-olympus-entry.c olympus/mnote-olympus-entry.h \
-	olympus/exif-mnote-data-olympus.c olympus/exif-mnote-data-olympus.h \
-	olympus/mnote-olympus-tag.c olympus/mnote-olympus-tag.h
-
-libmnote_olympus_la_LIBADD = $(LTLIBINTL)
-libmnote_pentax_la_SOURCES = \
-	pentax/mnote-pentax-entry.c pentax/mnote-pentax-entry.h \
-	pentax/exif-mnote-data-pentax.c pentax/exif-mnote-data-pentax.h \
-	pentax/mnote-pentax-tag.c pentax/mnote-pentax-tag.h
-
-libmnote_pentax_la_LIBADD = $(LTLIBINTL)
-libexif_la_LDFLAGS = \
-	-export-symbols $(srcdir)/libexif.sym \
-	-no-undefined -version-info @LIBEXIF_VERSION_INFO@
-
-libexif_la_SOURCES = \
-	exif-byte-order.c	\
-	exif-content.c		\
-	exif-data.c		\
-	exif-entry.c		\
-	exif-format.c		\
-	exif-ifd.c		\
-	exif-loader.c		\
-	exif-log.c		\
-	exif-mem.c		\
-	exif-mnote-data.c	\
-	exif-mnote-data-priv.h	\
-	exif-tag.c		\
-	exif-utils.c		\
-	i18n.h
-
-libexif_la_DEPENDENCIES = \
-	$(srcdir)/libexif.sym \
-	libmnote-canon.la		\
-	libmnote-fuji.la		\
-	libmnote-olympus.la	\
-	libmnote-pentax.la
-
-libexif_la_LIBADD = \
-	$(LTLIBINTL)			\
-	libmnote-canon.la		\
-	libmnote-fuji.la	\
-	libmnote-olympus.la	\
-	libmnote-pentax.la
-
-libexifincludedir = $(includedir)/libexif
-libexifinclude_HEADERS = \
-	exif-byte-order.h	\
-	exif-content.h		\
-	exif-data.h		\
-	exif-data-type.h \
-	exif-entry.h		\
-	exif-format.h		\
-	exif-ifd.h		\
-	exif-loader.h		\
-	exif-log.h		\
-	exif-mem.h		\
-	exif-mnote-data.h	\
-	exif-tag.h		\
-	exif-utils.h		\
-	_stdint.h
-
-DISTCLEANFILES = _stdint.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/canon/Makefile-files $(srcdir)/fuji/Makefile-files $(srcdir)/olympus/Makefile-files $(srcdir)/pentax/Makefile-files $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libexif/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu libexif/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libexif.la: $(libexif_la_OBJECTS) $(libexif_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libexif_la_LINK) -rpath $(libdir) $(libexif_la_OBJECTS) $(libexif_la_LIBADD) $(LIBS)
-libmnote-canon.la: $(libmnote_canon_la_OBJECTS) $(libmnote_canon_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libmnote_canon_la_OBJECTS) $(libmnote_canon_la_LIBADD) $(LIBS)
-libmnote-fuji.la: $(libmnote_fuji_la_OBJECTS) $(libmnote_fuji_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libmnote_fuji_la_OBJECTS) $(libmnote_fuji_la_LIBADD) $(LIBS)
-libmnote-olympus.la: $(libmnote_olympus_la_OBJECTS) $(libmnote_olympus_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libmnote_olympus_la_OBJECTS) $(libmnote_olympus_la_LIBADD) $(LIBS)
-libmnote-pentax.la: $(libmnote_pentax_la_OBJECTS) $(libmnote_pentax_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libmnote_pentax_la_OBJECTS) $(libmnote_pentax_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-byte-order.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-content.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-entry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-format.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-ifd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-loader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-mem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-mnote-data-canon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-mnote-data-fuji.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-mnote-data-olympus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-mnote-data-pentax.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-mnote-data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-tag.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exif-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-canon-entry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-canon-tag.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-fuji-entry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-fuji-tag.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-olympus-entry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-olympus-tag.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-pentax-entry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-pentax-tag.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-exif-mnote-data-canon.lo: canon/exif-mnote-data-canon.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT exif-mnote-data-canon.lo -MD -MP -MF $(DEPDIR)/exif-mnote-data-canon.Tpo -c -o exif-mnote-data-canon.lo `test -f 'canon/exif-mnote-data-canon.c' || echo '$(srcdir)/'`canon/exif-mnote-data-canon.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/exif-mnote-data-canon.Tpo $(DEPDIR)/exif-mnote-data-canon.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='canon/exif-mnote-data-canon.c' object='exif-mnote-data-canon.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o exif-mnote-data-canon.lo `test -f 'canon/exif-mnote-data-canon.c' || echo '$(srcdir)/'`canon/exif-mnote-data-canon.c
-
-mnote-canon-entry.lo: canon/mnote-canon-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mnote-canon-entry.lo -MD -MP -MF $(DEPDIR)/mnote-canon-entry.Tpo -c -o mnote-canon-entry.lo `test -f 'canon/mnote-canon-entry.c' || echo '$(srcdir)/'`canon/mnote-canon-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mnote-canon-entry.Tpo $(DEPDIR)/mnote-canon-entry.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='canon/mnote-canon-entry.c' object='mnote-canon-entry.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mnote-canon-entry.lo `test -f 'canon/mnote-canon-entry.c' || echo '$(srcdir)/'`canon/mnote-canon-entry.c
-
-mnote-canon-tag.lo: canon/mnote-canon-tag.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mnote-canon-tag.lo -MD -MP -MF $(DEPDIR)/mnote-canon-tag.Tpo -c -o mnote-canon-tag.lo `test -f 'canon/mnote-canon-tag.c' || echo '$(srcdir)/'`canon/mnote-canon-tag.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mnote-canon-tag.Tpo $(DEPDIR)/mnote-canon-tag.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='canon/mnote-canon-tag.c' object='mnote-canon-tag.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mnote-canon-tag.lo `test -f 'canon/mnote-canon-tag.c' || echo '$(srcdir)/'`canon/mnote-canon-tag.c
-
-mnote-fuji-entry.lo: fuji/mnote-fuji-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mnote-fuji-entry.lo -MD -MP -MF $(DEPDIR)/mnote-fuji-entry.Tpo -c -o mnote-fuji-entry.lo `test -f 'fuji/mnote-fuji-entry.c' || echo '$(srcdir)/'`fuji/mnote-fuji-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mnote-fuji-entry.Tpo $(DEPDIR)/mnote-fuji-entry.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fuji/mnote-fuji-entry.c' object='mnote-fuji-entry.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mnote-fuji-entry.lo `test -f 'fuji/mnote-fuji-entry.c' || echo '$(srcdir)/'`fuji/mnote-fuji-entry.c
-
-exif-mnote-data-fuji.lo: fuji/exif-mnote-data-fuji.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT exif-mnote-data-fuji.lo -MD -MP -MF $(DEPDIR)/exif-mnote-data-fuji.Tpo -c -o exif-mnote-data-fuji.lo `test -f 'fuji/exif-mnote-data-fuji.c' || echo '$(srcdir)/'`fuji/exif-mnote-data-fuji.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/exif-mnote-data-fuji.Tpo $(DEPDIR)/exif-mnote-data-fuji.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fuji/exif-mnote-data-fuji.c' object='exif-mnote-data-fuji.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o exif-mnote-data-fuji.lo `test -f 'fuji/exif-mnote-data-fuji.c' || echo '$(srcdir)/'`fuji/exif-mnote-data-fuji.c
-
-mnote-fuji-tag.lo: fuji/mnote-fuji-tag.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mnote-fuji-tag.lo -MD -MP -MF $(DEPDIR)/mnote-fuji-tag.Tpo -c -o mnote-fuji-tag.lo `test -f 'fuji/mnote-fuji-tag.c' || echo '$(srcdir)/'`fuji/mnote-fuji-tag.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mnote-fuji-tag.Tpo $(DEPDIR)/mnote-fuji-tag.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fuji/mnote-fuji-tag.c' object='mnote-fuji-tag.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mnote-fuji-tag.lo `test -f 'fuji/mnote-fuji-tag.c' || echo '$(srcdir)/'`fuji/mnote-fuji-tag.c
-
-mnote-olympus-entry.lo: olympus/mnote-olympus-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mnote-olympus-entry.lo -MD -MP -MF $(DEPDIR)/mnote-olympus-entry.Tpo -c -o mnote-olympus-entry.lo `test -f 'olympus/mnote-olympus-entry.c' || echo '$(srcdir)/'`olympus/mnote-olympus-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mnote-olympus-entry.Tpo $(DEPDIR)/mnote-olympus-entry.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='olympus/mnote-olympus-entry.c' object='mnote-olympus-entry.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mnote-olympus-entry.lo `test -f 'olympus/mnote-olympus-entry.c' || echo '$(srcdir)/'`olympus/mnote-olympus-entry.c
-
-exif-mnote-data-olympus.lo: olympus/exif-mnote-data-olympus.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT exif-mnote-data-olympus.lo -MD -MP -MF $(DEPDIR)/exif-mnote-data-olympus.Tpo -c -o exif-mnote-data-olympus.lo `test -f 'olympus/exif-mnote-data-olympus.c' || echo '$(srcdir)/'`olympus/exif-mnote-data-olympus.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/exif-mnote-data-olympus.Tpo $(DEPDIR)/exif-mnote-data-olympus.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='olympus/exif-mnote-data-olympus.c' object='exif-mnote-data-olympus.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o exif-mnote-data-olympus.lo `test -f 'olympus/exif-mnote-data-olympus.c' || echo '$(srcdir)/'`olympus/exif-mnote-data-olympus.c
-
-mnote-olympus-tag.lo: olympus/mnote-olympus-tag.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mnote-olympus-tag.lo -MD -MP -MF $(DEPDIR)/mnote-olympus-tag.Tpo -c -o mnote-olympus-tag.lo `test -f 'olympus/mnote-olympus-tag.c' || echo '$(srcdir)/'`olympus/mnote-olympus-tag.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mnote-olympus-tag.Tpo $(DEPDIR)/mnote-olympus-tag.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='olympus/mnote-olympus-tag.c' object='mnote-olympus-tag.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mnote-olympus-tag.lo `test -f 'olympus/mnote-olympus-tag.c' || echo '$(srcdir)/'`olympus/mnote-olympus-tag.c
-
-mnote-pentax-entry.lo: pentax/mnote-pentax-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mnote-pentax-entry.lo -MD -MP -MF $(DEPDIR)/mnote-pentax-entry.Tpo -c -o mnote-pentax-entry.lo `test -f 'pentax/mnote-pentax-entry.c' || echo '$(srcdir)/'`pentax/mnote-pentax-entry.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mnote-pentax-entry.Tpo $(DEPDIR)/mnote-pentax-entry.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pentax/mnote-pentax-entry.c' object='mnote-pentax-entry.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mnote-pentax-entry.lo `test -f 'pentax/mnote-pentax-entry.c' || echo '$(srcdir)/'`pentax/mnote-pentax-entry.c
-
-exif-mnote-data-pentax.lo: pentax/exif-mnote-data-pentax.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT exif-mnote-data-pentax.lo -MD -MP -MF $(DEPDIR)/exif-mnote-data-pentax.Tpo -c -o exif-mnote-data-pentax.lo `test -f 'pentax/exif-mnote-data-pentax.c' || echo '$(srcdir)/'`pentax/exif-mnote-data-pentax.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/exif-mnote-data-pentax.Tpo $(DEPDIR)/exif-mnote-data-pentax.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pentax/exif-mnote-data-pentax.c' object='exif-mnote-data-pentax.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o exif-mnote-data-pentax.lo `test -f 'pentax/exif-mnote-data-pentax.c' || echo '$(srcdir)/'`pentax/exif-mnote-data-pentax.c
-
-mnote-pentax-tag.lo: pentax/mnote-pentax-tag.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mnote-pentax-tag.lo -MD -MP -MF $(DEPDIR)/mnote-pentax-tag.Tpo -c -o mnote-pentax-tag.lo `test -f 'pentax/mnote-pentax-tag.c' || echo '$(srcdir)/'`pentax/mnote-pentax-tag.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mnote-pentax-tag.Tpo $(DEPDIR)/mnote-pentax-tag.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pentax/mnote-pentax-tag.c' object='mnote-pentax-tag.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mnote-pentax-tag.lo `test -f 'pentax/mnote-pentax-tag.c' || echo '$(srcdir)/'`pentax/mnote-pentax-tag.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-libexifincludeHEADERS: $(libexifinclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(libexifincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libexifincludedir)"
-	@list='$(libexifinclude_HEADERS)'; test -n "$(libexifincludedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libexifincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libexifincludedir)" || exit $$?; \
-	done
-
-uninstall-libexifincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libexifinclude_HEADERS)'; test -n "$(libexifincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexifincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexifincludedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexifincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-libexifincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES uninstall-libexifincludeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
-	ctags distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES \
-	install-libexifincludeHEADERS install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-libexifincludeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libexif/_stdint.h b/libexif/_stdint.h
deleted file mode 100644
index 80ecf41..0000000
--- a/libexif/_stdint.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* This file is generated automatically by configure */
-#include <stdint.h>
diff --git a/libexif/canon/.gitignore b/libexif/canon/.gitignore
new file mode 100644
index 0000000..8550dbf
--- /dev/null
+++ b/libexif/canon/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.la
+*.lo
diff --git a/libexif/canon/exif-mnote-data-canon.c b/libexif/canon/exif-mnote-data-canon.c
index 52f851b..ef4fcc6 100644
--- a/libexif/canon/exif-mnote-data-canon.c
+++ b/libexif/canon/exif-mnote-data-canon.c
@@ -32,6 +32,9 @@
 
 #define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize ))
 
+/* Total size limit to prevent abuse by DoS */
+#define FAILSAFE_SIZE_MAX 1000000L
+
 static void
 exif_mnote_data_canon_clear (ExifMnoteDataCanon *n)
 {
@@ -101,6 +104,8 @@ exif_mnote_data_canon_set_byte_order (ExifMnoteData *d, ExifByteOrder o)
 	o_orig = n->order;
 	n->order = o;
 	for (i = 0; i < n->count; i++) {
+		if (n->entries[i].components && (n->entries[i].size/n->entries[i].components < exif_format_get_size (n->entries[i].format)))
+			continue;
 		n->entries[i].order = o;
 		exif_array_set_byte_order (n->entries[i].format, n->entries[i].data,
 				n->entries[i].components, o_orig, o);
@@ -202,6 +207,7 @@ exif_mnote_data_canon_load (ExifMnoteData *ne,
 	ExifMnoteDataCanon *n = (ExifMnoteDataCanon *) ne;
 	ExifShort c;
 	size_t i, tcount, o, datao;
+	long failsafe_size = 0;
 
 	if (!n || !buf || !buf_size) {
 		exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
@@ -281,7 +287,7 @@ exif_mnote_data_canon_load (ExifMnoteData *ne,
 				exif_log (ne->log, EXIF_LOG_CODE_DEBUG,
 					"ExifMnoteCanon",
 					"Tag data past end of buffer (%u > %u)",
-					dataofs + s, buf_size);
+					(unsigned)(dataofs + s), buf_size);
 				continue;
 			}
 
@@ -293,6 +299,23 @@ exif_mnote_data_canon_load (ExifMnoteData *ne,
 			memcpy (n->entries[tcount].data, buf + dataofs, s);
 		}
 
+		/* Track the size of decoded tag data. A malicious file could
+		 * be crafted to cause extremely large values here without
+		 * tripping any buffer range checks.  This is especially bad
+		 * with the libexif representation of Canon MakerNotes because
+		 * some arrays are turned into individual tags that the
+		 * application must loop around. */
+		failsafe_size += mnote_canon_entry_count_values(&n->entries[tcount]);
+
+		if (failsafe_size > FAILSAFE_SIZE_MAX) {
+			/* Abort if the total size of the data in the tags extraordinarily large, */
+			exif_mem_free (ne->mem, n->entries[tcount].data);
+			exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
+					  "ExifMnoteCanon", "Failsafe tag size overflow (%lu > %ld)",
+					  failsafe_size, FAILSAFE_SIZE_MAX);
+			break;
+		}
+
 		/* Tag was successfully parsed */
 		++tcount;
 	}
@@ -363,6 +386,8 @@ int
 exif_mnote_data_canon_identify (const ExifData *ed, const ExifEntry *e)
 {
 	char value[8];
+
+	(void) e;  /* unused */
 	ExifEntry *em = exif_data_get_entry (ed, EXIF_TAG_MAKE);
 	if (!em) 
 		return 0;
diff --git a/libexif/canon/mnote-canon-entry.c b/libexif/canon/mnote-canon-entry.c
index b92f69c..f59dce3 100644
--- a/libexif/canon/mnote-canon-entry.c
+++ b/libexif/canon/mnote-canon-entry.c
@@ -31,8 +31,6 @@
 #include <libexif/exif-utils.h>
 #include <libexif/i18n.h>
 
-/* #define DEBUG */
-
 #define CF(format,target,v,maxlen)                              \
 {                                                               \
         if (format != target) {                                 \
@@ -552,14 +550,18 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
 {
 	char buf[128];
 	ExifLong vl;
+	ExifSLong vsl;
 	ExifShort vs, n;
+	ExifSShort vss;
 	unsigned char *data;
+	size_t	size;
 	double d;
 
 	if (!entry) 
 		return NULL;
 
 	data = entry->data;
+	size = entry->size;
 
 	memset (val, 0, maxlen);
 	maxlen--;
@@ -567,9 +569,14 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
 	switch (entry->tag) {
 	case MNOTE_CANON_TAG_SETTINGS_1:
 		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+
+		if (size < 2) return NULL;
 		n = exif_get_short (data, entry->order) / 2;
 		if (t >= n) return NULL;
+
 		CC (entry->components, n, val, maxlen);
+
+		if (size < 2 + t*2 + 2) return NULL;
 		vs = exif_get_short (data + 2 + t * 2, entry->order);
 		switch (t) {
 		case 1:
@@ -614,6 +621,7 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
 
 	case MNOTE_CANON_TAG_FOCAL_LENGTH:
 		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+		if (size < t*2 + 2) return NULL;
 		vs = exif_get_short (data + t * 2, entry->order);
 		switch (t) {
 		case 1:
@@ -630,59 +638,62 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
 
 	case MNOTE_CANON_TAG_SETTINGS_2:
 		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+		if (size < 2) return NULL;
 		n = exif_get_short (data, entry->order) / 2;
 		if (t >= n) return NULL;
 		CC (entry->components, n, val, maxlen);
-		vs = exif_get_short (data + 2 + t * 2, entry->order);
+		if (size < 2 + t*2 + 2) return NULL;
+		vss = exif_get_sshort (data + 2 + t * 2, entry->order);
 		switch (t) {
 		case 0:
-			snprintf (val, maxlen, "%.3f", pow (2, (ExifSShort)vs / 32.0));
+			snprintf (val, maxlen, "%.3f", pow (2, vss / 32.0));
 			break;
 		case 1:
-			snprintf (val, maxlen, "%.0f", apex_value_to_iso_speed ((ExifSShort)vs / 32.0));
+			snprintf (val, maxlen, "%.0f", apex_value_to_iso_speed (vss / 32.0));
 			break;
 		case 2:
 		case 5:
 		case 14:
 		case 16:
-			snprintf (val, maxlen, _("%.2f EV"), (ExifSShort)vs / 32.0);
+			snprintf (val, maxlen, _("%.2f EV"), vss / 32.0);
 			break;
 		case 3:
 		case 20:
-			snprintf (val, maxlen, "%.2f", apex_value_to_aperture (vs / 32.0));
+			snprintf (val, maxlen, "%.2f", apex_value_to_aperture (vss / 32.0));
 			break;
 		case 4:
 		case 21:
-			d = apex_value_to_shutter_speed ((ExifSShort)vs / 32.0);
+			d = apex_value_to_shutter_speed (vss / 32.0);
 			if (d < 1)
-				snprintf (val, maxlen, _("1/%i"),(int)(1.0 / d));
+				snprintf (val, maxlen, _("1/%.0f"), 1.0 / d);
 			else
-				snprintf (val, maxlen, "%i", (int) d);
+				snprintf (val, maxlen, "%.0f", d);
 			break;
 		case 8:
-			snprintf (val, maxlen, "%u", vs);
+			snprintf (val, maxlen, "%u", vss);
 			break;
 		case 12:
-			snprintf (val, maxlen, "%.2f", vs / 32.0);
+			snprintf (val, maxlen, "%.2f", vss / 32.0);
 			break;
 		case 18:
 		case 19:
-			snprintf (val, maxlen, _("%u mm"), vs);
+			snprintf (val, maxlen, _("%u mm"), vss);
 			break;
 		case 28:
-			if ((ExifSShort)vs <= 0) {
+			if (vss <= 0) {
 				strncpy(val, _("Off"), maxlen);
 				break;
 			}
-			snprintf (val, maxlen, _("%i (ms)"), vs * 100);
+			snprintf (val, maxlen, _("%i (ms)"), vss * 100);
 			break;
 		default:
-			canon_search_table_value (entries_settings_2, t, vs, val, maxlen);
+			canon_search_table_value (entries_settings_2, t, vss, val, maxlen);
 		}
 		break;
 
 	case MNOTE_CANON_TAG_PANORAMA:
 		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+		if (size < t*2 + 2) return NULL;
 		vs = exif_get_short (data + t * 2, entry->order);
 		canon_search_table_value (entries_panorama, t, vs, val, maxlen);
 		break;
@@ -704,6 +715,7 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
 	case MNOTE_CANON_TAG_IMAGE_NUMBER:
 		CF (entry->format, EXIF_FORMAT_LONG, val, maxlen);
 		CC (entry->components, 1, val, maxlen);
+		if (size < 4) return NULL;
 		vl = exif_get_long (data, entry->order);
 		snprintf (val, maxlen, "%03lu-%04lu",
 				(unsigned long) vl/10000,
@@ -713,15 +725,18 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
 	case MNOTE_CANON_TAG_SERIAL_NUMBER:
 		CF (entry->format, EXIF_FORMAT_LONG, val, maxlen);
 		CC (entry->components, 1, val, maxlen);
+		if (size < 4) return NULL;
 		vl = exif_get_long (data, entry->order);
 		snprintf (val, maxlen, "%04X-%05d", (int)vl>>16,(int)vl&0xffff);
 		break;
 
 	case MNOTE_CANON_TAG_CUSTOM_FUNCS:
 		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+		if (size < 2) return NULL;
 		n = exif_get_short (data, entry->order) / 2;
 		if (t >= n) return NULL;
 		CC (entry->components, n, val, maxlen);
+		if (size < 2 + t*2 + 2) return NULL;
 		vs = exif_get_short (data + 2 + t * 2, entry->order);
 		snprintf (buf, sizeof (buf), "%u", vs);
 		strncat (val, buf, maxlen - strlen (val));
@@ -729,33 +744,78 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
 
 	case MNOTE_CANON_TAG_COLOR_INFORMATION:
 		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+		if (size < 2) return NULL;
 		n = exif_get_short (data, entry->order) / 2;
 		if (t >= n) return NULL;
 		CC (entry->components, n, val, maxlen);
+		if (size < 2 + t*2 + 2) return NULL;
 		vs = exif_get_short (data + 2 + t * 2, entry->order);
 		canon_search_table_value (color_information, t, vs, val, maxlen);
 		break;
 
 	default:
-#ifdef DEBUG
-	  {
-		int i;
-		if (entry->format == EXIF_FORMAT_SHORT)
-		for(i=0;i<entry->components;i++) {
-			vs = exif_get_short (data, entry->order);
-			data+=2;
-			printf ("Value%d=%d\n", i, vs);
-		}
-		else if (entry->format == EXIF_FORMAT_LONG)
-		for(i=0;i<entry->components;i++) {
-			vl = exif_get_long (data, entry->order);
-			data+=4;
-			printf ("Value%d=%d\n", i, vs);
+		switch (entry->format) {
+		case EXIF_FORMAT_SHORT:
+		  {
+			size_t i, len = strlen(val);
+			for(i=0; i<entry->components; i++) {
+				if (size < 2)
+					break;
+				vs = exif_get_short (data, entry->order);
+				snprintf (val+len, maxlen-len, "%hu ", vs);
+				len = strlen(val);
+				data += 2;
+				size -= 2;
+			}
+		  }
+		  break;
+		case EXIF_FORMAT_SSHORT:
+		  {
+			size_t i, len = strlen(val);
+			for(i=0; i<entry->components; i++) {
+				if (size < 2)
+					break;
+				vss = exif_get_sshort (data, entry->order);
+				snprintf (val+len, maxlen-len, "%hi ", vss);
+				data += 2;
+				size -= 2;
+			}
+		  }
+		  break;
+		case EXIF_FORMAT_LONG:
+		  {
+			size_t i, len = strlen(val);
+			for(i=0; i<entry->components; i++) {
+				if (size < 4)
+					break;
+				vl = exif_get_long (data, entry->order);
+				snprintf (val+len, maxlen-len, "%lu ", (long unsigned) vl);
+				data += 4;
+				size -= 4;
+			}
+		  }
+		  break;
+		case EXIF_FORMAT_SLONG:
+		  {
+			size_t i, len = strlen(val);
+			for(i=0; i<entry->components; i++) {
+				if (size < 4)
+					break;
+				vsl = exif_get_slong (data, entry->order);
+				snprintf (val+len, maxlen-len, "%li ", (long int) vsl);
+				data += 4;
+				size -= 4;
+			}
+		  }
+		  break;
+		case EXIF_FORMAT_ASCII:
+			strncpy (val, (char *)data, MIN (entry->size, maxlen));
+			break;
+		default:
+		  snprintf (val, maxlen, _("%i bytes unknown data"),
+			  entry->size);
+		  break;
 		}
-		else if (entry->format == EXIF_FORMAT_ASCII)
-		    strncpy (val, data, MIN (entry->size, maxlen));
-	  }
-#endif
 		break;
 	}
 	return val;
diff --git a/libexif/canon/mnote-canon-tag.c b/libexif/canon/mnote-canon-tag.c
index 3cacfa6..38da412 100644
--- a/libexif/canon/mnote-canon-tag.c
+++ b/libexif/canon/mnote-canon-tag.c
@@ -108,7 +108,7 @@ static const struct {
 	{MNOTE_CANON_TAG_SETTINGS_2, 16, N_("AE Bracket Value")},
 	{MNOTE_CANON_TAG_SETTINGS_2, 18, N_("Focus Distance Upper")},
 	{MNOTE_CANON_TAG_SETTINGS_2, 19, N_("Focus Distance Lower")},
-	{MNOTE_CANON_TAG_SETTINGS_2, 20, N_("FNumber")},
+	{MNOTE_CANON_TAG_SETTINGS_2, 20, N_("F-Number")},
 	{MNOTE_CANON_TAG_SETTINGS_2, 21, N_("Exposure Time")},
 	{MNOTE_CANON_TAG_SETTINGS_2, 23, N_("Bulb Duration")},
 	{MNOTE_CANON_TAG_SETTINGS_2, 25, N_("Camera Type")},
@@ -160,7 +160,7 @@ mnote_canon_tag_get_title (MnoteCanonTag t)
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); 
+	(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
 		if (table[i].tag == t) return (_(table[i].title));
 	return NULL;
@@ -194,7 +194,7 @@ mnote_canon_tag_get_description (MnoteCanonTag t)
 		if (table[i].tag == t) {
 			if (!table[i].description || !*table[i].description)
 				return "";
-			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+			(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 			return _(table[i].description);
 		}
 	return NULL;
diff --git a/libexif/exif-byte-order.h b/libexif/exif-byte-order.h
index 10ded49..f48fb5e 100644
--- a/libexif/exif-byte-order.h
+++ b/libexif/exif-byte-order.h
@@ -37,7 +37,7 @@ typedef enum {
 
 /*! Return a short, localized, textual name for the given byte order.
  * \param[in] order byte order
- * \return localized textual name of the byte order
+ * \return localized textual name of the byte order, or NULL if unknown
  */
 const char *exif_byte_order_get_name (ExifByteOrder order);
 
diff --git a/libexif/exif-content.c b/libexif/exif-content.c
index 6d6c589..7338ee8 100644
--- a/libexif/exif-content.c
+++ b/libexif/exif-content.c
@@ -78,12 +78,18 @@ exif_content_new_mem (ExifMem *mem)
 void
 exif_content_ref (ExifContent *content)
 {
+	if (!content)
+		return;
+
 	content->priv->ref_count++;
 }
 
 void
 exif_content_unref (ExifContent *content)
 {
+	if (!content)
+		return;
+
 	content->priv->ref_count--;
 	if (!content->priv->ref_count)
 		exif_content_free (content);
@@ -114,15 +120,15 @@ void
 exif_content_dump (ExifContent *content, unsigned int indent)
 {
 	char buf[1024];
-	unsigned int i;
-
-	for (i = 0; i < 2 * indent; i++)
-		buf[i] = ' ';
-	buf[i] = '\0';
+	unsigned int i, l;
 
 	if (!content)
 		return;
 
+	l = MIN(sizeof(buf)-1, 2*indent);
+	memset(buf, ' ', l);
+	buf[l] = '\0';
+
 	printf ("%sDumping exif content (%u entries)...\n", buf,
 		content->count);
 	for (i = 0; i < content->count; i++)
diff --git a/libexif/exif-content.h b/libexif/exif-content.h
index d912ccf..a86acee 100644
--- a/libexif/exif-content.h
+++ b/libexif/exif-content.h
@@ -49,10 +49,46 @@ struct _ExifContent
 };
 
 /* Lifecycle */
+
+/*! Reserve memory for and initialize a new #ExifContent.
+ *
+ * \return new allocated #ExifContent, or NULL on error
+ *
+ * \see exif_content_new_mem, exif_content_unref
+ */
 ExifContent *exif_content_new     (void);
+
+/*! Reserve memory for and initialize new #ExifContent using the specified
+ * memory allocator.
+ *
+ * \return new allocated #ExifContent, or NULL on error
+ *
+ * \see exif_content_new, exif_content_unref
+ */
 ExifContent *exif_content_new_mem (ExifMem *);
+
+/*! Increase reference counter for #ExifContent.
+ *
+ * \param[in] content #ExifContent
+ *
+ * \see exif_content_unref
+ */
 void         exif_content_ref     (ExifContent *content);
+
+/*! Decrease reference counter for #ExifContent.
+ * When the reference count drops to zero, free the content.
+ *
+ * \param[in] content #ExifContent
+ */
 void         exif_content_unref   (ExifContent *content);
+
+/*! Actually free the #ExifContent.
+ *
+ * \deprecated Should not be called directly. Use #exif_content_ref and
+ *             #exif_content_unref instead.
+ *
+ * \param[in] content #ExifContent
+ */
 void         exif_content_free    (ExifContent *content);
 
 /*! Add an EXIF tag to an IFD.
diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 6bf3fe0..8b280d3 100755..100644
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -150,7 +150,7 @@ exif_data_new_mem (ExifMem *mem)
 ExifData *
 exif_data_new_from_data (const unsigned char *data, unsigned int size)
 {
-	ExifData *edata = NULL;
+	ExifData *edata;
 
 	edata = exif_data_new ();
 	exif_data_load_data (edata, data, size);
@@ -192,9 +192,15 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry,
 		doff = offset + 8;
 
 	/* Sanity checks */
-	if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) {
+	if (doff >= size) {
+		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+				  "Tag starts past end of buffer (%u > %u)", doff, size);
+		return 0;
+	}
+
+	if (s > size - doff) {
 		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-				  "Tag data past end of buffer (%u > %u)", doff+s, size);	
+				  "Tag data goes past end of buffer (%u > %u)", doff+s, size);
 		return 0;
 	}
 
@@ -203,8 +209,8 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry,
 		entry->size = s;
 		memcpy (entry->data, d + doff, s);
 	} else {
-		/* FIXME: What do our callers do if (entry->data == NULL)? */
 		EXIF_LOG_NO_MEMORY(data->priv->log, "ExifData", s);
+		return 0;
 	}
 
 	/* If this is the MakerNote, remember the offset */
@@ -302,7 +308,9 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e,
 	/* Write the data. Fill unneeded bytes with 0. Do not crash with
 	 * e->data is NULL */
 	if (e->data) {
-		memcpy (*d + 6 + doff, e->data, s);
+		unsigned int len = s;
+		if (e->size < s) len = e->size;
+		memcpy (*d + 6 + doff, e->data, len);
 	} else {
 		memset (*d + 6 + doff, 0, s);
 	}
@@ -315,13 +323,14 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d,
 			       unsigned int ds, ExifLong o, ExifLong s)
 {
 	/* Sanity checks */
-	if ((o + s < o) || (o + s < s) || (o + s > ds) || (o > ds)) {
-		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-			  "Bogus thumbnail offset (%u) or size (%u).",
-			  o, s);
+	if (o >= ds) {
+		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o);
+		return;
+	}
+	if (s > ds - o) {
+		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o);
 		return;
 	}
-
 	if (data->data) 
 		exif_mem_free (data->priv->mem, data->data);
 	if (!(data->data = exif_data_alloc (data, s))) {
@@ -439,6 +448,11 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
 		case EXIF_TAG_JPEG_INTERCHANGE_FORMAT:
 			o = exif_get_long (d + offset + 12 * i + 8,
 					   data->priv->order);
+			if (o >= ds) {
+				exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",
+					  "Tag data past end of buffer (%u > %u)", offset+2, ds);
+				return;
+			}
 			/* FIXME: IFD_POINTER tags aren't marked as being in a
 			 * specific IFD, so exif_tag_get_name_in_ifd won't work
 			 */
@@ -506,6 +520,11 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
 					break;
 			}
 			entry = exif_entry_new_mem (data->priv->mem);
+			if (!entry) {
+				  exif_log (data->priv->log, EXIF_LOG_CODE_NO_MEMORY, "ExifData",
+                                          "Could not allocate memory");
+				  return;
+			}
 			if (exif_data_load_data_entry (data, entry, d, ds,
 						   offset + 12 * i))
 				exif_content_add_entry (data->ifd[ifd], entry);
@@ -840,7 +859,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig,
 	}
 	if (!memcmp (d, ExifHeader, 6)) {
 		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-			  "Found EXIF header.");
+			  "Found EXIF header at start.");
 	} else {
 		while (ds >= 3) {
 			while (ds && (d[0] == 0xff)) {
@@ -855,8 +874,16 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig,
 				continue;
 			}
 
-			/* JPEG_MARKER_APP0 */
-			if (ds >= 3 && d[0] == JPEG_MARKER_APP0) {
+			/* JPEG_MARKER_APP1 */
+			if (ds && d[0] == JPEG_MARKER_APP1)
+				break;
+
+			/* Skip irrelevant APP markers. The branch for APP1 must come before this,
+			   otherwise this code block will cause APP1 to be skipped. This code path
+			   is only relevant for files that are nonconformant to the EXIF
+			   specification. For conformant files, the APP1 code path above will be
+			   taken. */
+			if (ds >= 3 && d[0] >= 0xe0 && d[0] <= 0xef) {  /* JPEG_MARKER_APPn */
 				d++;
 				ds--;
 				l = (d[0] << 8) | d[1];
@@ -867,10 +894,6 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig,
 				continue;
 			}
 
-			/* JPEG_MARKER_APP1 */
-			if (ds && d[0] == JPEG_MARKER_APP1)
-				break;
-
 			/* Unknown marker or data. Give up. */
 			exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA,
 				  "ExifData", _("EXIF marker not found."));
@@ -938,7 +961,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig,
 	exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", 
 		  "IFD 0 at %i.", (int) offset);
 
-	/* Sanity check the offset, being careful about overflow */
+	/* ds is restricted to 16 bit above, so offset is restricted too, and offset+8 should not overflow. */
 	if (offset > ds || offset + 6 + 2 > ds)
 		return;
 
@@ -947,6 +970,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig,
 
 	/* IFD 1 offset */
 	n = exif_get_short (d + 6 + offset, data->priv->order);
+	/* offset < 2<<16, n is 16 bit at most, so this op will not overflow */
 	if (offset + 6 + 2 + 12 * n + 4 > ds)
 		return;
 
@@ -955,8 +979,8 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig,
 		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
 			  "IFD 1 at %i.", (int) offset);
 
-		/* Sanity check. */
-		if (offset > ds || offset + 6 > ds) {
+		/* Sanity check. ds is ensured to be above 6 above, offset is 16bit */
+		if (offset > ds - 6) {
 			exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA,
 				  "ExifData", "Bogus offset of IFD1.");
 		} else {
@@ -1110,7 +1134,7 @@ exif_data_dump (ExifData *data)
 	}
 
 	if (data->data) {
-		printf ("%i byte(s) thumbnail data available.", data->size);
+		printf ("%i byte(s) thumbnail data available: ", data->size);
 		if (data->size >= 4) {
 			printf ("0x%02x 0x%02x ... 0x%02x 0x%02x\n",
 				data->data[0], data->data[1],
diff --git a/libexif/exif-data.h b/libexif/exif-data.h
index eeee782..7d87d1d 100644
--- a/libexif/exif-data.h
+++ b/libexif/exif-data.h
@@ -185,14 +185,16 @@ typedef enum {
 /*! Return a short textual description of the given #ExifDataOption.
  *
  * \param[in] o option
- * \return localized textual description of the option
+ * \return localized textual description of the option,
+ *   or NULL if unknown
  */
 const char *exif_data_option_get_name        (ExifDataOption o);
 
 /*! Return a verbose textual description of the given #ExifDataOption.
  *
  * \param[in] o option
- * \return verbose localized textual description of the option
+ * \return verbose localized textual description of the option,
+ *   or NULL if unknown
  */
 const char *exif_data_option_get_description (ExifDataOption o);
 
diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index 54a90a2..5de215f 100644
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -166,6 +166,13 @@ exif_entry_free (ExifEntry *e)
 	}
 }
 
+static void
+clear_entry (ExifEntry *e)
+{
+	e->components = 0;
+	e->size = 0;
+}
+
 /*! Get a value and convert it to an ExifShort.
  * \bug Not all types are converted that could be converted and no indication
  *      is made when that occurs
@@ -367,8 +374,7 @@ exif_entry_fix (ExifEntry *e)
 		if (e->size < 8) {
 			e->data = exif_entry_realloc (e, e->data, 8 + e->size);
 			if (!e->data) {
-				e->size = 0;
-				e->components = 0;
+				clear_entry(e);
 				return;
 			}
 
@@ -410,8 +416,7 @@ exif_entry_fix (ExifEntry *e)
 		    memcmp (e->data, "\0\0\0\0\0\0\0\0", 8)) {
 			e->data = exif_entry_realloc (e, e->data, 8 + e->size);
 			if (!e->data) {
-				e->size = 0;
-				e->components = 0;
+				clear_entry(e);
 				break;
 			}
 
@@ -438,7 +443,7 @@ exif_entry_fix (ExifEntry *e)
  * \pre The ExifEntry is already a member of an ExifData.
  * \param[in] e EXIF entry
  * \param[out] val buffer in which to store value
- * \param[in] maxlen one less than the length of the buffer val
+ * \param[in] maxlen the length of the buffer val
  */
 static void
 exif_entry_format_value(ExifEntry *e, char *val, size_t maxlen)
@@ -456,7 +461,6 @@ exif_entry_format_value(ExifEntry *e, char *val, size_t maxlen)
 
 	if (!e->size || !maxlen)
 		return;
-	++maxlen; /* include the terminating NUL */
 	switch (e->format) {
 	case EXIF_FORMAT_UNDEFINED:
 		snprintf (val, maxlen, _("%i bytes undefined data"), e->size);
@@ -566,7 +570,7 @@ exif_entry_format_value(ExifEntry *e, char *val, size_t maxlen)
 			v_srat = exif_get_srational (
 				e->data + 8 * i, o);
 			if (v_srat.denominator) {
-				int decimals = (int)(log10(fabs(v_srat.denominator))-0.08+1.0);
+				int decimals = (int)(log10(abs(v_srat.denominator))-0.08+1.0);
 				snprintf (val+len, maxlen-len, "%2.*f",
 					  decimals,
 					  (double) v_srat.numerator /
@@ -593,15 +597,15 @@ exif_entry_dump (ExifEntry *e, unsigned int indent)
 {
 	char buf[1024];
 	char value[1024];
-	unsigned int i;
-
-	for (i = 0; i < 2 * indent; i++)
-		buf[i] = ' ';
-	buf[i] = '\0';
+	unsigned int l;
 
 	if (!e)
 		return;
 
+	l = MIN(sizeof(buf)-1, 2*indent);
+	memset(buf, ' ', l);
+	buf[l] = '\0';
+
 	printf ("%sTag: 0x%x ('%s')\n", buf, e->tag,
 		exif_tag_get_name_in_ifd (e->tag, exif_entry_get_ifd(e)));
 	printf ("%s  Format: %i ('%s')\n", buf, e->format,
@@ -853,22 +857,15 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		{""    , 0,  0}
 	};
 
-	/* FIXME: This belongs to somewhere else. */
-	/* libexif should use the default system locale.
-	 * If an application specifically requires UTF-8, then we
-	 * must give the application a way to tell libexif that.
-	 * 
-	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
-	if (!e || !e->parent || !e->parent->parent || !maxlen)
+	if (!e || !e->parent || !e->parent->parent || !maxlen || !val)
 		return val;
 
 	/* make sure the returned string is zero terminated */
+	/* FIXME: this is inefficient in the case of long buffers and should
+	 * instead be taken care of on each write instead. */
 	memset (val, 0, maxlen);
-	maxlen--;
-	memset (b, 0, sizeof (b));
 
 	/* We need the byte order */
 	o = exif_data_get_byte_order (e->parent->parent);
@@ -904,11 +901,11 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		 * NULL terminated.
 		 */
 		if ((e->size >= 8) && !memcmp (e->data, "ASCII\0\0\0", 8)) {
-			strncpy (val, (char *) e->data + 8, MIN (e->size - 8, maxlen));
+			strncpy (val, (char *) e->data + 8, MIN (e->size - 8, maxlen-1));
 			break;
 		}
 		if ((e->size >= 8) && !memcmp (e->data, "UNICODE\0", 8)) {
-			strncpy (val, _("Unsupported UNICODE string"), maxlen);
+			strncpy (val, _("Unsupported UNICODE string"), maxlen-1);
 		/* FIXME: use iconv to convert into the locale encoding.
 		 * EXIF 2.2 implies (but does not say) that this encoding is
 		 * UCS-2.
@@ -916,7 +913,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 			break;
 		}
 		if ((e->size >= 8) && !memcmp (e->data, "JIS\0\0\0\0\0", 8)) {
-			strncpy (val, _("Unsupported JIS string"), maxlen);
+			strncpy (val, _("Unsupported JIS string"), maxlen-1);
 		/* FIXME: use iconv to convert into the locale encoding */
 			break;
 		}
@@ -930,11 +927,12 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		 * If we reach this point, the tag does not
  		 * comply with the standard but seems to contain data.
 		 * Print as much as possible.
+		 * Note: make sure we do not overwrite the final \0 at maxlen-1
 		 */
 		exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
 			_("Tag UserComment contains data but is "
 			  "against specification."));
- 		for (j = 0; (i < e->size) && (j < maxlen); i++, j++) {
+ 		for (j = 0; (i < e->size) && (j < maxlen-1); i++, j++) {
 			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
 				_("Byte at position %i: 0x%02x"), i, e->data[i]);
  			val[j] = isprint (e->data[i]) ? e->data[i] : '.';
@@ -944,7 +942,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 	case EXIF_TAG_EXIF_VERSION:
 		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		CC (e, 4, val, maxlen);
-		strncpy (val, _("Unknown Exif Version"), maxlen);
+		strncpy (val, _("Unknown Exif Version"), maxlen-1);
 		for (i = 0; *versions[i].label; i++) {
 			if (!memcmp (e->data, versions[i].label, 4)) {
     				snprintf (val, maxlen,
@@ -959,11 +957,11 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		CC (e, 4, val, maxlen);
 		if (!memcmp (e->data, "0100", 4))
-			strncpy (val, _("FlashPix Version 1.0"), maxlen);
+			strncpy (val, _("FlashPix Version 1.0"), maxlen-1);
 		else if (!memcmp (e->data, "0101", 4))
-			strncpy (val, _("FlashPix Version 1.01"), maxlen);
+			strncpy (val, _("FlashPix Version 1.01"), maxlen-1);
 		else
-			strncpy (val, _("Unknown FlashPix Version"), maxlen);
+			strncpy (val, _("Unknown FlashPix Version"), maxlen-1);
 		break;
 	case EXIF_TAG_COPYRIGHT:
 		CF (e, EXIF_FORMAT_ASCII, val, maxlen);
@@ -974,30 +972,30 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		 * Remember that a corrupted tag might not be NUL-terminated
 		 */
 		if (e->size && e->data && match_repeated_char(e->data, ' ', e->size))
-			strncpy (val, (char *) e->data, MIN (maxlen, e->size));
+			strncpy (val, (char *) e->data, MIN (maxlen-1, e->size));
 		else
-			strncpy (val, _("[None]"), maxlen);
-		strncat (val, " ", maxlen - strlen (val));
-		strncat (val, _("(Photographer)"), maxlen - strlen (val));
+			strncpy (val, _("[None]"), maxlen-1);
+		strncat (val, " ", maxlen-1 - strlen (val));
+		strncat (val, _("(Photographer)"), maxlen-1 - strlen (val));
 
 		/* Second part: Editor. */
-		strncat (val, " - ", maxlen - strlen (val));
+		strncat (val, " - ", maxlen-1 - strlen (val));
 		k = 0;
 		if (e->size && e->data) {
 			const unsigned char *tagdata = memchr(e->data, 0, e->size);
 			if (tagdata++) {
-				int editor_ofs = tagdata - e->data;
-				int remaining = e->size - editor_ofs;
+				unsigned int editor_ofs = tagdata - e->data;
+				unsigned int remaining = e->size - editor_ofs;
 				if (match_repeated_char(tagdata, ' ', remaining)) {
-					strncat (val, (const char*)tagdata, MIN (maxlen - strlen (val), remaining));
+					strncat (val, (const char*)tagdata, MIN (maxlen-1 - strlen (val), remaining));
 					++k;
 				}
 			}
 		}
 		if (!k)
-			strncat (val, _("[None]"), maxlen - strlen (val));
-		strncat (val, " ", maxlen - strlen (val));
-		strncat (val, _("(Editor)"), maxlen - strlen (val));
+			strncat (val, _("[None]"), maxlen-1 - strlen (val));
+		strncat (val, " ", maxlen-1 - strlen (val));
+		strncat (val, _("(Editor)"), maxlen-1 - strlen (val));
 
 		break;
 	case EXIF_TAG_FNUMBER:
@@ -1023,8 +1021,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		d = (double) v_rat.numerator / (double) v_rat.denominator;
 		snprintf (val, maxlen, _("%.02f EV"), d);
 		snprintf (b, sizeof (b), _(" (f/%.01f)"), pow (2, d / 2.));
-		if (maxlen > strlen (val) + strlen (b))
-			strncat (val, b, maxlen - strlen (val));
+		strncat (val, b, maxlen-1 - strlen (val));
 		break;
 	case EXIF_TAG_FOCAL_LENGTH:
 		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
@@ -1043,12 +1040,12 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		d = 0.;
 		entry = exif_content_get_entry (
 			e->parent->parent->ifd[EXIF_IFD_0], EXIF_TAG_MAKE);
-		if (entry && entry->data &&
+		if (entry && entry->data && entry->size >= 7 &&
 		    !strncmp ((char *)entry->data, "Minolta", 7)) {
 			entry = exif_content_get_entry (
 					e->parent->parent->ifd[EXIF_IFD_0],
 					EXIF_TAG_MODEL);
-			if (entry && entry->data) {
+			if (entry && entry->data && entry->size >= 8) {
 				if (!strncmp ((char *)entry->data, "DiMAGE 7", 8))
 					d = 3.9;
 				else if (!strncmp ((char *)entry->data, "DiMAGE 5", 8))
@@ -1056,14 +1053,15 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 			}
 		}
 		if (d)
-			snprintf (b, sizeof (b), _(" (35 equivalent: %d mm)"),
-				  (int) (d * (double) v_rat.numerator /
-				  	     (double) v_rat.denominator));
+			snprintf (b, sizeof (b), _(" (35 equivalent: %.0f mm)"),
+				  (d * (double) v_rat.numerator /
+				       (double) v_rat.denominator));
+		else
+			b[0] = 0;
 
 		d = (double) v_rat.numerator / (double) v_rat.denominator;
 		snprintf (val, maxlen, "%.1f mm", d);
-		if (maxlen > strlen (val) + strlen (b))
-			strncat (val, b, maxlen - strlen (val));
+		strncat (val, b, maxlen-1 - strlen (val));
 		break;
 	case EXIF_TAG_SUBJECT_DISTANCE:
 		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
@@ -1085,12 +1083,11 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 			break;
 		}
 		d = (double) v_rat.numerator / (double) v_rat.denominator;
-		if (d < 1)
-			snprintf (val, maxlen, _("1/%i"), (int) (0.5 + 1. / d));
+		if (d < 1 && d)
+			snprintf (val, maxlen, _("1/%.0f"), 1. / d);
 		else
-			snprintf (val, maxlen, "%i", (int) d);
-		if (maxlen > strlen (val) + strlen (_(" sec.")))
-			strncat (val, _(" sec."), maxlen - strlen (val));
+			snprintf (val, maxlen, "%.0f", d);
+		strncat (val, _(" sec."), maxlen-1 - strlen (val));
 		break;
 	case EXIF_TAG_SHUTTER_SPEED_VALUE:
 		CF (e, EXIF_FORMAT_SRATIONAL, val, maxlen);
@@ -1102,12 +1099,13 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		}
 		d = (double) v_srat.numerator / (double) v_srat.denominator;
 		snprintf (val, maxlen, _("%.02f EV"), d);
-		d = 1. / pow (2, d);
-		if (d < 1)
-		  snprintf (b, sizeof (b), _(" (1/%d sec.)"), (int) (1. / d));
+		if (pow (2, d))
+			d = 1. / pow (2, d);
+		if (d < 1 && d)
+		  snprintf (b, sizeof (b), _(" (1/%.0f sec.)"), 1. / d);
 		else
-		  snprintf (b, sizeof (b), _(" (%d sec.)"), (int) d);
-		strncat (val, b, maxlen - strlen (val));
+		  snprintf (b, sizeof (b), _(" (%.0f sec.)"), d);
+		strncat (val, b, maxlen-1 - strlen (val));
 		break;
 	case EXIF_TAG_BRIGHTNESS_VALUE:
 		CF (e, EXIF_FORMAT_SRATIONAL, val, maxlen);
@@ -1121,15 +1119,14 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		snprintf (val, maxlen, _("%.02f EV"), d);
 		snprintf (b, sizeof (b), _(" (%.02f cd/m^2)"),
 			1. / (M_PI * 0.3048 * 0.3048) * pow (2, d));
-		if (maxlen > strlen (val) + strlen (b))
-			strncat (val, b, maxlen - strlen (val));
+		strncat (val, b, maxlen-1 - strlen (val));
 		break;
 	case EXIF_TAG_FILE_SOURCE:
 		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		CC (e, 1, val, maxlen);
 		v_byte = e->data[0];
 		if (v_byte == 3)
-			strncpy (val, _("DSC"), maxlen);
+			strncpy (val, _("DSC"), maxlen-1);
 		else
 			snprintf (val, maxlen, _("Internal error (unknown "
 				  "value %i)"), v_byte);
@@ -1148,9 +1145,9 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 			case 6: c = _("B"); break;
 			default: c = _("Reserved"); break;
 			}
-			strncat (val, c, maxlen - strlen (val));
+			strncat (val, c, maxlen-1 - strlen (val));
 			if (i < 3)
-				strncat (val, " ", maxlen - strlen (val));
+				strncat (val, " ", maxlen-1 - strlen (val));
 		}
 		break;
 	case EXIF_TAG_EXPOSURE_BIAS_VALUE:
@@ -1169,7 +1166,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		CC (e, 1, val, maxlen);
 		v_byte = e->data[0];
 		if (v_byte == 1)
-			strncpy (val, _("Directly photographed"), maxlen);
+			strncpy (val, _("Directly photographed"), maxlen-1);
 		else
 			snprintf (val, maxlen, _("Internal error (unknown "
 				  "value %i)"), v_byte);
@@ -1182,9 +1179,9 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 			e->data + exif_format_get_size (e->format),
 			o);
 		if ((v_short == 2) && (v_short2 == 1))
-			strncpy (val, _("YCbCr4:2:2"), maxlen);
+			strncpy (val, _("YCbCr4:2:2"), maxlen-1);
 		else if ((v_short == 2) && (v_short2 == 2))
-			strncpy (val, _("YCbCr4:2:0"), maxlen);
+			strncpy (val, _("YCbCr4:2:0"), maxlen-1);
 		else
 			snprintf (val, maxlen, "%u, %u", v_short, v_short2);
 		break;
@@ -1227,20 +1224,17 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		CC (e, 4, val, maxlen);
 		v_byte = e->data[0];
 		snprintf (val, maxlen, "%u", v_byte);
-		maxlen -= strlen (val);
 		for (i = 1; i < e->components; i++) {
 			v_byte = e->data[i];
 			snprintf (b, sizeof (b), ".%u", v_byte);
-			strncat (val, b, maxlen);
-			maxlen -= strlen (b);
-			if ((signed)maxlen <= 0) break;
+			strncat (val, b, maxlen-1 - strlen (val));
 		}
 		break;
 	case EXIF_TAG_INTEROPERABILITY_VERSION:
 	/* a.k.a. case EXIF_TAG_GPS_LATITUDE: */
 		/* This tag occurs in EXIF_IFD_INTEROPERABILITY */
 		if (e->format == EXIF_FORMAT_UNDEFINED) {
-			strncpy (val, (char *) e->data, MIN (maxlen, e->size));
+			strncpy (val, (char *) e->data, MIN (maxlen-1, e->size));
 			break;
 		}
 		/* EXIF_TAG_GPS_LATITUDE is the same numerically as
@@ -1254,9 +1248,9 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		CC (e, 1, val, maxlen);
 		v_byte = e->data[0];
 		if (v_byte == 0)
-			strncpy (val, _("Sea level"), maxlen);
+			strncpy (val, _("Sea level"), maxlen-1);
 		else if (v_byte == 1)
-			strncpy (val, _("Sea level reference"), maxlen);
+			strncpy (val, _("Sea level reference"), maxlen-1);
 		else
 			snprintf (val, maxlen, _("Internal error (unknown "
 				  "value %i)"), v_byte);
@@ -1328,7 +1322,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		for (k = 0; list2[i].elem[j].values[k]; k++) {
 			size_t l = strlen (_(list2[i].elem[j].values[k]));
 			if ((maxlen > l) && (strlen (val) < l))
-				strncpy (val, _(list2[i].elem[j].values[k]), maxlen);
+				strncpy (val, _(list2[i].elem[j].values[k]), maxlen-1);
 		}
 		if (!val[0]) snprintf (val, maxlen, "%i", v_short);
 
@@ -1366,7 +1360,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 		else if (!*list[i].strings[j])
 			snprintf (val, maxlen, _("Unknown value %i"), v_short);
 		else
-			strncpy (val, _(list[i].strings[j]), maxlen);
+			strncpy (val, _(list[i].strings[j]), maxlen-1);
 		break;
 
 	case EXIF_TAG_XP_TITLE:
@@ -1375,15 +1369,24 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 	case EXIF_TAG_XP_KEYWORDS:
 	case EXIF_TAG_XP_SUBJECT:
 	{
+		unsigned char *utf16;
+
 		/* Sanity check the size to prevent overflow */
-		if (e->size+sizeof(unsigned short) < e->size) break;
+		if (e->size+sizeof(uint16_t)+1 < e->size) break;
 
 		/* The tag may not be U+0000-terminated , so make a local
 		   U+0000-terminated copy before converting it */
-		unsigned short *utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
+		utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(uint16_t)+1);
 		if (!utf16) break;
 		memcpy(utf16, e->data, e->size);
-		utf16[e->size/sizeof(unsigned short)] = 0;
+
+		/* NUL terminate the string. If the size is odd (which isn't possible
+		 * for a valid UTF16 string), then this will overwrite the high byte of
+		 * the final half word, plus add a full zero NUL word at the end.
+		 */
+		utf16[e->size] = 0;
+		utf16[e->size+1] = 0;
+		utf16[e->size+2] = 0;
 
 		/* Warning! The texts are converted from UTF16 to UTF8 */
 		/* FIXME: use iconv to convert into the locale encoding */
@@ -1430,7 +1433,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_LONG;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		break;
 
 	/* SHORT, 1 component, no default */
@@ -1461,7 +1464,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		exif_set_short (e->data, o, 0);
 		break;
 
@@ -1473,7 +1476,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		exif_set_short (e->data, o, 1);
 		break;
 
@@ -1484,7 +1487,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		exif_set_short (e->data, o, 2);
 		break;
 
@@ -1494,7 +1497,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		exif_set_short (e->data, o, 3);
 		break;
 
@@ -1504,7 +1507,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		exif_set_short (e->data, o, 0xffff);
 		break;
 
@@ -1514,7 +1517,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		exif_set_short (e->data, o, 8);
 		exif_set_short (
 			e->data + exif_format_get_size (e->format),
@@ -1530,7 +1533,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		exif_set_short (e->data, o, 2);
 		exif_set_short (
 			e->data + exif_format_get_size (e->format),
@@ -1545,7 +1548,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_SRATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		break;
 
 	/* RATIONAL, 1 component, no default */
@@ -1566,7 +1569,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		break;
 
 	/* RATIONAL, 1 component, default 72/1 */
@@ -1576,7 +1579,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		r.numerator = 72;
 		r.denominator = 1;
 		exif_set_rational (e->data, o, r);
@@ -1588,7 +1591,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		break;
 
 	/* RATIONAL, 6 components */
@@ -1597,7 +1600,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		r.denominator = 1;
 		r.numerator = 0;
 		exif_set_rational (e->data, o, r);
@@ -1639,7 +1642,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		snprintf ((char *) e->data, e->size,
 			  "%04i:%02i:%02i %02i:%02i:%02i",
 			  tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
@@ -1667,7 +1670,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		strncpy ((char *)e->data, _("[None]"), e->size);
 		break;
 	/* ASCII, default "[None]\0[None]\0" */
@@ -1676,7 +1679,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		strcpy (((char *)e->data) + 0, _("[None]"));
 		strcpy (((char *)e->data) + strlen (_("[None]")) + 1, _("[None]"));
 		break;
@@ -1687,7 +1690,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_UNDEFINED;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		e->data[0] = 0x01;
 		break;
 
@@ -1697,7 +1700,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
 		e->format = EXIF_FORMAT_UNDEFINED;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+		if (!e->data) { clear_entry(e); break; }
 		e->data[0] = 0x03;
 		break;
 
@@ -1707,7 +1710,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
                 e->format = EXIF_FORMAT_UNDEFINED;
                 e->size = exif_format_get_size (e->format) * e->components;
                 e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+                if (!e->data) { clear_entry(e); break; }
                 memcpy (e->data, "0100", 4);
                 break;
 
@@ -1717,7 +1720,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
                 e->format = EXIF_FORMAT_UNDEFINED;
                 e->size = exif_format_get_size (e->format) * e->components;
                 e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+                if (!e->data) { clear_entry(e); break; }
                 memcpy (e->data, "0210", 4);
                 break;
 
@@ -1727,7 +1730,7 @@ exif_entry_initialize (ExifEntry *e, ExifTag tag)
                 e->format = EXIF_FORMAT_UNDEFINED;
                 e->size = exif_format_get_size (e->format) * e->components;
                 e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
+                if (!e->data) { clear_entry(e); break; }
 		e->data[0] = 1;
 		e->data[1] = 2;
 		e->data[2] = 3;
diff --git a/libexif/exif-entry.h b/libexif/exif-entry.h
index 1dcdc73..def5347 100644
--- a/libexif/exif-entry.h
+++ b/libexif/exif-entry.h
@@ -156,7 +156,8 @@ void        exif_entry_fix        (ExifEntry *entry);
  *          supported.
  *
  * \param[in] entry EXIF entry
- * \param[out] val buffer in which to store value
+ * \param[out] val buffer in which to store value; if entry is valid and
+ *   maxlen > 0 then this string will be NUL-terminated
  * \param[in] maxlen length of the buffer val
  * \return val pointer
  */
diff --git a/libexif/exif-format.c b/libexif/exif-format.c
index 2c63c33..6e2ddc5 100644
--- a/libexif/exif-format.c
+++ b/libexif/exif-format.c
@@ -54,14 +54,7 @@ exif_format_get_name (ExifFormat format)
 {
 	unsigned int i;
 
-	/* FIXME: This belongs to somewhere else. */
-	/* libexif should use the default system locale.
-	 * If an application specifically requires UTF-8, then we
-	 * must give the application a way to tell libexif that.
-	 * 
-	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
 	for (i = 0; ExifFormatTable[i].name; i++)
 		if (ExifFormatTable[i].format == format)
diff --git a/libexif/exif-format.h b/libexif/exif-format.h
index b7a79a4..9bbc320 100644
--- a/libexif/exif-format.h
+++ b/libexif/exif-format.h
@@ -47,7 +47,7 @@ typedef enum {
 /*! Return a textual representation of the given EXIF data type.
  *
  * \param[in] format EXIF data format
- * \return localized textual name
+ * \return localized textual name, or NULL if unknown
  */
 const char   *exif_format_get_name (ExifFormat format);
 
diff --git a/libexif/exif-ifd.h b/libexif/exif-ifd.h
index 26c4053..5dea040 100644
--- a/libexif/exif-ifd.h
+++ b/libexif/exif-ifd.h
@@ -21,6 +21,10 @@
 #ifndef __EXIF_IFD_H__
 #define __EXIF_IFD_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /*! Possible EXIF Image File Directories */
 typedef enum {
 	EXIF_IFD_0 = 0,                /*!< */
@@ -36,8 +40,12 @@ typedef enum {
  * characters.
  *
  * \param[in] ifd IFD
- * \return textual name of the IFD
+ * \return textual name of the IFD, or NULL if unknown
  */
 const char *exif_ifd_get_name (ExifIfd ifd);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __EXIF_IFD_H__ */
diff --git a/libexif/exif-loader.c b/libexif/exif-loader.c
index 317b86b..f0f0463 100644
--- a/libexif/exif-loader.c
+++ b/libexif/exif-loader.c
@@ -110,7 +110,7 @@ exif_loader_write_file (ExifLoader *l, const char *path)
 	int size;
 	unsigned char data[1024];
 
-	if (!l) 
+	if (!l || !path)
 		return;
 
 	f = fopen (path, "rb");
@@ -239,7 +239,7 @@ exif_loader_write (ExifLoader *eld, unsigned char *buf, unsigned int len)
 			break;
 
 		case EL_READ_SIZE_BYTE_24:
-			eld->size |= eld->b[i] << 24;
+			eld->size |= (unsigned int)eld->b[i] << 24;
 			eld->state = EL_READ_SIZE_BYTE_16;
 			break;
 		case EL_READ_SIZE_BYTE_16:
@@ -410,13 +410,16 @@ exif_loader_get_buf (ExifLoader *loader, const unsigned char **buf,
 	const unsigned char* b = NULL;
 	unsigned int s = 0;
 
-	if (!loader || (loader->data_format == EL_DATA_FORMAT_UNKNOWN)) {
-		exif_log (loader->log, EXIF_LOG_CODE_DEBUG, "ExifLoader",
-			  "Loader format unknown");
-	} else {
-		b = loader->buf;
-		s = loader->bytes_read;
+	if (loader) {
+		if (loader->data_format == EL_DATA_FORMAT_UNKNOWN) {
+			exif_log (loader->log, EXIF_LOG_CODE_DEBUG, "ExifLoader",
+					  "Loader format unknown");
+		} else {
+			b = loader->buf;
+			s = loader->bytes_read;
+		}
 	}
+
 	if (buf)
 		*buf = b;
 	if (buf_size)
diff --git a/libexif/exif-log.h b/libexif/exif-log.h
index 9e71ad6..1b3bf4b 100644
--- a/libexif/exif-log.h
+++ b/libexif/exif-log.h
@@ -61,14 +61,14 @@ typedef enum {
 /*! Return a textual description of the given class of error log.
  *
  * \param[in] code logging message class
- * \return textual description of the log class
+ * \return textual description of the log class, or NULL if unknown
  */
 const char *exif_log_code_get_title   (ExifLogCode code);
 
 /*! Return a verbose description of the given class of error log.
  *
  * \param[in] code logging message class
- * \return verbose description of the log class
+ * \return verbose description of the log class, or NULL if unknown
  */
 const char *exif_log_code_get_message (ExifLogCode code);
 
diff --git a/libexif/exif-mem.h b/libexif/exif-mem.h
index fd8f2fa..93bf705 100644
--- a/libexif/exif-mem.h
+++ b/libexif/exif-mem.h
@@ -61,6 +61,7 @@ typedef struct _ExifMem ExifMem;
  * \param[in] a the allocator function
  * \param[in] r the reallocator function
  * \param[in] f the free function
+ * \return allocated #ExifMem, or NULL on error
  */
 ExifMem *exif_mem_new   (ExifMemAllocFunc a, ExifMemReallocFunc r,
 			 ExifMemFreeFunc f);
diff --git a/libexif/exif-mnote-data.h b/libexif/exif-mnote-data.h
index 19e1de5..048ddf2 100644
--- a/libexif/exif-mnote-data.h
+++ b/libexif/exif-mnote-data.h
@@ -39,10 +39,10 @@ void exif_mnote_data_unref (ExifMnoteData *);
  *
  * \param[in] d MakerNote data
  * \param[in] buf pointer to raw MakerNote tag data
- * \param[in] buf_siz number of bytes of data at buf
+ * \param[in] buf_size number of bytes of data at buf
  */
 void exif_mnote_data_load (ExifMnoteData *d, const unsigned char *buf,
-			   unsigned int buf_siz);
+			   unsigned int buf_size);
 
 /*!
  * Save the raw MakerNote data into a memory buffer.  The buffer is
@@ -51,10 +51,10 @@ void exif_mnote_data_load (ExifMnoteData *d, const unsigned char *buf,
  *
  * \param[in,out] d extract the data from this structure 
  * \param[out] buf pointer to buffer pointer containing MakerNote data on return
- * \param[out] buf_siz pointer to the size of the buffer
+ * \param[out] buf_size pointer to the size of the buffer
  */
 void exif_mnote_data_save (ExifMnoteData *d, unsigned char **buf,
-			   unsigned int *buf_siz);
+			   unsigned int *buf_size);
 
 /*! Return the number of tags in the MakerNote.
  *
@@ -78,7 +78,7 @@ unsigned int exif_mnote_data_get_id          (ExifMnoteData *d, unsigned int n);
  *
  * \param[in] d MakerNote data
  * \param[in] n index of the entry within the MakerNote data
- * \return textual name of the tag
+ * \return textual name of the tag or NULL on error
  */
 const char  *exif_mnote_data_get_name        (ExifMnoteData *d, unsigned int n);
 
@@ -87,7 +87,7 @@ const char  *exif_mnote_data_get_name        (ExifMnoteData *d, unsigned int n);
  *
  * \param[in] d MakerNote data
  * \param[in] n index of the entry within the MakerNote data
- * \return textual name of the tag
+ * \return textual name of the tag or NULL on error
  */
 const char  *exif_mnote_data_get_title       (ExifMnoteData *d, unsigned int n);
 
@@ -95,7 +95,7 @@ const char  *exif_mnote_data_get_title       (ExifMnoteData *d, unsigned int n);
  *
  * \param[in] d MakerNote data
  * \param[in] n index of the entry within the MakerNote data
- * \return textual description of the tag
+ * \return textual description of the tag or NULL on error
  */
 const char  *exif_mnote_data_get_description (ExifMnoteData *d, unsigned int n);
 
diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c
index 60f8331..30e0917 100644
--- a/libexif/exif-tag.c
+++ b/libexif/exif-tag.c
@@ -36,7 +36,9 @@
 #define ESL_NNMM { EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_MANDATORY, EXIF_SUPPORT_LEVEL_MANDATORY }
 #define ESL_NNNM { EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_MANDATORY }
 #define ESL_NNNO { EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_OPTIONAL }
+#define ESL_UUUU { EXIF_SUPPORT_LEVEL_UNKNOWN, EXIF_SUPPORT_LEVEL_UNKNOWN, EXIF_SUPPORT_LEVEL_UNKNOWN, EXIF_SUPPORT_LEVEL_UNKNOWN }
 #define ESL_GPS { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN }
+#define ESL_UNKNOWN { ESL_UUUU, ESL_UUUU, ESL_UUUU, ESL_UUUU, ESL_UUUU }
 
 /*!
  * Table giving information about each EXIF tag.
@@ -105,7 +107,7 @@ static const struct TagEntry {
 	    "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 "
+	    "GPSAltitude tag. The reference unit is meters. Note that this tag "
 	    "is BYTE type, unlike other reference tags."), ESL_GPS},
 	{EXIF_TAG_GPS_ALTITUDE, "GPSAltitude", N_("Altitude"),
 	 N_("Indicates the altitude based on the reference in GPSAltitudeRef. "
@@ -215,10 +217,14 @@ static const struct TagEntry {
 	{EXIF_TAG_GPS_DIFFERENTIAL, "GPSDifferential", N_("GPS Differential Correction"),
          N_("Indicates whether differential correction is applied to the "
             "GPS receiver."), ESL_GPS},
+	{EXIF_TAG_GPS_H_POSITIONING_ERROR, "GPSHPositioningError", N_("GPS Horizontal Positioning Error"),
+         N_("Indicates the horizontal positioning errors in meters. This is "
+            "expressed as one RATIONAL value."), ESL_GPS},
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
 	 N_("New Subfile Type"), N_("A general indication of the kind of data "
-	    "contained in this subfile.")},
+	    "contained in this subfile."),
+	 ESL_UNKNOWN},
 	{EXIF_TAG_IMAGE_WIDTH, "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 "
@@ -246,9 +252,10 @@ static const struct TagEntry {
 	    "marker is used instead of this tag."),
 	 { ESL_MMMN, ESL_MMMN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_FILL_ORDER, "FillOrder", N_("Fill Order"), ""},
+	{EXIF_TAG_FILL_ORDER, "FillOrder", N_("Fill Order"), "", ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_DOCUMENT_NAME, "DocumentName", N_("Document Name"), ""},
+	{EXIF_TAG_DOCUMENT_NAME, "DocumentName", N_("Document Name"), "",
+	 ESL_UNKNOWN},
 	{EXIF_TAG_IMAGE_DESCRIPTION, "ImageDescription",
 	 N_("Image Description"),
 	 N_("A character string giving the title of the image. It may be "
@@ -357,11 +364,12 @@ static const struct TagEntry {
 	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_SUB_IFDS, "SubIFDs", "SubIFD Offsets", N_("Defined by Adobe Corporation "
-	    "to enable TIFF Trees within a TIFF file.")},
+	    "to enable TIFF Trees within a TIFF file."), ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""},
+	{EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), "",
+	 ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_JPEG_PROC, "JPEGProc", "JPEGProc", ""},
+	{EXIF_TAG_JPEG_PROC, "JPEGProc", "JPEGProc", "", ESL_UNKNOWN},
 	{EXIF_TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat",
 	 N_("JPEG Interchange Format"),
 	 N_("The offset to the start byte (SOI) of JPEG compressed "
@@ -420,27 +428,29 @@ static const struct TagEntry {
 	    "Interoperability these conditions."),
 	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_XML_PACKET, "XMLPacket", N_("XML Packet"), N_("XMP Metadata")},
+	{EXIF_TAG_XML_PACKET, "XMLPacket", N_("XML Packet"), N_("XMP Metadata"),
+	 ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_RELATED_IMAGE_FILE_FORMAT, "RelatedImageFileFormat",
-	 "RelatedImageFileFormat", ""},
+	 "RelatedImageFileFormat", "", ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_RELATED_IMAGE_WIDTH, "RelatedImageWidth",
-	 "RelatedImageWidth", ""},
+	 "RelatedImageWidth", "", ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_RELATED_IMAGE_LENGTH, "RelatedImageLength",
-	 "RelatedImageLength", ""},
+	 "RelatedImageLength", "", ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_CFA_REPEAT_PATTERN_DIM, "CFARepeatPatternDim",
-	 "CFARepeatPatternDim", ""},
+	 "CFARepeatPatternDim", "", ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_CFA_PATTERN, "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.")},
+	    "It does not apply to all sensing methods."), ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_BATTERY_LEVEL, "BatteryLevel", N_("Battery Level"), ""},
+	{EXIF_TAG_BATTERY_LEVEL, "BatteryLevel", N_("Battery Level"), "",
+	 ESL_UNKNOWN},
 	{EXIF_TAG_COPYRIGHT, "Copyright", N_("Copyright"),
 	 N_("Copyright information. In this standard the tag is used to "
 	    "indicate both the photographer and editor copyrights. It is "
@@ -470,9 +480,10 @@ static const struct TagEntry {
 	 N_("The F number."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_IPTC_NAA, "IPTC/NAA", "IPTC/NAA", ""},
+	{EXIF_TAG_IPTC_NAA, "IPTC/NAA", "IPTC/NAA", "", ESL_UNKNOWN},
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_IMAGE_RESOURCES, "ImageResources", N_("Image Resources Block"), ""},
+	{EXIF_TAG_IMAGE_RESOURCES, "ImageResources", N_("Image Resources Block"), "",
+	 ESL_UNKNOWN},
 	{EXIF_TAG_EXIF_IFD_POINTER, "ExifIfdPointer", "ExifIFDPointer",
 	 N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the "
 	    "same structure as that of the IFD specified in TIFF. "
@@ -481,7 +492,7 @@ static const struct TagEntry {
 	 { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_INTER_COLOR_PROFILE, "InterColorProfile",
-	 "InterColorProfile", ""},
+	 "InterColorProfile", "", ESL_UNKNOWN},
 	{EXIF_TAG_EXPOSURE_PROGRAM, "ExposureProgram", N_("Exposure Program"),
 	 N_("The class of the program used by the camera to set exposure "
 	    "when the picture is taken."),
@@ -511,7 +522,8 @@ static const struct TagEntry {
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_TIME_ZONE_OFFSET, "TimeZoneOffset", N_("Time Zone Offset"),
-	 N_("Encodes time zone of camera clock relative to GMT.")},
+	 N_("Encodes time zone of camera clock relative to GMT."),
+	 ESL_UNKNOWN},
 	{EXIF_TAG_EXIF_VERSION, "ExifVersion", N_("Exif Version"),
 	 N_("The version of this standard supported. Nonexistence of this "
 	    "field is taken to mean nonconformance to the standard."),
@@ -587,7 +599,8 @@ static const struct TagEntry {
 	    "in the overall scene."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_TIFF_EP_STANDARD_ID, "TIFF/EPStandardID", N_("TIFF/EP Standard ID"), ""},
+	{EXIF_TAG_TIFF_EP_STANDARD_ID, "TIFF/EPStandardID", N_("TIFF/EP Standard ID"), "",
+	 ESL_UNKNOWN},
 	{EXIF_TAG_MAKER_NOTE, "MakerNote", N_("Maker Note"),
 	 N_("A tag for manufacturers of Exif writers to record any desired "
 	    "information. The contents are up to the manufacturer."),
@@ -655,7 +668,7 @@ static const struct TagEntry {
 	 N_("A character string giving the image subject, encoded in "
 	    "UTF-16LE."),
 	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
-	{EXIF_TAG_FLASH_PIX_VERSION, "FlashPixVersion", "FlashPixVersion",
+	{EXIF_TAG_FLASH_PIX_VERSION, "FlashpixVersion", "FlashPixVersion",
 	 N_("The FlashPix format version supported by a FPXR file."),
 	 { ESL_NNNN, ESL_NNNN, ESL_MMMM, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_COLOR_SPACE, "ColorSpace", N_("Color Space"),
@@ -853,12 +866,54 @@ static const struct TagEntry {
 	    "each image. It is recorded as an ASCII string equivalent "
 	    "to hexadecimal notation and 128-bit fixed length."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
-	/* Not in EXIF 2.2 */
+	/* EXIF 2.3 */
+	{EXIF_TAG_CAMERA_OWNER_NAME, "CameraOwnerName", N_("Camera Owner Name"),
+	 N_("This tag indicates the name of the camera owner, "
+            "photographer or image creator."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.3 */
+	{EXIF_TAG_BODY_SERIAL_NUMBER, "BodySerialNumber", N_("Body Serial Number"),
+	 N_("This tag indicates the serial number of the body of the camera"),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.3 */
+	{EXIF_TAG_LENS_SPECIFICATION, "LensSpecification", N_("Lens Specification"),
+	 N_("This tag indicates minimum focal length, "
+            "maximum focal length, minimum F number in the "
+            "minimum focal length, and minimum F number in "
+            "the maximum focal length."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.3 */
+	{EXIF_TAG_LENS_MAKE, "LensMake", N_("Lens Make"),
+	 N_("This tag indicates the lens manufacturer."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.3 */
+	{EXIF_TAG_LENS_MODEL, "LensModel", N_("Lens Model"),
+	 N_("This tag indicates the lens' model name and model number."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.3 */
+	{EXIF_TAG_LENS_SERIAL_NUMBER, "LensSerialNumber", N_("Lens Serial Number"),
+	 N_("This tag indicates the serial number of the interchangeable lens."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.32 */
+	{EXIF_TAG_COMPOSITE_IMAGE, "CompositeImage", N_("Composite Image"),
+	 N_("This tag indicates whether this image was composed from multiple images"),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.32 */
+	{EXIF_TAG_SOURCE_IMAGE_NUMBER_OF_COMPOSITE_IMAGE, "SourceImageNumberOfCompositeImage", N_("Source Image Number Of Composite Image"),
+	 N_("This tag indicates how many images are included and used in the composition of this image"),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.32 */
+	{EXIF_TAG_SOURCE_EXPOSURE_TIMES_OF_COMPOSITE_IMAGE, "SourceExposureTimesOfCompositeImage", N_("Source Exposure Times of Composite Image"),
+	 N_("This tag indicates the exposure times of the source images of this image"),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* EXIF 2.3 */
 	{EXIF_TAG_GAMMA, "Gamma", N_("Gamma"),
-	 N_("Indicates the value of coefficient gamma.")},
+	 N_("Indicates the value of coefficient gamma."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_PRINT_IMAGE_MATCHING, "PrintImageMatching", N_("PRINT Image Matching"),
-	 N_("Related to Epson's PRINT Image Matching technology")},
+	 N_("Related to Epson's PRINT Image Matching technology"),
+	 ESL_UNKNOWN},
 	/* Not in EXIF 2.2 (from the Microsoft HD Photo specification) */
 	{EXIF_TAG_PADDING, "Padding", N_("Padding"),
 	 N_("This tag reserves space that can be reclaimed later when "
@@ -868,7 +923,7 @@ static const struct TagEntry {
             "metadata tags."),
 	 { ESL_OOOO, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 #endif
-	{0, NULL, NULL, NULL}
+	{0, NULL, NULL, NULL, ESL_UNKNOWN}
 };
 
 /* For now, do not use these functions. */
@@ -877,7 +932,7 @@ static const struct TagEntry {
  * Return the number of entries in the EXIF tag table, including the
  * terminating NULL entry.
  */
-inline unsigned int
+unsigned int
 exif_tag_table_count (void)
 {
 	return sizeof (ExifTagTable) / sizeof (ExifTagTable[0]);
@@ -983,14 +1038,7 @@ exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd)
 		} else
 			return NULL; /* Recorded tag not found in the table */
 	}
-	/* FIXME: This belongs to somewhere else. */
-	/* libexif should use the default system locale.
-	 * If an application specifically requires UTF-8, then we
-	 * must give the application a way to tell libexif that.
-	 * 
-	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	return _(ExifTagTable[i].title);
 }
 
@@ -1024,7 +1072,7 @@ exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd)
 	 * 
 	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	return _(ExifTagTable[i].description);
 }
 
diff --git a/libexif/exif-tag.h b/libexif/exif-tag.h
index d8b8657..3103903 100644
--- a/libexif/exif-tag.h
+++ b/libexif/exif-tag.h
@@ -146,6 +146,15 @@ typedef enum {
 	EXIF_TAG_DEVICE_SETTING_DESCRIPTION	= 0xa40b,
 	EXIF_TAG_SUBJECT_DISTANCE_RANGE		= 0xa40c,
 	EXIF_TAG_IMAGE_UNIQUE_ID		= 0xa420,
+	EXIF_TAG_CAMERA_OWNER_NAME 		= 0xa430,
+	EXIF_TAG_BODY_SERIAL_NUMBER 		= 0xa431,
+	EXIF_TAG_LENS_SPECIFICATION 		= 0xa432,
+	EXIF_TAG_LENS_MAKE	 		= 0xa433,
+	EXIF_TAG_LENS_MODEL	 		= 0xa434,
+	EXIF_TAG_LENS_SERIAL_NUMBER 		= 0xa435,
+	EXIF_TAG_COMPOSITE_IMAGE 		= 0xa460,
+	EXIF_TAG_SOURCE_IMAGE_NUMBER_OF_COMPOSITE_IMAGE 		= 0xa461,
+	EXIF_TAG_SOURCE_EXPOSURE_TIMES_OF_COMPOSITE_IMAGE 		= 0xa462,
 	EXIF_TAG_GAMMA				= 0xa500,
 	EXIF_TAG_PRINT_IMAGE_MATCHING		= 0xc4a5,
 	EXIF_TAG_PADDING			= 0xea1c
@@ -183,6 +192,7 @@ typedef enum {
 #define EXIF_TAG_GPS_AREA_INFORMATION   0x001c
 #define EXIF_TAG_GPS_DATE_STAMP         0x001d
 #define EXIF_TAG_GPS_DIFFERENTIAL       0x001e
+#define EXIF_TAG_GPS_H_POSITIONING_ERROR 0x001f
 
 /*! What level of support a tag enjoys in the EXIF standard */
 typedef enum {
diff --git a/libexif/exif-utils.c b/libexif/exif-utils.c
index f375de1..8a92907 100644
--- a/libexif/exif-utils.c
+++ b/libexif/exif-utils.c
@@ -132,9 +132,9 @@ exif_get_slong (const unsigned char *b, ExifByteOrder order)
 	if (!b) return 0;
         switch (order) {
         case EXIF_BYTE_ORDER_MOTOROLA:
-                return ((b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]);
+                return (((uint32_t)b[0] << 24) | ((uint32_t)b[1] << 16) | ((uint32_t)b[2] << 8) | (uint32_t)b[3]);
         case EXIF_BYTE_ORDER_INTEL:
-                return ((b[3] << 24) | (b[2] << 16) | (b[1] << 8) | b[0]);
+                return (((uint32_t)b[3] << 24) | ((uint32_t)b[2] << 16) | ((uint32_t)b[1] << 8) | (uint32_t)b[0]);
         }
 
 	/* Won't be reached */
@@ -217,37 +217,41 @@ exif_set_srational (unsigned char *buf, ExifByteOrder order,
  * It should really be replaced by iconv().
  */
 void
-exif_convert_utf16_to_utf8 (char *out, const unsigned short *in, int maxlen)
+exif_convert_utf16_to_utf8 (char *out, const unsigned char *in, int maxlen)
 {
 	if (maxlen <= 0) {
 		return;
 	}
-	while (*in) {
-		if (*in < 0x80) {
+	for (;;) {
+		ExifShort v = exif_get_short(in, EXIF_BYTE_ORDER_INTEL);
+		if (!v)
+			break;
+		if (v < 0x80) {
 			if (maxlen > 1) {
-				*out++ = (char)*in++;
+				*out++ = (char)v;
 				maxlen--;
 			} else {
 				break;
 			}
-		} else if (*in < 0x800) {
+		} else if (v < 0x800) {
 			if (maxlen > 2) {
-				*out++ = ((*in >> 6) & 0x1F) | 0xC0;
-				*out++ = (*in++ & 0x3F) | 0x80;
+				*out++ = ((v >> 6) & 0x1F) | 0xC0;
+				*out++ = (v & 0x3F) | 0x80;
 				maxlen -= 2;
 			} else {
 				break;
 			}
 		} else {
 			if (maxlen > 3) {
-				*out++ = ((*in >> 12) & 0x0F) | 0xE0;
-				*out++ = ((*in >> 6) & 0x3F) | 0x80;
-				*out++ = (*in++ & 0x3F) | 0x80;
+				*out++ = ((v >> 12) & 0x0F) | 0xE0;
+				*out++ = ((v >> 6) & 0x3F) | 0x80;
+				*out++ = (v & 0x3F) | 0x80;
 				maxlen -= 3;
 			} else {
 				break;
 			}
 		}
+		in += 2;
 	}
 	*out = 0;
 }
diff --git a/libexif/exif-utils.h b/libexif/exif-utils.h
index 7861564..dac701a 100644
--- a/libexif/exif-utils.h
+++ b/libexif/exif-utils.h
@@ -168,7 +168,7 @@ void exif_set_srational (unsigned char *b, ExifByteOrder order,
 			 ExifSRational value);
 
 /*! \internal */
-void exif_convert_utf16_to_utf8 (char *out, const unsigned short *in, int maxlen);
+void exif_convert_utf16_to_utf8 (char *out, const unsigned char *in, int maxlen);
 
 /* Please do not use this function outside of the library. */
 
diff --git a/libexif/fuji/.gitignore b/libexif/fuji/.gitignore
new file mode 100644
index 0000000..8550dbf
--- /dev/null
+++ b/libexif/fuji/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.la
+*.lo
diff --git a/libexif/fuji/exif-mnote-data-fuji.c b/libexif/fuji/exif-mnote-data-fuji.c
index 2de0f67..c191490 100644
--- a/libexif/fuji/exif-mnote-data-fuji.c
+++ b/libexif/fuji/exif-mnote-data-fuji.c
@@ -238,7 +238,7 @@ exif_mnote_data_fuji_load (ExifMnoteData *en,
 			if (CHECKOVERFLOW(dataofs, buf_size, s)) {
 				exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
 						  "ExifMnoteDataFuji", "Tag data past end of "
-					  "buffer (%u >= %u)", dataofs + s, buf_size);
+					  "buffer (%u >= %u)", (unsigned)(dataofs + s), buf_size);
 				continue;
 			}
 
@@ -315,6 +315,8 @@ exif_mnote_data_fuji_set_byte_order (ExifMnoteData *d, ExifByteOrder o)
 	o_orig = n->order;
 	n->order = o;
 	for (i = 0; i < n->count; i++) {
+		if (n->entries[i].components && (n->entries[i].size/n->entries[i].components < exif_format_get_size (n->entries[i].format)))
+			continue;
 		n->entries[i].order = o;
 		exif_array_set_byte_order (n->entries[i].format, n->entries[i].data,
 				n->entries[i].components, o_orig, o);
@@ -330,6 +332,7 @@ exif_mnote_data_fuji_set_offset (ExifMnoteData *n, unsigned int o)
 int
 exif_mnote_data_fuji_identify (const ExifData *ed, const ExifEntry *e)
 {
+	(void) ed;  /* unused */
 	return ((e->size >= 12) && !memcmp (e->data, "FUJIFILM", 8));
 }
 
diff --git a/libexif/fuji/mnote-fuji-entry.c b/libexif/fuji/mnote-fuji-entry.c
index 0ca1634..add7086 100644
--- a/libexif/fuji/mnote-fuji-entry.c
+++ b/libexif/fuji/mnote-fuji-entry.c
@@ -51,7 +51,7 @@
 }
 
 static const struct {
-	ExifTag tag;
+	MnoteFujiTag tag;
 	struct {
 		int index;
 		const char *string;
@@ -193,6 +193,7 @@ mnote_fuji_entry_get_value (MnoteFujiEntry *entry,
 	ExifLong  vl;
 	ExifSLong vsl;
 	ExifShort vs, vs2;
+	ExifSShort vss;
 	ExifRational vr;
 	ExifSRational vsr;
 	int i, j;
@@ -271,7 +272,11 @@ mnote_fuji_entry_get_value (MnoteFujiEntry *entry,
 		  break;
 		case EXIF_FORMAT_SHORT:
 		  vs = exif_get_short (entry->data, entry->order);
-		  snprintf (val, maxlen, "%i", vs);
+		  snprintf (val, maxlen, "%hu", vs);
+		  break;
+		case EXIF_FORMAT_SSHORT:
+		  vss = exif_get_sshort (entry->data, entry->order);
+		  snprintf (val, maxlen, "%hi", vss);
 		  break;
 		case EXIF_FORMAT_LONG:
 		  vl = exif_get_long (entry->data, entry->order);
diff --git a/libexif/fuji/mnote-fuji-tag.c b/libexif/fuji/mnote-fuji-tag.c
index 3b80597..5b2cb40 100644
--- a/libexif/fuji/mnote-fuji-tag.c
+++ b/libexif/fuji/mnote-fuji-tag.c
@@ -83,7 +83,7 @@ mnote_fuji_tag_get_title (MnoteFujiTag t)
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
 		if (table[i].tag == t) return (_(table[i].title));
 	return NULL;
@@ -98,7 +98,7 @@ mnote_fuji_tag_get_description (MnoteFujiTag t)
 		if (table[i].tag == t) {
 			if (!table[i].description || !*table[i].description)
 				return "";
-			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+			(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 			return _(table[i].description);
 		}
 	return NULL;
diff --git a/libexif/olympus/.gitignore b/libexif/olympus/.gitignore
new file mode 100644
index 0000000..8550dbf
--- /dev/null
+++ b/libexif/olympus/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.la
+*.lo
diff --git a/libexif/olympus/exif-mnote-data-olympus.c b/libexif/olympus/exif-mnote-data-olympus.c
index 45e4bc5..1d1de2c 100644
--- a/libexif/olympus/exif-mnote-data-olympus.c
+++ b/libexif/olympus/exif-mnote-data-olympus.c
@@ -28,8 +28,6 @@
 #include <libexif/exif-utils.h>
 #include <libexif/exif-data.h>
 
-#define DEBUG
-
 /* Uncomment this to fix a problem with Sanyo MakerNotes. It's probably best
  * not to in most cases because it seems to only affect the thumbnail tag
  * which is duplicated in IFD 1, and fixing the offset could actually cause
@@ -290,7 +288,6 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 		else if (buf[o2 + 6 + 1] == 1)
 			n->order = EXIF_BYTE_ORDER_MOTOROLA;
 		o2 += 8;
-		if (o2 + 2 > buf_size) return;
 		c = exif_get_short (buf + o2, n->order);
 		if ((!(c & 0xFF)) && (c > 0x500)) {
 			if (n->order == EXIF_BYTE_ORDER_INTEL) {
@@ -308,7 +305,7 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 		if (CHECKOVERFLOW(o2,buf_size,4)) return;
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
 			"Parsing Olympus maker note v2 (0x%02x, %02x, %02x, %02x)...",
-			buf[o2], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3]);
+			buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3]);
 
 		if ((buf[o2] == 'I') && (buf[o2 + 1] == 'I'))
 			n->order = EXIF_BYTE_ORDER_INTEL;
@@ -321,12 +318,10 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 
 	case nikonV1:
 		o2 += 6;
-		if (o2 >= buf_size) return;
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
 			"Parsing Nikon maker note v1 (0x%02x, %02x, %02x, "
-			"%02x, %02x, %02x, %02x, %02x)...",
-			buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3], 
-			buf[o2 + 4], buf[o2 + 5], buf[o2 + 6], buf[o2 + 7]);
+			"%02x)...",
+			buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3]);
 
 		/* Skip version number */
 		o2 += 1;
@@ -336,7 +331,6 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 
 		base = MNOTE_NIKON1_TAG_BASE;
 		/* Fix endianness, if needed */
-		if (o2 + 2 > buf_size) return;
 		c = exif_get_short (buf + o2, n->order);
 		if ((!(c & 0xFF)) && (c > 0x500)) {
 			if (n->order == EXIF_BYTE_ORDER_INTEL) {
@@ -353,7 +347,7 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
 			"Parsing Nikon maker note v2 (0x%02x, %02x, %02x, "
 			"%02x, %02x, %02x, %02x, %02x)...",
-			buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3], 
+			buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3],
 			buf[o2 + 4], buf[o2 + 5], buf[o2 + 6], buf[o2 + 7]);
 
 		/* Skip version number */
@@ -370,7 +364,6 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 		 * gets calculated.
 		 */
 		datao = o2;
-		if (o2 >= buf_size) return;
 		if (!strncmp ((char *)&buf[o2], "II", 2))
 			n->order = EXIF_BYTE_ORDER_INTEL;
 		else if (!strncmp ((char *)&buf[o2], "MM", 2))
@@ -388,7 +381,6 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 		o2 += 2;
 
 		/* Go to where the number of entries is. */
-		if (o2 + 4 > buf_size) return;
 		o2 = datao + exif_get_long (buf + o2, n->order);
 		break;
 
@@ -401,7 +393,7 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 		/* 00 1b is # of entries in Motorola order - the rest should also be in MM order */
 		n->order = EXIF_BYTE_ORDER_MOTOROLA;
 		break;
-	
+
 	default:
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
 			"Unknown Olympus variant %i.", n->version);
@@ -494,7 +486,7 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 				exif_log (en->log, EXIF_LOG_CODE_DEBUG,
 					  "ExifMnoteOlympus",
 					  "Tag data past end of buffer (%u > %u)",
-					  dataofs + s, buf_size);
+					  (unsigned)(dataofs + s), buf_size);
 				continue;
 			}
 
@@ -571,6 +563,8 @@ exif_mnote_data_olympus_set_byte_order (ExifMnoteData *d, ExifByteOrder o)
 	o_orig = n->order;
 	n->order = o;
 	for (i = 0; i < n->count; i++) {
+		if (n->entries[i].components && (n->entries[i].size/n->entries[i].components < exif_format_get_size (n->entries[i].format)))
+			continue;
 		n->entries[i].order = o;
 		exif_array_set_byte_order (n->entries[i].format, n->entries[i].data,
 				n->entries[i].components, o_orig, o);
diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index 96c919d..32b5a22 100644
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -80,7 +80,7 @@
 #define R2D(n) ((n).denominator ? (double)(n).numerator/(n).denominator : 0.0)
 
 static const struct {
-	ExifTag tag;
+	MnoteOlympusTag tag;
 	ExifFormat fmt;
 	struct {
 		int index;
@@ -274,6 +274,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
 {
 	char         buf[30];
 	ExifLong     vl;
+	ExifSLong    vsl;
 	ExifShort    vs = 0;
 	ExifSShort   vss = 0;
 	ExifRational vr, vr2;
@@ -299,7 +300,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
 	case MNOTE_NIKON_TAG_FIRMWARE:
 		CF (entry->format,  EXIF_FORMAT_UNDEFINED, v, maxlen);
 		CC (entry->components, 4, v, maxlen);
-		vl = exif_get_long (entry->data, entry->order);
+		vl = exif_get_long (entry->data, EXIF_BYTE_ORDER_INTEL);
 		if ((vl & 0xF0F0F0F0) == 0x30303030) {
 			memcpy (v, entry->data, MIN (maxlen, 4));
 		} else {
@@ -346,12 +347,12 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
 		break;
 	case MNOTE_NIKON_TAG_LENS_FSTOPS:
 	case MNOTE_NIKON_TAG_EXPOSUREDIFF: {
-		unsigned char a,b,c,d;
+		unsigned char a,b,c;
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
 		CC (entry->components, 4, v, maxlen);
 		vl =  exif_get_long (entry->data, entry->order);
-		a = (vl>>24)&0xff; b = (vl>>16)&0xff; c = (vl>>8)&0xff; d = (vl)&0xff;
-		snprintf (v, maxlen, "%.1f",  c?(float)a*((float)b/(float)c):0 );
+		a = (vl>>24)&0xff; b = (vl>>16)&0xff; c = (vl>>8)&0xff;
+		snprintf (v, maxlen, "%.1f",  c?(double)a*((double)b/(double)c):0 );
 		break;
 	}
 	case MNOTE_NIKON_TAG_FLASHEXPCOMPENSATION:
@@ -785,10 +786,20 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
 			vs = exif_get_short (entry->data, entry->order);
 			snprintf (v, maxlen, "%hu", vs);
 			break;
+		case EXIF_FORMAT_SSHORT:
+			CC (entry->components, 1, v, maxlen);
+			vss = exif_get_sshort (entry->data, entry->order);
+			snprintf (v, maxlen, "%hi", vss);
+			break;
 		case EXIF_FORMAT_LONG:
 			CC (entry->components, 1, v, maxlen);
 			vl = exif_get_long (entry->data, entry->order);
-			snprintf (v, maxlen, "%li", (long int) vl);
+			snprintf (v, maxlen, "%lu", (long unsigned) vl);
+			break;
+		case EXIF_FORMAT_SLONG:
+			CC (entry->components, 1, v, maxlen);
+			vsl = exif_get_slong (entry->data, entry->order);
+			snprintf (v, maxlen, "%li", (long int) vsl);
 			break;
 		case EXIF_FORMAT_RATIONAL:
 			CC (entry->components, 1, v, maxlen);
diff --git a/libexif/olympus/mnote-olympus-tag.c b/libexif/olympus/mnote-olympus-tag.c
index 3810352..ed1f153 100644
--- a/libexif/olympus/mnote-olympus-tag.c
+++ b/libexif/olympus/mnote-olympus-tag.c
@@ -208,7 +208,7 @@ mnote_olympus_tag_get_title (MnoteOlympusTag t)
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
 		if (table[i].tag == t) return (_(table[i].title));
 	return NULL;
@@ -223,7 +223,7 @@ mnote_olympus_tag_get_description (MnoteOlympusTag t)
 		if (table[i].tag == t) {
 			if (!table[i].description || !*table[i].description)
 				return "";
-			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+			(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 			return _(table[i].description);
 		}
 	return NULL;
diff --git a/libexif/pentax/.gitignore b/libexif/pentax/.gitignore
new file mode 100644
index 0000000..8550dbf
--- /dev/null
+++ b/libexif/pentax/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.la
+*.lo
diff --git a/libexif/pentax/exif-mnote-data-pentax.c b/libexif/pentax/exif-mnote-data-pentax.c
index c23a7e4..5299e63 100644
--- a/libexif/pentax/exif-mnote-data-pentax.c
+++ b/libexif/pentax/exif-mnote-data-pentax.c
@@ -80,13 +80,13 @@ exif_mnote_data_pentax_save (ExifMnoteData *ne,
 		unsigned char **buf, unsigned int *buf_size)
 {
 	ExifMnoteDataPentax *n = (ExifMnoteDataPentax *) ne;
-	size_t i,
-	   base = 0,		/* internal MakerNote tag number offset */
-	   o2 = 4 + 2;  	/* offset to first tag entry, past header */
-        size_t datao = n->offset; /* this MakerNote style uses offsets
-        			  based on main IFD, not makernote IFD */
+	size_t i, datao,
+	  base = 0,	/* internal MakerNote tag number offset */
+	  o2 = 4 + 2;  	/* offset to first tag entry, past header */
 
 	if (!n || !buf || !buf_size) return;
+	datao = n->offset; /* this MakerNote style uses offsets
+			      based on main IFD, not makernote IFD */
 
 	/*
 	 * Allocate enough memory for header, the number of entries, entries,
@@ -321,7 +321,7 @@ exif_mnote_data_pentax_load (ExifMnoteData *en,
 			if (CHECKOVERFLOW(dataofs, buf_size, s)) {
 				exif_log (en->log, EXIF_LOG_CODE_DEBUG,
 						  "ExifMnoteDataPentax", "Tag data past end "
-					  "of buffer (%u > %u)", dataofs + s, buf_size);
+					  "of buffer (%u > %u)", (unsigned)(dataofs + s), buf_size);
 				continue;
 			}
 
@@ -404,6 +404,8 @@ exif_mnote_data_pentax_set_byte_order (ExifMnoteData *d, ExifByteOrder o)
 	o_orig = n->order;
 	n->order = o;
 	for (i = 0; i < n->count; i++) {
+		if (n->entries[i].components && (n->entries[i].size/n->entries[i].components < exif_format_get_size (n->entries[i].format)))
+			continue;
 		n->entries[i].order = o;
 		exif_array_set_byte_order (n->entries[i].format, n->entries[i].data,
 				n->entries[i].components, o_orig, o);
@@ -413,6 +415,7 @@ exif_mnote_data_pentax_set_byte_order (ExifMnoteData *d, ExifByteOrder o)
 int
 exif_mnote_data_pentax_identify (const ExifData *ed, const ExifEntry *e)
 {
+	(void) ed;  /* unused */
 	if ((e->size >= 8) && !memcmp (e->data, "AOC", 4)) {
 		if (((e->data[4] == 'I') && (e->data[5] == 'I')) ||
 		    ((e->data[4] == 'M') && (e->data[5] == 'M')))
diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c
index 7e97c2c..f8fdf7f 100644
--- a/libexif/pentax/mnote-pentax-entry.c
+++ b/libexif/pentax/mnote-pentax-entry.c
@@ -66,7 +66,7 @@
 }
 
 static const struct {
-	ExifTag tag;
+	MnotePentaxTag tag;
 	struct {
 		int index;
 		const char *string;
@@ -266,7 +266,7 @@ static const struct {
 
 /* Two-component values */
 static const struct {
-	ExifTag tag;
+	MnotePentaxTag tag;
 	struct {
 		int index1, index2;
 		const char *string;
@@ -309,7 +309,9 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 			      char *val, unsigned int maxlen)
 {
 	ExifLong vl;
+	ExifSLong vsl;
 	ExifShort vs, vs2;
+	ExifSShort vss;
 	int i = 0, j = 0;
 
 	if (!entry) return (NULL);
@@ -347,7 +349,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 			for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++);
 			if (!items[i].tag) {
 				snprintf (val, maxlen,
-					  _("Internal error (unknown value %i)"), vs);
+					  _("Internal error (unknown value %hu)"), vs);
 			  	break;
 			}
 
@@ -356,7 +358,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 			    (items[i].elem[j].index < vs); j++);
 			if (items[i].elem[j].index != vs) {
 				snprintf (val, maxlen,
-					  _("Internal error (unknown value %i)"), vs);
+					  _("Internal error (unknown value %hu)"), vs);
 				break;
 			}
 			strncpy (val, _(items[i].elem[j].string), maxlen);
@@ -371,7 +373,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 			for (i = 0; (items2[i].tag && items2[i].tag != entry->tag); i++);
 			if (!items2[i].tag) {
 				snprintf (val, maxlen,
-					  _("Internal error (unknown value %i %i)"), vs, vs2);
+					  _("Internal error (unknown value %hu %hu)"), vs, vs2);
 			  	break;
 			}
 
@@ -380,7 +382,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 				|| ((items2[i].elem[j].index2 == vs2) && (items2[i].elem[j].index1 < vs))); j++);
 			if ((items2[i].elem[j].index1 != vs) || (items2[i].elem[j].index2 != vs2)) {
 				snprintf (val, maxlen,
-					  _("Internal error (unknown value %i %i)"), vs, vs2);
+					  _("Internal error (unknown value %hi %hi)"), vs, vs2);
 				break;
 			}
 			strncpy (val, _(items2[i].elem[j].string), maxlen);
@@ -391,7 +393,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 		CF (entry->format, EXIF_FORMAT_LONG, val, maxlen);
 		CC (entry->components, 1, val, maxlen);
 		vl = exif_get_long (entry->data, entry->order);
-		snprintf (val, maxlen, "%li", (long int) vl);
+		snprintf (val, maxlen, "%lu", (long unsigned) vl);
 		break;
 	case MNOTE_PENTAX_TAG_PRINTIM:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
@@ -410,7 +412,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 		CC (entry->components, 4, val, maxlen);
 		/* Note: format is UNDEFINED, not SHORT -> order is fixed: MOTOROLA */
 		vs = exif_get_short (entry->data, EXIF_BYTE_ORDER_MOTOROLA);
-		snprintf (val, maxlen, "%i:%02i:%02i", vs, entry->data[2], entry->data[3]);
+		snprintf (val, maxlen, "%hi:%02i:%02i", vs, entry->data[2], entry->data[3]);
 		break;
 	case MNOTE_PENTAX2_TAG_TIME:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
@@ -425,24 +427,68 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 		case EXIF_FORMAT_SHORT:
 		  {
 			const unsigned char *data = entry->data;
-		  	size_t k, len = strlen(val);
-		  	for(k=0; k<entry->components; k++) {
+			size_t k, len = strlen(val), sizeleft;
+
+			sizeleft = entry->size;
+			for(k=0; k<entry->components; k++) {
+				if (sizeleft < 2)
+					break;
 				vs = exif_get_short (data, entry->order);
-				snprintf (val+len, maxlen-len, "%i ", vs);
+				snprintf (val+len, maxlen-len, "%hu ", vs);
+				len = strlen(val);
+				data += 2;
+				sizeleft -= 2;
+			}
+		  }
+		  break;
+		case EXIF_FORMAT_SSHORT:
+		  {
+			const unsigned char *data = entry->data;
+			size_t k, len = strlen(val), sizeleft;
+
+			sizeleft = entry->size;
+			for(k=0; k<entry->components; k++) {
+				if (sizeleft < 2)
+					break;
+				vss = exif_get_sshort (data, entry->order);
+				snprintf (val+len, maxlen-len, "%hi ", vss);
 				len = strlen(val);
 				data += 2;
+				sizeleft -= 2;
 			}
 		  }
 		  break;
 		case EXIF_FORMAT_LONG:
 		  {
 			const unsigned char *data = entry->data;
-		  	size_t k, len = strlen(val);
-		  	for(k=0; k<entry->components; k++) {
+			size_t k, len = strlen(val), sizeleft;
+
+			sizeleft = entry->size;
+			for(k=0; k<entry->components; k++) {
+				if (sizeleft < 4)
+					break;
 				vl = exif_get_long (data, entry->order);
-				snprintf (val+len, maxlen-len, "%li", (long int) vl);
+				snprintf (val+len, maxlen-len, "%lu ", (long unsigned) vl);
+				len = strlen(val);
+				data += 4;
+				sizeleft -= 4;
+			}
+		  }
+		  break;
+		case EXIF_FORMAT_SLONG:
+		  {
+			const unsigned char *data = entry->data;
+			size_t k, len = strlen(val), sizeleft;
+
+			sizeleft = entry->size;
+			for(k=0; k<entry->components; k++) {
+				if (sizeleft < 4)
+					break;
+				vsl = exif_get_slong (data, entry->order);
+				snprintf (val+len, maxlen-len, "%li ", (long int) vsl);
 				len = strlen(val);
 				data += 4;
+				sizeleft -= 4;
 			}
 		  }
 		  break;
@@ -455,5 +501,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
 		break;
 	}
 
-	return (val);
+	return val;
 }
diff --git a/libexif/pentax/mnote-pentax-tag.c b/libexif/pentax/mnote-pentax-tag.c
index 740f135..c9f3420 100644
--- a/libexif/pentax/mnote-pentax-tag.c
+++ b/libexif/pentax/mnote-pentax-tag.c
@@ -153,7 +153,7 @@ mnote_pentax_tag_get_title (MnotePentaxTag t)
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
 		if (table[i].tag == t) return (_(table[i].title));
 	return NULL;
@@ -168,7 +168,7 @@ mnote_pentax_tag_get_description (MnotePentaxTag t)
 		if (table[i].tag == t) {
 			if (!table[i].description || !*table[i].description)
 				return "";
-			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+			(void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 			return _(table[i].description);
 		}
 	return NULL;
diff --git a/m4m/.gitignore b/m4m/.gitignore
new file mode 100644
index 0000000..9911b4b
--- /dev/null
+++ b/m4m/.gitignore
@@ -0,0 +1,31 @@
+Makefile
+Makefile.in
+autom4te.cache
+codeset.m4
+gettext.m4
+glibc21.m4
+iconv.m4
+intdiv0.m4
+intmax.m4
+inttypes-pri.m4
+inttypes.m4
+inttypes_h.m4
+isc-posix.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+longdouble.m4
+longlong.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+signed.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+ulonglong.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
diff --git a/m4m/Makefile.am b/m4m/Makefile.am
index 297314a..525bdfd 100644
--- a/m4m/Makefile.am
+++ b/m4m/Makefile.am
@@ -1 +1,6 @@
-EXTRA_DIST = gp-byteorder.m4 gp-check-library.m4 gp-check-popt.m4 gp-check-shell-environment.m4 gp-config-msg.m4 gp-documentation.m4 gp-gettext-hack.m4 gp-packaging.m4 gp-pkg-config.m4 gp-references.m4 stdint.m4
+EXTRA_DIST = \
+	gp-check-shell-environment.m4 \
+	gp-config-msg.m4 \
+	gp-documentation.m4 \
+	gp-gettext-hack.m4 \
+	stdint.m4
diff --git a/m4m/Makefile.in b/m4m/Makefile.in
deleted file mode 100644
index ad1bb2c..0000000
--- a/m4m/Makefile.in
+++ /dev/null
@@ -1,398 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = m4m
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = gp-byteorder.m4 gp-check-library.m4 gp-check-popt.m4 gp-check-shell-environment.m4 gp-config-msg.m4 gp-documentation.m4 gp-gettext-hack.m4 gp-packaging.m4 gp-pkg-config.m4 gp-references.m4 stdint.m4
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4m/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu m4m/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/m4m/failmalloc.m4 b/m4m/failmalloc.m4
new file mode 100644
index 0000000..bbf3e28
--- /dev/null
+++ b/m4m/failmalloc.m4
@@ -0,0 +1,56 @@
+dnl Search for libfailmalloc to use for testing
+AC_DEFUN([CHECK_FAILMALLOC],[dnl
+  dnl Libtool sets the default library paths
+  AM_PROG_LIBTOOL
+  path_provided=
+  failmalloc_requested=  dnl Either implicitly or explicitly
+  AC_ARG_WITH(failmalloc, [  --with-failmalloc=PATH  use Failmalloc for tests], [
+      failmalloc_requested=1
+      if test x"$withval" = "x" -o x"$withval" = x"yes"; then
+        failmalloc_search_path="$sys_lib_search_path_spec"
+      elif test x"$withval" = x"no"; then
+        failmalloc_search_path=""
+        failmalloc_requested=
+      else
+        failmalloc_search_path="$withval"
+        path_provided=1
+      fi
+    ], [failmalloc_search_path="$sys_lib_search_path_spec"]
+  )
+  libfailmalloc_file=libfailmalloc.so.0
+  FAILMALLOC_PATH=
+
+  dnl Skip the check if we're cross-compiling, unless the user explicitly requested it
+  if test x"$cross_compiling" = x"no" -o x"$failmalloc_requested" = x"1"; then
+    dnl Check if the argument is a directory
+    for d in $failmalloc_search_path; do
+        AC_CHECK_FILE([$d/$libfailmalloc_file], [
+          FAILMALLOC_PATH="$d/$libfailmalloc_file"
+          break
+        ], [])
+    done
+    if test -z "$FAILMALLOC_PATH" -a -n "$path_provided"; then
+      dnl Check if the argument is a file
+      AC_CHECK_FILE([$failmalloc_search_path], [FAILMALLOC_PATH="$failmalloc_search_path"], [])
+    fi
+  fi
+
+  AC_MSG_CHECKING([for failmalloc])
+  dnl Make sure AC_CHECK_FILE didn't find a directory by mistake
+  if test -n "$FAILMALLOC_PATH" -a -f "$FAILMALLOC_PATH"; then
+    AC_MSG_RESULT([yes])
+  else
+    if test -n "$path_provided"; then
+      AC_MSG_ERROR([$libfailmalloc_file was not found at $failmalloc_search_path])
+    else
+      if test x"$cross_compiling" != x"no"; then
+        AC_MSG_RESULT([no (cross compiling)])
+      else
+        AC_MSG_RESULT([no])
+      fi
+    fi
+  fi
+  AC_SUBST(FAILMALLOC_PATH)
+  AM_CONDITIONAL(USE_FAILMALLOC, [test x"$FAILMALLOC_PATH" != x])
+])
+
diff --git a/m4m/gp-byteorder.m4 b/m4m/gp-byteorder.m4
deleted file mode 100644
index 693f939..0000000
--- a/m4m/gp-byteorder.m4
+++ /dev/null
@@ -1,354 +0,0 @@
-dnl AC_NEED_BYTEORDER_H ( HEADER-TO-GENERATE )
-dnl Copyright 2001-2002 by Dan Fandrich <dan@coneharvesters.com>
-dnl This file may be copied and used freely without restrictions.  No warranty
-dnl is expressed or implied.
-dnl
-dnl Create a header file that guarantees that byte swapping macros of the
-dnl ntohl variety as well as the extended types included in OpenBSD and
-dnl NetBSD such as le32toh are defined.  If possible, the standard ntohl
-dnl are overloaded as they are optimized for the given platform, but when
-dnl this is not possible (e.g. on a big-endian machine) they are defined
-dnl in this file.
-
-dnl Look for a symbol in a header file
-dnl AC_HAVE_SYMBOL ( IDENTIFIER, HEADER-FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND )
-AC_DEFUN([AC_HAVE_SYMBOL],
-[
-AC_MSG_CHECKING(for $1 in $2)
-AC_EGREP_CPP([symbol is present|\<$1\>],[
-#include <$2>
-#ifdef $1
- 	symbol is present
-#endif
-	], 
-[AC_MSG_RESULT(yes)
-$3
-],
-[AC_MSG_RESULT(no)
-$4
-])])
-
-
-dnl Create a header file that defines extended byte swapping macros
-AC_DEFUN([AC_NEED_BYTEORDER_H],
-[
-changequote(, )dnl
-ac_dir=`echo $1|sed 's%/[^/][^/]*$%%'`
-changequote([, ])dnl
-if test "$ac_dir" != "$1" && test "$ac_dir" != .; then
-  # The file is in a subdirectory.
-  test ! -d "$ac_dir" && mkdir "$ac_dir"
-fi
-
-# We're only interested in the target CPU, but it's not always set
-effective_target="$target"
-if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then
-	effective_target="$host"
-fi
-AC_SUBST(effective_target)
-
-cat > "$1" << EOF
-/* This file is generated automatically by configure */
-/* It is valid only for the system type ${effective_target} */
-
-#ifndef __BYTEORDER_H
-#define __BYTEORDER_H
-
-EOF
-
-dnl First, do an endian check
-AC_C_BIGENDIAN
-
-dnl Look for NetBSD-style extended byte swapping macros
-AC_HAVE_SYMBOL(le32toh,machine/endian.h,
- [HAVE_LE32TOH=1
- cat >> "$1" << EOF
-/* extended byte swapping macros are already available */
-#include <machine/endian.h>
-
-EOF],
-
-[
-
-dnl Look for standard byte swapping macros
-AC_HAVE_SYMBOL(ntohl,arpa/inet.h,
- [cat >> "$1" << EOF
-/* ntohl and relatives live here */
-#include <arpa/inet.h>
-
-EOF],
-
- [AC_HAVE_SYMBOL(ntohl,netinet/in.h,
-  [cat >> "$1" << EOF
-/* ntohl and relatives live here */
-#include <netinet/in.h>
-
-EOF],true)])
-])
-
-dnl Look for generic byte swapping macros
-
-dnl OpenBSD
-AC_HAVE_SYMBOL(swap32,machine/endian.h,
- [cat >> "$1" << EOF
-/* swap32 and swap16 are defined in machine/endian.h */
-
-EOF],
-
- [
-dnl Linux GLIBC
-  AC_HAVE_SYMBOL(bswap_32,byteswap.h,
-   [cat >> "$1" << EOF
-/* Define generic byte swapping functions */
-#include <byteswap.h>
-#define swap16(x) bswap_16(x)
-#define swap32(x) bswap_32(x)
-#define swap64(x) bswap_64(x)
-
-EOF],
-
-   [
-dnl NetBSD
-  	AC_HAVE_SYMBOL(bswap32,machine/endian.h,
-    dnl We're already including machine/endian.h if this test succeeds
-  	 [cat >> "$1" << EOF
-/* Define generic byte swapping functions */
-EOF
-	if test "$HAVE_LE32TOH" != "1"; then
-		echo '#include <machine/endian.h>'>> "$1"
-	fi
-cat >> "$1" << EOF
-#define swap16(x) bswap16(x)
-#define swap32(x) bswap32(x)
-#define swap64(x) bswap64(x)
-
-EOF],
-
-   [
-dnl FreeBSD
-  	AC_HAVE_SYMBOL(__byte_swap_long,sys/types.h,
-  	 [cat >> "$1" << EOF
-/* Define generic byte swapping functions */
-#include <sys/types.h>
-#define swap16(x) __byte_swap_word(x)
-#define swap32(x) __byte_swap_long(x)
-/* No optimized 64 bit byte swapping macro is available */
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
-			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
-			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
-			      ((x) >> 40) & 0x000000000000ff00ULL | \\
-			      ((x) >> 56) & 0x00000000000000ffULL))
-
-EOF],
-
-  	 [
-dnl OS X
-  	AC_HAVE_SYMBOL(NXSwapLong,machine/byte_order.h,
-  	 [cat >> "$1" << EOF
-/* Define generic byte swapping functions */
-#include <machine/byte_order.h>
-#define swap16(x) NXSwapShort(x)
-#define swap32(x) NXSwapLong(x)
-#define swap64(x) NXSwapLongLong(x)
-
-EOF],
-         [
-	if test $ac_cv_c_bigendian = yes; then
-		cat >> "$1" << EOF
-/* No other byte swapping functions are available on this big-endian system */
-#define swap16(x)	((uint16_t)(((x) << 8) | ((uint16_t)(x) >> 8)))
-#define swap32(x)	((uint32_t)(((uint32_t)(x) << 24) & 0xff000000UL | \\
-				    ((uint32_t)(x) << 8)  & 0x00ff0000UL | \\
-				    ((x) >> 8)  & 0x0000ff00UL | \\
-				    ((x) >> 24) & 0x000000ffUL))
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
-			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
-			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
-			      ((x) >> 40) & 0x000000000000ff00ULL | \\
-			      ((x) >> 56) & 0x00000000000000ffULL))
-
-EOF
-	else
- cat >> "$1" << EOF
-/* Use these as generic byteswapping macros on this little endian system */
-#define swap16(x)		ntohs(x)
-#define swap32(x)		ntohl(x)
-/* No optimized 64 bit byte swapping macro is available */
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
-			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
-			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
-			      ((x) >> 40) & 0x000000000000ff00ULL | \\
-			      ((x) >> 56) & 0x00000000000000ffULL))
-
-EOF
-	fi
-])
-  	  ])
-    ])
-  ])
-])
-
-
-[
-if test "$HAVE_LE32TOH" != "1"; then
- cat >> "$1" << EOF
-/* The byte swapping macros have the form: */
-/*   EENN[a]toh or htoEENN[a] where EE is be (big endian) or */
-/* le (little-endian), NN is 16 or 32 (number of bits) and a, */
-/* if present, indicates that the endian side is a pointer to an */
-/* array of uint8_t bytes instead of an integer of the specified length. */
-/* h refers to the host's ordering method. */
-
-/* So, to convert a 32-bit integer stored in a buffer in little-endian */
-/* format into a uint32_t usable on this machine, you could use: */
-/*   uint32_t value = le32atoh(&buf[3]); */
-/* To put that value back into the buffer, you could use: */
-/*   htole32a(&buf[3], value); */
-
-/* Define aliases for the standard byte swapping macros */
-/* Arguments to these macros must be properly aligned on natural word */
-/* boundaries in order to work properly on all architectures */
-#define htobe16(x) htons(x)
-#define htobe32(x) htonl(x)
-#define be16toh(x) ntohs(x)
-#define be32toh(x) ntohl(x)
-
-#define HTOBE16(x) (x) = htobe16(x)
-#define HTOBE32(x) (x) = htobe32(x)
-#define BE32TOH(x) (x) = be32toh(x)
-#define BE16TOH(x) (x) = be16toh(x)
-
-EOF
-
- if test $ac_cv_c_bigendian = yes; then
-  cat >> "$1" << EOF
-/* Define our own extended byte swapping macros for big-endian machines */
-#define htole16(x)      swap16(x)
-#define htole32(x)      swap32(x)
-#define le16toh(x)      swap16(x)
-#define le32toh(x)      swap32(x)
-
-#define htobe64(x)      (x)
-#define be64toh(x)      (x)
-
-#define HTOLE16(x)      (x) = htole16(x)
-#define HTOLE32(x)      (x) = htole32(x)
-#define LE16TOH(x)      (x) = le16toh(x)
-#define LE32TOH(x)      (x) = le32toh(x)
-
-#define HTOBE64(x)      (void) (x)
-#define BE64TOH(x)      (void) (x)
-
-EOF
- else
-  cat >> "$1" << EOF
-/* On little endian machines, these macros are null */
-#define htole16(x)      (x)
-#define htole32(x)      (x)
-#define htole64(x)      (x)
-#define le16toh(x)      (x)
-#define le32toh(x)      (x)
-#define le64toh(x)      (x)
-
-#define HTOLE16(x)      (void) (x)
-#define HTOLE32(x)      (void) (x)
-#define HTOLE64(x)      (void) (x)
-#define LE16TOH(x)      (void) (x)
-#define LE32TOH(x)      (void) (x)
-#define LE64TOH(x)      (void) (x)
-
-/* These don't have standard aliases */
-#define htobe64(x)      swap64(x)
-#define be64toh(x)      swap64(x)
-
-#define HTOBE64(x)      (x) = htobe64(x)
-#define BE64TOH(x)      (x) = be64toh(x)
-
-EOF
- fi
-fi
-
-cat >> "$1" << EOF
-/* Define the C99 standard length-specific integer types */
-#include <_stdint.h>
-
-EOF
-
-case "${effective_target}" in
- i[3456]86-*)
-  cat >> "$1" << EOF
-/* Here are some macros to create integers from a byte array */
-/* These are used to get and put integers from/into a uint8_t array */
-/* with a specific endianness.  This is the most portable way to generate */
-/* and read messages to a network or serial device.  Each member of a */
-/* packet structure must be handled separately. */
-
-/* The i386 and compatibles can handle unaligned memory access, */
-/* so use the optimized macros above to do this job */
-#define be16atoh(x)     be16toh(*(uint16_t*)(x))
-#define be32atoh(x)     be32toh(*(uint32_t*)(x))
-#define be64atoh(x)     be64toh(*(uint64_t*)(x))
-#define le16atoh(x)     le16toh(*(uint16_t*)(x))
-#define le32atoh(x)     le32toh(*(uint32_t*)(x))
-#define le64atoh(x)     le64toh(*(uint64_t*)(x))
-
-#define htobe16a(a,x)   *(uint16_t*)(a) = htobe16(x)
-#define htobe32a(a,x)   *(uint32_t*)(a) = htobe32(x)
-#define htobe64a(a,x)   *(uint64_t*)(a) = htobe64(x)
-#define htole16a(a,x)   *(uint16_t*)(a) = htole16(x)
-#define htole32a(a,x)   *(uint32_t*)(a) = htole32(x)
-#define htole64a(a,x)   *(uint64_t*)(a) = htole64(x)
-
-EOF
-  ;;
-
- *)
-  cat >> "$1" << EOF
-/* Here are some macros to create integers from a byte array */
-/* These are used to get and put integers from/into a uint8_t array */
-/* with a specific endianness.  This is the most portable way to generate */
-/* and read messages to a network or serial device.  Each member of a */
-/* packet structure must be handled separately. */
-
-/* Non-optimized but portable macros */
-#define be16atoh(x)     ((uint16_t)(((x)[0]<<8)|(x)[1]))
-#define be32atoh(x)     ((uint32_t)(((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3]))
-#define be64atoh(x)     ((uint64_t)(((x)[0]<<56)|((x)[1]<<48)|((x)[2]<<40)| \\
-        ((x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7]))
-#define le16atoh(x)     ((uint16_t)(((x)[1]<<8)|(x)[0]))
-#define le32atoh(x)     ((uint32_t)(((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0]))
-#define le64atoh(x)     ((uint64_t)(((x)[7]<<56)|((x)[6]<<48)|((x)[5]<<40)| \\
-        ((x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0]))
-
-#define htobe16a(a,x)   (a)[0]=(uint8_t)((x)>>8), (a)[1]=(uint8_t)(x)
-#define htobe32a(a,x)   (a)[0]=(uint8_t)((x)>>24), (a)[1]=(uint8_t)((x)>>16), \\
-        (a)[2]=(uint8_t)((x)>>8), (a)[3]=(uint8_t)(x)
-#define htobe64a(a,x)   (a)[0]=(uint8_t)((x)>>56), (a)[1]=(uint8_t)((x)>>48), \\
-        (a)[2]=(uint8_t)((x)>>40), (a)[3]=(uint8_t)((x)>>32), \\
-        (a)[4]=(uint8_t)((x)>>24), (a)[5]=(uint8_t)((x)>>16), \\
-        (a)[6]=(uint8_t)((x)>>8), (a)[7]=(uint8_t)(x)
-#define htole16a(a,x)   (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-#define htole32a(a,x)   (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\
-        (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-#define htole64a(a,x)   (a)[7]=(uint8_t)((x)>>56), (a)[6]=(uint8_t)((x)>>48), \\
-        (a)[5]=(uint8_t)((x)>>40), (a)[4]=(uint8_t)((x)>>32), \\
-        (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\
-        (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-
-EOF
-  ;;
-esac
-]
-
-cat >> "$1" << EOF
-#endif /*__BYTEORDER_H*/
-EOF])
diff --git a/m4m/gp-check-library.m4 b/m4m/gp-check-library.m4
deleted file mode 100644
index dd3700a..0000000
--- a/m4m/gp-check-library.m4
+++ /dev/null
@@ -1,378 +0,0 @@
-dnl @synopsis GP_CHECK_LIBRARY([VARNAMEPART],[libname],[VERSION-REQUIREMENT],
-dnl                            [headername],[functionname],
-dnl                            [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-dnl                            [OPTIONAL-REQUIRED-ETC],[WHERE-TO-GET-IT])
-dnl
-dnl Checks for the presence of a certain library.
-dnl
-dnl Parameters:
-dnl
-dnl    VARNAMEPART            partial variable name for variable definitions
-dnl    libname                name of library
-dnl    VERSION-REQUIREMENT    check for the version using pkg-config.
-dnl                           default: []
-dnl    headername             name of header file
-dnl                           default: []
-dnl    functionname           name of function name in library
-dnl                           default: []
-dnl    ACTION-IF-FOUND        shell action to execute if found
-dnl                           default: []
-dnl    ACTION-IF-NOT-FOUND    shell action to execute if not found
-dnl                           default: []
-dnl    OPTIONAL-REQUIRED-ETC  one of "mandatory", "default-on", "default-off"
-dnl                                  "disable-explicitly"
-dnl                           default: [mandatory]
-dnl    WHERE-TO-GET-IT        place where to find the library, e.g. a URL
-dnl                           default: []
-dnl
-dnl What the ACTION-IFs can do:
-dnl
-dnl   * change the variable have_[$1] to "yes" or "no" and thus change
-dnl     the outcome of the test
-dnl   * execute additional checks to define more specific variables, e.g.
-dnl     for different API versions
-dnl
-dnl What the OPTIONAL-REQUIRED-ETC options mean:
-dnl
-dnl   mandatory           Absolute requirement, cannot be disabled.
-dnl   default-on          If found, it is used. If not found, it is not used.
-dnl   default-off         In case of --with-libfoo, detect it. Without
-dnl                       --with-libfoo, do not look for and use it.
-dnl   disable-explicitly  Required by default, but can be disabled by
-dnl                       explicitly giving --without-libfoo.
-dnl
-dnl These results have happened after calling GP_CHECK_LIBRARY:
-dnl
-dnl    AM_CONDITIONAL([HAVE_VARPREFIX],[ if found ])
-dnl    AM_SUBST([have_VARPREFIX], [ "yes" if found, "no" if not found ])
-dnl    AM_SUBST([VARPREFIX_CFLAGS],[ -I, -D and stuff ])
-dnl    AM_SUBST([VARPREFIX_LIBS], [ /path/to/libname.la -L/path -lfoo ])
-dnl
-dnl Parameters to ./configure which influence the GP_CHECK_LIBRARY results:
-dnl
-dnl   * VARNAMEPART_LIBS=/foobar/arm-palmos/lib/libname.la
-dnl     VARNAMEPART_CFLAGS=-I/foobar/include
-dnl   * --without-libfoo
-dnl   * --with-libfoo=/usr/local
-dnl   * --with-libfoo-include-dir=/foobar/include
-dnl   * --with-libfoo-lib=/foobar/arm-palmos/lib
-dnl   * --with-libfoo=autodetect
-dnl
-dnl Examples:
-dnl    GP_CHECK_LIBRARY([LIBEXIF], [libexif])dnl
-dnl    GP_CHECK_LIBRARY([LIBEXIF], [libexif-gtk], [>= 0.3.3])dnl
-dnl                                  note the space! ^
-dnl
-dnl Possible enhancements:
-dnl
-dnl   * Derive VAR_PREFIX directly from libname
-dnl     This will change the calling conventions, so be aware of that.
-dnl   * Give names of a header file and function name and to a test
-dnl     compilation.
-dnl
-AC_DEFUN([_GP_CHECK_LIBRARY_SOEXT],[dnl
-AC_MSG_CHECKING([for dynamic library extension])
-soext=""
-case "$host" in
-	*linux*)	soext=".so" ;;
-	*sunos*)	soext=".so" ;;
-	*solaris*)	soext=".so" ;;
-	*bsd*)		soext=".so" ;;
-	*darwin*)	soext=".dylib" ;;
-	*w32*)		soext=".dll" ;;
-esac
-if test "x$soext" = "x"; then
-	soext=".so"
-	AC_MSG_RESULT([${soext}])
-	AC_MSG_WARN([
-Host system "${host}" not recognized, defaulting to "${soext}".
-])
-else
-	AC_MSG_RESULT([${soext}])
-fi
-])dnl
-dnl
-AC_DEFUN([_GP_CHECK_LIBRARY],[
-# ----------------------------------------------------------------------
-# [GP_CHECK_LIBRARY]([$1],[$2],[$3],
-#                    [$4],[$5],
-#                    [...],[...],[$8])
-m4_ifval([$9],[dnl
-# $9
-])dnl
-# ----------------------------------------------------------------------
-dnl
-AC_REQUIRE([GP_CONFIG_MSG])dnl
-AC_REQUIRE([GP_PKG_CONFIG])dnl
-AC_REQUIRE([_GP_CHECK_LIBRARY_SOEXT])dnl
-dnl Use _CFLAGS and _LIBS given to configure.
-dnl This makes it possible to set these vars in a configure script
-dnl and AC_CONFIG_SUBDIRS this configure.
-AC_ARG_VAR([$1][_CFLAGS], [CFLAGS for compiling with ][$2])dnl
-AC_ARG_VAR([$1][_LIBS],   [LIBS to add for linking against ][$2])dnl
-dnl
-AC_MSG_CHECKING([for ][$2][ to use])
-userdef_[$1]=no
-have_[$1]=no
-if test "x${[$1][_LIBS]}" = "x" && test "x${[$1][_CFLAGS]}" = "x"; then
-	dnl define --with/--without argument
-	m4_if([$8], [default-off],
-		[m4_pushdef([gp_lib_arg],[--without-][$2])dnl
-			try_[$1]=no
-		],
-		[m4_pushdef([gp_lib_arg],[--with-][$2])dnl
-			try_[$1]=auto
-		])dnl
-	AC_ARG_WITH([$2],[AS_HELP_STRING([gp_lib_arg][=PREFIX],[where to find ][$2][, "no" or "auto"])],[try_][$1][="$withval"])
-	if test "x${[try_][$1]}" = "xauto"; then [try_][$1]=autodetect; fi
-	AC_MSG_RESULT([${try_][$1][}])
-	m4_popdef([gp_lib_arg])dnl
-	if test "x${[try_][$1]}" = "xautodetect"; then
-		dnl OK, we have to autodetect.
-		dnl We start autodetection with the cleanest known method: pkg-config
-		if test "x${[have_][$1]}" = "xno"; then
-			dnl we need that line break after the PKG_CHECK_MODULES
-			m4_ifval([$3],
-				[PKG_CHECK_MODULES([$1],[$2][ $3],[have_][$1][=yes],[:])],
-				[PKG_CHECK_MODULES([$1],[$2],     [have_][$1][=yes],[:])]
-			)
-		fi
-		dnl If pkg-config didn't find anything, try the libfoo-config program
-		dnl certain known libraries ship with.
-		if test "x${[have_][$1]}" = "xno"; then
-			AC_MSG_WARN([The `$2' library could not be found using pkg-config.
-No version checks will be performed if it is found using any other method.])
-			AC_MSG_CHECKING([$2][ config program])
-			m4_pushdef([gp_lib_config],[m4_if([$2],[libusb],[libusb-config],
-				[$2],[libgphoto2],[gphoto2-config],
-				[$2],[libgphoto2_port],[gphoto2-port-config],
-				[none])])dnl
-			AC_MSG_RESULT([gp_lib_config])
-			AC_PATH_PROG([$1][_CONFIG_PROG],[gp_lib_config])
-			if test -n "${[$1][_CONFIG_PROG]}" &&
-				test "${[$1][_CONFIG_PROG]}" != "none"; then
-				AC_MSG_CHECKING([for ][$2][ parameters from ][gp_lib_config])
-				[$1]_LIBS="$(${[$1][_CONFIG_PROG]} --libs || echo "*error*")"
-				[$1]_CFLAGSS="$(${[$1][_CONFIG_PROG]} --cflags || echo "*error*")"
-				if test "x${[$1]_LIBS}" = "*error*" || 
-					test "x${[$1]_CFLAGS}" = "*error*"; then
-					AC_MSG_RESULT([error])
-				else
-					have_[$1]=yes
-					AC_MSG_RESULT([ok])
-				fi
-			fi
-			m4_popdef([gp_lib_config])dnl
-		fi
-		dnl Neither pkg-config, nor the libfoo-config program have found anything.
-		dnl So let's just probe the system.
-		if test "x${[have_][$1]}" = "xno"; then
-			ifs="$IFS"
-			IFS=":" # FIXME: for W32 and OS/2 we may need ";" here
-			for _libdir_ in \
-				${LD_LIBRARY_PATH} \
-				"${libdir}" \
-				"${prefix}/lib64" "${prefix}/lib" \
-				/usr/lib64 /usr/lib \
-				/usr/local/lib64 /usr/local/lib \
-				/opt/lib64 /opt/lib
-			do
-				IFS="$ifs"
-				for _soext_ in .la ${soext} .a; do
-					if test -f "${_libdir_}/[$2]${_soext_}"
-					then
-						if test "x${_soext_}" = "x.la" ||
-						   test "x${_soext_}" = "x.a"; then
-							[$1]_LIBS="${_libdir_}/[$2]${_soext_}"
-						else
-							[$1]_LIBS="-L${_libdir_} -l$(echo "$2" | sed 's/^lib//')"
-						fi
-						break
-					fi
-				done
-				if test "x${[$1][_LIBS]}" != "x"; then
-					break
-				fi
-			done
-			IFS="$ifs"
-			if test "x${[$1][_LIBS]}" != "x"; then
-				have_[$1]=yes
-			fi
-		fi
-	elif test "x${[try_][$1]}" = "xno"; then
-		:
-	else
-		[$1][_LIBS]="-L${[try_][$1]}/lib -l$(echo "$2" | sed 's/^lib//')"
-		[$1][_CFLAGS]="-I${[try_][$1]}/include"
-	fi
-elif test "x${[$1][_LIBS]}" != "x" && test "x${[$1][_CFLAGS]}" != "x"; then
-	AC_MSG_RESULT([user-defined])
-	userdef_[$1]=yes
-	have_[$1]=yes
-else
-	AC_MSG_RESULT([broken call])
-	AC_MSG_ERROR([
-* Fatal:
-* When calling configure for ${PACKAGE_TARNAME}
-*     ${PACKAGE_NAME}
-* either set both [$1][_LIBS] *and* [$1][_CFLAGS]
-* or neither.
-])
-fi
-dnl
-dnl ACTION-IF-FOUND
-dnl
-m4_ifval([$6],[dnl
-if test "x${[have_][$1]}" = "xyes"; then
-# ACTION-IF-FOUND
-$6
-fi
-])dnl
-dnl
-dnl ACTION-IF-NOT-FOUND
-dnl
-m4_ifval([$7],[dnl
-if test "x${[have_][$1]}" = "xno"; then
-# ACTION-IF-NOT-FOUND
-$7
-fi
-])dnl
-dnl
-dnl Run our own test compilation
-dnl
-m4_ifval([$4],[dnl
-if test "x${[have_][$1]}" = "xyes"; then
-dnl AC_MSG_CHECKING([whether ][$2][ test compile succeeds])
-dnl AC_MSG_RESULT([${[have_][$1]}])
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="${[$1]_CFLAGS}"
-AC_CHECK_HEADER([$4],[have_][$1][=yes],[have_][$1][=no])
-CPPFLAGS="$CPPFLAGS_save"
-fi
-])dnl
-dnl
-dnl Run our own test link
-dnl    Does not work for libraries which be built after configure time,
-dnl    so we deactivate it for them (userdef_).
-dnl
-m4_ifval([$5],[dnl
-if test "x${[userdef_][$1]}" = "xno" && test "x${[have_][$1]}" = "xyes"; then
-	AC_MSG_CHECKING([for function ][$5][ in ][$2])
-	LIBS_save="$LIBS"
-	LIBS="${[$1]_LIBS}"
-	AC_TRY_LINK_FUNC([$5],[],[have_][$1][=no])
-	LIBS="$LIBS_save"
-	AC_MSG_RESULT([${[have_][$1]}])
-fi
-])dnl
-dnl
-dnl Abort configure script if mandatory, but not found
-dnl
-m4_if([$8],[mandatory],[
-if test "x${[have_][$1]}" = "xno"; then
-	AC_MSG_ERROR([
-PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
-[$1][_LIBS]=${[$1][_LIBS]}
-[$1][_CFLAGS]=${[$1][_CFLAGS]}
-
-* Fatal: ${PACKAGE_NAME} requires $2 to build.
-* 
-* Possible solutions:
-*   - set PKG_CONFIG_PATH to adequate value
-*   - call configure with [$1][_LIBS]=.. and [$1][_CFLAGS]=..
-*   - call configure with one of the --with-$2 parameters
-]m4_ifval([$9],[dnl
-*   - get $2 and install it
-],[dnl
-*   - get $2 and install it:
-      $9]))
-fi
-])dnl
-dnl
-dnl Abort configure script if not found and not explicitly disabled
-dnl
-m4_if([$8],[disable-explicitly],[
-if test "x${[try_][$1]}" != "xno" && test "x${[have_][$1]}" = "xno"; then
-        AC_MSG_ERROR([
-PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
-[$1][_LIBS]=${[$1][_LIBS]}
-[$1][_CFLAGS]=${[$1][_CFLAGS]}
-
-* Fatal: ${PACKAGE_NAME} by default requires $2 to build.
-*        You must explicitly disable $2 to build ${PACKAGE_TARNAME} without it.
-* 
-* Possible solutions:
-*   - call configure with --with-$2=no or --without-$2
-*   - set PKG_CONFIG_PATH to adequate value
-*   - call configure with [$1][_LIBS]=.. and [$1][_CFLAGS]=..
-*   - call configure with one of the --with-$2 parameters
-]m4_ifval([$9],[dnl
-*   - get $2 and install it
-],[dnl
-*   - get $2 and install it:
-      $9]))
-fi
-])dnl
-AM_CONDITIONAL([HAVE_][$1], [test "x$have_[$1]" = "xyes"])
-if test "x$have_[$1]" = "xyes"; then
-	AC_DEFINE([HAVE_][$1], 1, [whether we compile with ][$2][ support])
-	GP_CONFIG_MSG([$2],[yes])dnl
-	AC_MSG_CHECKING([$2][ library flags])
-	AC_MSG_RESULT([${[$1][_LIBS]}])
-	AC_MSG_CHECKING([$2][ cpp flags])
-	AC_MSG_RESULT([${[$1][_CFLAGS]}])
-else
-	GP_CONFIG_MSG([$2],[no])dnl
-fi
-dnl AC_SUBST is done implicitly by AC_ARG_VAR above.
-dnl AC_SUBST([$1][_LIBS])
-dnl AC_SUBST([$1][_CFLAGS])
-])dnl
-dnl
-dnl ####################################################################
-dnl
-AC_DEFUN([_GP_CHECK_LIBRARY_SYNTAX_ERROR],[dnl
-m4_errprint(__file__:__line__:[ Error:
-*** Calling $0 macro with old syntax
-*** Aborting.
-])dnl
-m4_exit(1)dnl
-])dnl
-dnl
-dnl ####################################################################
-dnl
-AC_DEFUN([GP_CHECK_LIBRARY],[dnl
-m4_if([$4], [mandatory],        [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)],
-      [$4], [default-enabled],  [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)],
-      [$4], [default-disabled], [_GP_CHECK_LIBRARY_SYNTAX_ERROR($0)])dnl
-m4_if([$8], [], [dnl
-      _GP_CHECK_LIBRARY([$1],[$2],[$3],[$4],[$5],[$6],[$7],[mandatory],[$9])],
-      [$8], [default-on], [dnl
-      _GP_CHECK_LIBRARY([$1],[$2],[$3],[$4],[$5],[$6],[$7],[$8],[$9])],
-      [$8], [disable-explicitly], [dnl
-      _GP_CHECK_LIBRARY([$1],[$2],[$3],[$4],[$5],[$6],[$7],[$8],[$9])],
-      [$8], [default-off], [dnl
-      _GP_CHECK_LIBRARY([$1],[$2],[$3],[$4],[$5],[$6],[$7],[$8],[$9])],
-      [$8], [mandatory], [dnl
-      _GP_CHECK_LIBRARY([$1],[$2],[$3],[$4],[$5],[$6],[$7],[$8],[$9])],
-      [m4_errprint(__file__:__line__:[ Error:
-Illegal argument 6 to $0: `$6'
-It must be one of "default-on", "default-off", "mandatory".
-])m4_exit(1)])dnl
-])dnl
-dnl
-m4_pattern_disallow([GP_CHECK_LIBRARY])
-m4_pattern_disallow([_GP_CHECK_LIBRARY])
-m4_pattern_disallow([_GP_CHECK_LIBRARY_SYNTAX_ERROR])
-m4_pattern_disallow([_GP_CHECK_LIBRARY_SOEXT])
-dnl
-dnl ####################################################################
-dnl
-dnl Please do not remove this:
-dnl filetype: 6e60b4f0-acb2-4cd5-8258-42014f92bd2c
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:
diff --git a/m4m/gp-check-popt.m4 b/m4m/gp-check-popt.m4
deleted file mode 100644
index 585bf21..0000000
--- a/m4m/gp-check-popt.m4
+++ /dev/null
@@ -1,180 +0,0 @@
-dnl @synopsis GP_CHECK_POPT(FLAG)
-dnl
-dnl Check whether libpopt is available.
-dnl FLAG must be one of
-dnl    "mandatory"
-dnl    "default-enabled"
-dnl    "default-disabled"
-dnl
-AC_DEFUN([GP_CHECK_POPT],[
-#
-# [GP_CHECK_POPT]
-#
-AC_REQUIRE([GP_CONFIG_MSG])dnl
-m4_if([$1],[mandatory],        [_GP_CHECK_POPT([mandatory])],
-      [$1],[default-enabled],  [_GP_CHECK_POPT([disable])],
-      [$1],[default-disabled], [_GP_CHECK_POPT([enable])],
-      [m4_errprint(__file__:__line__:[ Error:
-Illegal argument to $0: `$1'
-Valid values are: mandatory, default-enabled, default-disabled
-])m4_exit(1)])dnl
-])dnl
-dnl
-AC_DEFUN([_GP_CHECK_POPT],[
-m4_if([$1],[mandatory],[
-try_popt=yes
-require_popt=yes
-],[
-try_popt=auto
-require_popt=no
-AC_ARG_ENABLE([popt],
-[AS_HELP_STRING([--$1-popt],[Do not use popt])],
-[ if   test "x$withval" = no \
-    || test "x$withval" = off \
-    || test "x$withval" = false; 
-  then
-    try_popt=no
-    require_popt=no
-  elif test "x$withval" = yes \
-    || test "x$withval" = on \
-    || test "x$withval" = true
-  then
-    try_popt=yes
-    require_popt=yes
-  fi
-])dnl
-])dnl
-
-AC_MSG_CHECKING([whether popt is required])
-AC_MSG_RESULT([${require_popt}])
-
-if test "$require_popt" != yes; then
-	AC_MSG_CHECKING([whether popt is requested])
-	AC_MSG_RESULT([${try_popt}])
-fi
-
-dnl Implicit AC_SUBST
-AC_ARG_VAR([POPT_CFLAGS],[CPPFLAGS to compile with libpopt])dnl
-AC_ARG_VAR([POPT_LIBS],[LDFLAGS to link with libpopt])dnl
-
-have_popt=no
-
-if test "x$POPT_CFLAGS" = "x" && test "x$POPT_LIBS" = "x"; then
-
-	# try to find options to compile popt.h
-	CPPFLAGS_save="$CPPFLAGS"
-	popth_found=no
-	for popt_prefix in "" /usr /usr/local
-	do
-		if test -n "${popt_prefix}"; then
-			:
-		elif test -d "${popt_prefix}/include"; then
-			CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS}"
-		else
-			continue
-		fi
-		ac_cv_header_popt_h=""
-		unset ac_cv_header_popt_h
-		AC_CHECK_HEADER([popt.h], [popth_found=yes])
-		if test "$popth_found" = yes; then break; fi
-	done
-	CPPFLAGS="$CPPFLAGS_save"
-	if test "$popth_found" = "yes"; then
-		if test "$popt_prefix" = ""; then
-			POPT_CFLAGS=""
-		else
-			POPT_CFLAGS="-I${popt_prefix}/include"
-		fi
-	else
-		AC_MSG_ERROR([
-* Cannot autodetect popt.h
-*
-* Set POPT_CFLAGS and POPT_LIBS correctly.
-])
-	fi
-
-	# try to find options to link against popt
-	LDFLAGS_save="$LDFLAGS"
-	popt_links=no
-	for popt_prefix in /usr "" /usr/local; do
-		# We could have "/usr" and "lib64" at the beginning of the
-		# lists. Then the first tested location would
-		# incidentally be the right one on 64bit systems, and
-		# thus work around a bug in libtool on 32bit systems:
-		#
-		# 32bit libtool doesn't know about 64bit systems, and so the
-		# compilation will fail when linking a 32bit library from
-		# /usr/lib to a 64bit binary.
-		#
-		# This hack has been confirmed to workwith a
-		# 32bit Debian Sarge and 64bit Fedora Core 3 system.
-		for ldir in lib64 "" lib; do
-			popt_libdir="${popt_prefix}/${ldir}"
-			if test "${popt_libdir}" = "/"; then
-				popt_libdir=""
-			elif test -d "${popt_libdir}"; then
-				LDFLAGS="-L${popt_libdir} ${LDFLAGS}"
-			else
-				continue
-			fi
-			# Avoid caching of results
-			ac_cv_lib_popt_poptStuffArgs=""
-			unset ac_cv_lib_popt_poptStuffArgs
-			AC_CHECK_LIB([popt], [poptStuffArgs], [popt_links=yes])
-			if test "$popt_links" = yes; then break; fi
-		done
-		if test "$popt_links" = yes; then break; fi
-	done
-	LDFLAGS="$LDFLAGS_save"
-	if test "$popt_links" = "yes"; then
-		if test "$popt_libdir" = ""; then
-			POPT_LIBS="-lpopt"
-		else
-			POPT_LIBS="-L${popt_libdir} -lpopt"
-		fi
-	else
-		AC_MSG_ERROR([
-* Cannot autodetect library directory containing popt
-*
-* Set POPT_CFLAGS and POPT_LIBS correctly.
-])
-	fi
-	have_popt=yes
-elif test "x$POPT_CFLAGS" != "x" && test "x$POPT_LIBS" != "x"; then
-    # just use the user specivied option
-    popt_msg="yes (user specified)"
-    have_popt=yes
-else
-	AC_MSG_ERROR([
-* Fatal: Either set both POPT_CFLAGS and POPT_LIBS or neither.
-])
-fi
-
-AC_MSG_CHECKING([if popt is functional])
-if test "$require_popt$have_popt" = "yesno"; then
-	AC_MSG_RESULT([no, but required])
-	AC_MSG_ERROR([
-* popt library not found
-* Fatal: ${PACKAGE_NAME} (${PACKAGE_TARNAME}) requires popt
-* Please install it and/or set POPT_CFLAGS and POPT_LIBS.
-])
-fi
-AC_MSG_RESULT([${have_popt}])
-
-GP_CONFIG_MSG([use popt library], [${have_popt}])
-if test "$have_popt" = "yes"; then
-	AC_DEFINE([HAVE_POPT],[1],[whether the popt library is available])
-	GP_CONFIG_MSG([popt libs],[${POPT_LIBS}])
-	GP_CONFIG_MSG([popt cppflags],[${POPT_CFLAGS}])
-fi
-AM_CONDITIONAL([HAVE_POPT],[test "$have_popt" = "yes"])
-])dnl
-dnl
-dnl Please do not remove this:
-dnl filetype: 7595380e-eff3-49e5-90ab-e40f1d544639
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:
diff --git a/m4m/gp-packaging.m4 b/m4m/gp-packaging.m4
deleted file mode 100644
index 163ece3..0000000
--- a/m4m/gp-packaging.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-AC_DEFUN([GPKG_CHECK_RPM],
-[
-AC_ARG_WITH([rpmbuild],
-[AS_HELP_STRING([--with-rpmbuild=PATH],
-[Program to use for building RPMs])])
-
-if test -x "${with_rpmbuild}"
-then
-    RPMBUILD="${with_rpmbuild}"
-    AC_MSG_CHECKING([for rpmbuild or rpm])
-    AC_MSG_RESULT([${RPMBUILD} (from parameter)])
-else
-    AC_MSG_RESULT([using autodetection])
-    AC_CHECK_PROGS(RPMBUILD, [rpmbuild rpm], false)
-    AC_MSG_CHECKING([for rpmbuild or rpm])
-    AC_MSG_RESULT([${RPMBUILD} (autodetected)])
-fi
-AC_SUBST([RPMBUILD])
-AM_CONDITIONAL([ENABLE_RPM], [test "$RPMBUILD" != "false"])
-
-# whether libusb-devel is installed or not defines whether the RPM
-# packages we're going to build will depend on libusb and libusb-devel
-# RPM packages or not.
-AM_CONDITIONAL([RPM_LIBUSB_DEVEL], [rpm -q libusb-devel > /dev/null 2>&1])
-])
-
-AC_DEFUN([GPKG_CHECK_LINUX],
-[
-	# effective_target has to be determined in advance
-	AC_REQUIRE([AC_NEED_BYTEORDER_H])
-
-	is_linux=false
-	case "$effective_target" in 
-		*linux*)
-			is_linux=true
-			;;
-	esac
-	AM_CONDITIONAL([HAVE_LINUX], ["$is_linux"])
-
-	# required for docdir
-	# FIXME: Implicit dependency
-	# AC_REQUIRE(GP_CHECK_DOC_DIR)
-
-	AC_ARG_WITH([hotplug-doc-dir],
-	[AS_HELP_STRING([--with-hotplug-doc-dir=PATH],
-	[Where to install hotplug scripts as docs [default=autodetect]])])
-
-	AC_MSG_CHECKING([for hotplug doc dir])
-	if test "x${with_hotplug_doc_dir}" != "x"
-	then # given as parameter
-	    hotplugdocdir="${with_hotplug_doc_dir}"
-	    AC_MSG_RESULT([${hotplugdocdir} (from parameter)])
-	else # start at docdir
-	    hotplugdocdir="${docdir}/linux-hotplug"
-	    AC_MSG_RESULT([${hotplugdocdir} (default)])
-	fi
-	AC_SUBST([hotplugdocdir])
-
-	AC_ARG_WITH([hotplug-usermap-dir],
-	[AS_HELP_STRING([--with-hotplug-usermap-dir=PATH],
-	[Where to install hotplug scripts as docs [default=autodetect]])])
-
-	AC_MSG_CHECKING([for hotplug usermap dir])
-	if test "x${with_hotplug_usermap_dir}" != "x"
-	then # given as parameter
-	    hotplugusermapdir="${with_hotplug_usermap_dir}"
-	    AC_MSG_RESULT([${hotplugusermapdir} (from parameter)])
-	else # start at docdir
-	    hotplugusermapdir="${docdir}/linux-hotplug"
-	    AC_MSG_RESULT([${hotplugusermapdir} (default)])
-	fi
-
-	AC_SUBST([hotplugusermapdir])
-])
diff --git a/m4m/gp-pkg-config.m4 b/m4m/gp-pkg-config.m4
deleted file mode 100644
index 531bfe4..0000000
--- a/m4m/gp-pkg-config.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-dnl @synopsis GP_PKG_CONFIG
-dnl
-dnl If you want to set the PKG_CONFIG_PATH, best do so before
-dnl calling GP_PKG_CONFIG
-AC_DEFUN([GP_PKG_CONFIG],[
-#
-# [GP_PKG_CONFIG]
-#
-AC_ARG_VAR([PKG_CONFIG],[pkg-config package config utility])
-export PKG_CONFIG
-AC_ARG_VAR([PKG_CONFIG_PATH],[directory where pkg-config looks for *.pc files])
-export PKG_CONFIG_PATH
-
-AC_MSG_CHECKING([PKG_CONFIG_PATH])
-if test "x${PKG_CONFIG_PATH}" = "x"; then
-	AC_MSG_RESULT([empty])
-else
-	AC_MSG_RESULT([${PKG_CONFIG_PATH}])
-fi
-
-dnl AC_REQUIRE([PKG_CHECK_MODULES])
-AC_PATH_PROG([PKG_CONFIG],[pkg-config],[false])
-if test "$PKG_CONFIG" = "false"; then
-AC_MSG_ERROR([
-*** Build requires pkg-config
-***
-*** Possible solutions:
-***   - set PKG_CONFIG to where your pkg-config is located
-***   - set PATH to include the directory where pkg-config is installed
-***   - get it from http://freedesktop.org/software/pkgconfig/ and install it
-])
-fi
-])dnl
-
-dnl Please do not remove this:
-dnl filetype: d87b877b-80ec-447c-b042-21ec4a27c6f0
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:
diff --git a/m4m/gp-references.m4 b/m4m/gp-references.m4
deleted file mode 100644
index fca98f1..0000000
--- a/m4m/gp-references.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-dnl
-dnl Define external references
-dnl
-dnl Define once, use many times. 
-dnl No more URLs and Mail addresses in translated strings and stuff.
-dnl
-
-AC_DEFUN([GP_REF],[
-AC_SUBST([$1],["$2"])
-AC_DEFINE_UNQUOTED([$1],["$2"],[$3])
-])
-
-AC_DEFUN([GP_REFERENCES],
-[
-
-GP_REF(	[URL_GPHOTO_HOME], 
-	[http://www.gphoto.org/], 
-	[gphoto project home page])dnl
-
-GP_REF(	[URL_GPHOTO_PROJECT], 
-	[http://sourceforge.net/projects/gphoto], 
-	[gphoto sourceforge project page])
-
-GP_REF(	[URL_DIGICAM_LIST],
-	[http://www.teaser.fr/~hfiguiere/linux/digicam.html],
-	[camera list with support status])
-
-GP_REF(	[URL_JPHOTO_HOME],
-	[http://jphoto.sourceforge.net/],
-	[jphoto home page])
-
-GP_REF(	[URL_USB_MASSSTORAGE],
-	[http://www.linux-usb.org/USB-guide/x498.html],
- 	[information about using USB mass storage])
-
-GP_REF(	[MAIL_GPHOTO_DEVEL],
-	[<gphoto-devel@lists.sourceforge.net>],
-	[gphoto development mailing list])
-
-GP_REF(	[MAIL_GPHOTO_USER],
-	[<gphoto-user@lists.sourceforge.net>],
-	[gphoto user mailing list])
-
-GP_REF(	[MAIL_GPHOTO_TRANSLATION],
-	[<gphoto-translation@lists.sourceforge.net>],
-	[gphoto translation mailing list])
-
-])
diff --git a/m4m/stdint.m4 b/m4m/stdint.m4
index f95b28c..31ad933 100644
--- a/m4m/stdint.m4
+++ b/m4m/stdint.m4
@@ -1,15 +1,7 @@
 dnl AC_NEED_STDINT_H ( HEADER-TO-GENERATE )
-dnl Copyright 2001-2002 by Dan Fandrich <dan@coneharvesters.com>
-dnl This file may be copied and used freely without restrictions.  No warranty
-dnl is expressed or implied.
 dnl
 dnl Look for a header file that defines size-specific integer types like the
 dnl ones recommended to be in stdint.h in the C99 standard (e.g. uint32_t).
-dnl This is a dumbed-down version of the macro of the same name in the file
-dnl ac_need_stdint_h.m4 which is part of the ac-archive, available at
-dnl <URL:http://ac-archive.sourceforge.net/> (also, another macro
-dnl AC_CREATE_STDINT_H by the same author).  This version is not as smart,
-dnl but works on older autoconf versions and has a different license.
 
 dnl AX_CHECK_DEFINED_TYPE ( TYPE, FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND )
 dnl This is similar to _AC_CHECK_TYPE_NEW (a.k.a. new syntax version of
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
deleted file mode 100644
index 067111d..0000000
--- a/packaging/baselibs.conf
+++ /dev/null
@@ -1 +0,0 @@
-libexif
diff --git a/packaging/libexif.changes b/packaging/libexif.changes
deleted file mode 100644
index 430c576..0000000
--- a/packaging/libexif.changes
+++ /dev/null
@@ -1,6 +0,0 @@
-* Thu Jun 20 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.095854@235995e
-- add samsung device support
-
-* Sat May 11 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130509.181038@c5bd43f
-- Set license using %license
-
diff --git a/packaging/libexif.spec b/packaging/libexif.spec
index 6a92be7..916514e 100644
--- a/packaging/libexif.spec
+++ b/packaging/libexif.spec
@@ -1,13 +1,11 @@
 Name:           libexif
-Version:        0.6.21
-Release:        4
+Version:        0.6.22
+Release:        0
 License:        LGPL-2.1
 Summary:        An EXIF Tag Parsing Library for Digital Cameras
-Url:            http://libexif.sourceforge.net
+Url:            https://libexif.github.io
 Group:          System/Libraries
 Source:         %{name}-%{version}.tar.bz2
-Source1:        baselibs.conf
-Source1001: 	   libexif.manifest
 Requires(post):  /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
@@ -28,7 +26,6 @@ digital cameras.
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
 
 %build
 sh ./autogen.sh
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 0000000..8d7a12b
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1,17 @@
+ChangeLog
+*.gmo
+libexif*.pot
+Makevars
+Makevars.template
+Makefile
+Makefile.in
+Makefile.in.in
+POTFILES
+Rules-quot
+boldquot.sed
+en@boldquot.header
+en@quot.header
+insert-header.sin
+quot.sed
+remove-potcdate.sin
+stamp-po
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index 024d47a..0000000
--- a/po/Makevars
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = libexif-12
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Lutz Mueller and others
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = libexif-devel@lists.sourceforge.net
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
diff --git a/po/Rules-quot b/po/Rules-quot
deleted file mode 100644
index 9c2a995..0000000
--- a/po/Rules-quot
+++ /dev/null
@@ -1,47 +0,0 @@
-# Special Makefile rules for English message catalogs with quotation marks.
-
-DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
-
-.SUFFIXES: .insert-header .po-update-en
-
-en@quot.po-create:
-	$(MAKE) en@quot.po-update
-en@boldquot.po-create:
-	$(MAKE) en@boldquot.po-update
-
-en@quot.po-update: en@quot.po-update-en
-en@boldquot.po-update: en@boldquot.po-update-en
-
-.insert-header.po-update-en:
-	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	ll=`echo $$lang | sed -e 's/@.*//'`; \
-	LC_ALL=C; export LC_ALL; \
-	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "creation of $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-en@quot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
-
-en@boldquot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
-
-mostlyclean: mostlyclean-quot
-mostlyclean-quot:
-	rm -f *.insert-header
diff --git a/po/be.gmo b/po/be.gmo
deleted file mode 100644
index ce40a64..0000000
--- a/po/be.gmo
+++ /dev/null
diff --git a/po/be.po b/po/be.po
index a4bba0c..e015020 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
 "PO-Revision-Date: 2009-11-25 15:18+0000\n"
 "Last-Translator: Iryna Nikanchuk <Unknown>\n"
 "Language-Team: Belarusian <be@li.org>\n"
@@ -40,7 +40,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -51,14 +51,14 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -87,15 +87,15 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -127,8 +127,8 @@ msgstr ""
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -148,8 +148,7 @@ msgstr ""
 msgid "Auto, red-eye reduction"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr ""
 
@@ -271,9 +270,8 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -285,7 +283,7 @@ msgid "Manual"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -314,7 +312,7 @@ msgid "Sepia"
 msgstr "С�пі�"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -341,8 +339,7 @@ msgstr ""
 msgid "Neutral"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr ""
 
@@ -424,7 +421,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr ""
@@ -437,8 +434,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr ""
 
@@ -488,11 +485,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Дапомна"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr ""
 
@@ -500,11 +497,11 @@ msgstr ""
 msgid "Evaluative"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr ""
 
@@ -516,7 +513,7 @@ msgstr ""
 msgid "Very close"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr ""
 
@@ -653,9 +650,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -674,9 +670,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -927,9 +922,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -1030,32 +1024,32 @@ msgid "Sunny"
 msgstr "Сонечна"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Воблачна"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "У�пышка"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr ""
@@ -1077,7 +1071,7 @@ msgid "PC set 3"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr ""
@@ -1090,7 +1084,7 @@ msgstr ""
 msgid "Custom 2"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1155,22 +1149,22 @@ msgid "Rotated by software"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Злева направа"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Справа налева"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Зверху ўніз"
 
@@ -1180,7 +1174,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1198,9 +1192,8 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1255,37 +1248,44 @@ msgstr ""
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f мм"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u мм"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr ""
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Фоку�на� адлегла�ьць"
 
@@ -1293,8 +1293,7 @@ msgstr "Фоку�на� адлегла�ьць"
 msgid "Settings (Second Part)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Панарама"
@@ -1349,8 +1348,8 @@ msgstr "Яка�ьць"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr ""
 
@@ -1361,9 +1360,8 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr ""
 
@@ -1382,25 +1380,24 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Кантра�т"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "�а�ычана�ьць"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1410,7 +1407,7 @@ msgstr ""
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "Р�жым вым�р�ньн�"
@@ -1423,7 +1420,7 @@ msgstr ""
 msgid "AF Point"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr ""
 
@@ -1530,7 +1527,7 @@ msgid "Exposure Compensation"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1570,11 +1567,12 @@ msgstr ""
 msgid "Focus Distance Lower"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr ""
@@ -1623,45 +1621,45 @@ msgstr ""
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr ""
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr ""
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr ""
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr ""
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr ""
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 msgstr ""
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr ""
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1706,195 +1704,193 @@ msgid ""
 "fixed."
 msgstr ""
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr ""
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr ""
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr ""
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr ""
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr ""
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Палітра"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr ""
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr ""
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr ""
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr ""
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr ""
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1902,178 +1898,178 @@ msgstr ""
 msgid "Hard"
 msgstr ""
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr ""
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr ""
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr ""
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr ""
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Узор"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr ""
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr ""
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr ""
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr ""
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr ""
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr ""
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Добрае надвор'е"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Воблачнае надвор'е"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr ""
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr ""
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr ""
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr ""
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Сантым�тар"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "�м"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr ""
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr ""
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "�пертура"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr ""
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr ""
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr ""
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr ""
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr ""
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "Дзе�ньне"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr ""
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr ""
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr ""
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2081,305 +2077,303 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr ""
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr ""
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr ""
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr ""
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr ""
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr ""
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr ""
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr ""
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr ""
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr ""
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr ""
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr ""
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr ""
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr ""
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr ""
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr ""
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr ""
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Унутрана� памылка (нев�домае знач�ньне %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr ""
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr ""
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr ""
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr ""
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr ""
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr ""
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr ""
@@ -2465,11 +2459,11 @@ msgstr ""
 msgid "The data provided does not follow the specification."
 msgstr ""
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr ""
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2477,11 +2471,11 @@ msgid ""
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr ""
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2489,25 +2483,25 @@ msgid ""
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr ""
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Шырата"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2516,21 +2510,21 @@ msgid ""
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Даўгата"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2539,44 +2533,44 @@ msgid ""
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr ""
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr ""
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2585,101 +2579,101 @@ msgid ""
 "the tag shall be set to NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr ""
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr ""
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr ""
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr ""
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr ""
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr ""
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr ""
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr ""
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2687,22 +2681,22 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 ""
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2712,21 +2706,21 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2736,49 +2730,49 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2786,70 +2780,80 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr ""
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr ""
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr ""
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr ""
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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 ""
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr ""
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr ""
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2857,40 +2861,40 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Сьці�каньне"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 ""
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr ""
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr ""
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "�азва дакум�нта"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "�пі�аньне вы�вы"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2898,33 +2902,33 @@ msgid ""
 "is to be used."
 msgstr ""
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Вытворца"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 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 ""
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Мад�ль"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 ""
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr ""
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2932,30 +2936,30 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "�апрамак"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr ""
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 ""
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr ""
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -2963,74 +2967,74 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr ""
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 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 ""
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr ""
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 ""
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Праграмнае заб��ьпечаньне"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3038,21 +3042,21 @@ msgid ""
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Дата й ча�"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 msgstr ""
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Выканаўца"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3060,51 +3064,51 @@ msgid ""
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr ""
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr ""
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr ""
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr ""
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3113,11 +3117,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr ""
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3126,21 +3130,21 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr ""
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3155,11 +3159,11 @@ msgid ""
 "both centered and co-sited positioning."
 msgstr ""
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr ""
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3168,34 +3172,34 @@ msgid ""
 "Interoperability these conditions."
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr ""
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr ""
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 ""
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Узровень батар�і"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "�ўтар�кі� правы"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3214,122 +3218,118 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr ""
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr ""
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr ""
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr ""
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr ""
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr ""
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr ""
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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 ""
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr "Канфігурацы� кампан�нтаў"
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3339,120 +3339,120 @@ msgid ""
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Хутка�ьць затвора"
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Ярка�ьць"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 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 ""
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr ""
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr ""
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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 ""
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr ""
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr ""
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr ""
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr ""
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr ""
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 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 ""
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr ""
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr "Заўвага �тваральніка"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "Кам�нтар кары�тальніка"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3474,86 +3474,86 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr ""
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr ""
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr ""
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr ""
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3562,11 +3562,11 @@ msgid ""
 "be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3574,11 +3574,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3588,11 +3588,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3617,11 +3617,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3630,62 +3630,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr ""
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr ""
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3694,176 +3694,176 @@ msgid ""
 "number."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr ""
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr ""
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr ""
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr ""
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr ""
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr ""
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr ""
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr "Гама"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4041,17 +4041,11 @@ msgstr ""
 msgid "Wide2 (400%)"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr "%2.2f мм"
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr ""
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr ""
@@ -4477,117 +4471,117 @@ msgstr "15 кадраў/��к"
 msgid "20 frames/sec"
 msgstr "20 кадраў/��к"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f м�траў"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Унутрана� памылка (нев�домае знач�ньне %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "�ев�домае знач�ньне %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr ""
@@ -4689,8 +4683,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr ""
 
@@ -4862,13 +4855,11 @@ msgstr ""
 msgid "White Balance Setting"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr ""
 
@@ -5216,11 +5207,21 @@ msgstr ""
 msgid "Digital filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr "Унутрана� памылка (нев�домае знач�ньне %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Унутрана� памылка (нев�домае знач�ньне %hu %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Унутрана� памылка (нев�домае знач�ньне %i %i)"
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Унутрана� памылка (нев�домае знач�ньне %hi %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
diff --git a/po/boldquot.sed b/po/boldquot.sed
deleted file mode 100644
index 4b937aa..0000000
--- a/po/boldquot.sed
+++ /dev/null
@@ -1,10 +0,0 @@
-s/"\([^"]*\)"/“\1�/g
-s/`\([^`']*\)'/‘\1’/g
-s/ '\([^`']*\)' / ‘\1’ /g
-s/ '\([^`']*\)'$/ ‘\1’/g
-s/^'\([^`']*\)' /‘\1’ /g
-s/“�/""/g
-s/“/“/g
-s/�/�/g
-s/‘/‘/g
-s/’/’/g
diff --git a/po/bs.gmo b/po/bs.gmo
deleted file mode 100644
index 6c1f5f4..0000000
--- a/po/bs.gmo
+++ /dev/null
diff --git a/po/bs.po b/po/bs.po
index 34509c1..c9ea85d 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2011-10-14 14:10+0000\n"
-"Last-Translator: Toni Antunović <Unknown>\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
+"PO-Revision-Date: 2016-06-23 10:30+0000\n"
+"Last-Translator: Rockworld <sumoisrock@gmail.com>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 06:52+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2016-09-01 20:32+0000\n"
+"X-Generator: Launchpad (build 18179)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -40,7 +40,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Neispravan broj elemenata (%i, o�ekivao sam %i ili %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -51,14 +51,14 @@ msgstr "Makro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -87,15 +87,15 @@ msgstr "Super fino"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -127,8 +127,8 @@ msgstr "Automatski"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -148,8 +148,7 @@ msgstr "Sporo usklađivanje"
 msgid "Auto, red-eye reduction"
 msgstr "Automatski, redukcija crvenog oka"
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr "Uklju�eno, redukcija crvenog oka"
 
@@ -271,9 +270,8 @@ msgstr "Potpuno automatski"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -285,7 +283,7 @@ msgid "Manual"
 msgstr "Ru�no"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -314,7 +312,7 @@ msgid "Sepia"
 msgstr "Sepia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -341,8 +339,7 @@ msgstr "Živopisno"
 msgid "Neutral"
 msgstr "Neutralno"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "Isklju�en blic"
 
@@ -424,7 +421,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Ništa"
@@ -437,8 +434,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "Ostalo"
 
@@ -488,11 +485,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Podrazumijevano"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "Mjesto"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Prosjek"
 
@@ -500,11 +497,11 @@ msgstr "Prosjek"
 msgid "Evaluative"
 msgstr "Procjena"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Djelimi�no"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr "Prosje�na težina centra"
 
@@ -516,7 +513,7 @@ msgstr "Nepoznato"
 msgid "Very close"
 msgstr "Veoma blizu"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Blizu"
 
@@ -653,9 +650,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -674,9 +670,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -927,9 +922,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -1030,32 +1024,32 @@ msgid "Sunny"
 msgstr "Sun�ano"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Obla�no"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Volfram"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Flurascentno"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Blic"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Sjenka"
@@ -1077,7 +1071,7 @@ msgid "PC set 3"
 msgstr "PC skup 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Dnevno fluroscentno"
@@ -1090,7 +1084,7 @@ msgstr "Prilagođeno 1"
 msgid "Custom 2"
 msgstr "Prilagođeno 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1155,22 +1149,22 @@ msgid "Rotated by software"
 msgstr "Okrenuće program"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Lijevo na desno"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Desno na lijevo"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Odozdo nagore"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Odozgo nadolje"
 
@@ -1180,7 +1174,7 @@ msgstr "2x2 matrica (u smjeru kretanja sata)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1198,9 +1192,8 @@ msgstr "Najniže"
 msgid "Highest"
 msgstr "Najviše"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1255,37 +1248,44 @@ msgstr "Monohromo"
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i bajtova nepoznatih podataka"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr "Postavke (prvi dio)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Žižna daljina"
 
@@ -1293,8 +1293,7 @@ msgstr "Žižna daljina"
 msgid "Settings (Second Part)"
 msgstr "Postavke (drug dio)"
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1349,8 +1348,8 @@ msgstr "Kvalitet"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "Mod blica"
 
@@ -1361,9 +1360,8 @@ msgstr "Režim upravljanja"
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "Žižni mod"
 
@@ -1382,25 +1380,24 @@ msgstr "Režim za lako slikanje"
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "Digitalno uvećanje"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Suprotnost"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Zasićenost"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1410,7 +1407,7 @@ msgstr "OÅ¡trina"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "Mod mjerenja"
@@ -1423,7 +1420,7 @@ msgstr "Domet fokusa"
 msgid "AF Point"
 msgstr "AF ta�ka"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Mod osvjetljenja"
 
@@ -1530,7 +1527,7 @@ msgid "Exposure Compensation"
 msgstr "Kompenzacija izloženosti"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1570,11 +1567,12 @@ msgstr "Gornja udaljenost fokusa"
 msgid "Focus Distance Lower"
 msgstr "Donja udaljenost fokusa"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "FBroj"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "F-Broj"
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Vrijeme osvjetljenja"
@@ -1623,35 +1621,35 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr "Podaci su premali da bih dozvolio EXIF podatke."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr "Nisam pronašao EXIF oznaku."
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr "EXIF zaglavlje nije pronađeno."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr "Nepoznato Å¡ifrovanje."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr "Zanemari nepozante oznake."
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Zanemari nepozante oznake dok u�itavaš EXIF podatke."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr "Uskladi sa tehni�kim podacima"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
@@ -1659,11 +1657,11 @@ msgstr ""
 "Dodaj, ispravi ili ukloni unose ne bi li dobio EXIF podatke u skladu sa "
 "tehni�kim podacima."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr "Ne mijenjaj stvarala�ku bilješku"
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1722,196 +1720,194 @@ msgstr ""
 "Oznaka 'UserCommenr' nije po�injala s identifikatorom formata. Ovo je "
 "popravljeno."
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i bajta nedefiniranih podataka"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i bajta nepodržanog tipa podataka"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 "Etiketa '%s' sadrži podatke u neispravnom obliku ( '%s', a traži se '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr "Etiketa  '%s sadrži neispravan broj elemenata (%i, umjesto %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr "Razdijeljeni format"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr "Planarni format"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Neodređeno"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "Jedno�ipni senzor oblasti boje"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr "Dvo�ipni senzor oblasti boje"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr "Tro�ipni senzor oblasti boje"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr "Senzor sekvencijalnog prostora boja"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr "Prostrani senzor"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr "Senzor linearnog prostora boja"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Gore - lijevo"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Gore - desno"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Dolje - desno"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Dolje - lijevo"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr "Lijevo-gore"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr "Desno-gore"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr "Desno-dolje"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr "Lijevo-dolje"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr "Centrirano"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr "Co-sited"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr "Obrnuti mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr "Normalni mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Paleta"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "Normalni postupak"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "Prilagođeni postupak"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr "Automatsko osvjetljenje"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Ru�no osvjetljenje"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr "Automatska potpora"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr "Automatska ravnoteža bele"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr "Ru�no uravnoteživanje bele"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr "Povećaj niske pragove"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr "Visoki skok"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr "Smanji niske pragove"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr "Smanji visoke pragove"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "Mala zasićenost"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Velika zasićenost"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "Meko"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1919,178 +1915,178 @@ msgstr "Meko"
 msgid "Hard"
 msgstr "Teško"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr "Avg"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr "Središnja težina"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr "VIÅ¡estruka mjesta"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Å ablon"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "Nesabijeno"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "LZW sažimanje"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "JPEG sažimanje"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr "Ispumpati/ZIP sažimanje"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr "PackBits sažimanje"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr "Volframsko užareno svjetlo"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Lijepo vrijeme"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Obla�no vrijeme"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Dnevno bijelo fluroscentno"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr "Hladno bijelo fluroscentno"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "Bijelo fluroscentno"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "Standardno svjetlo A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "Standardno svjetlo V"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "Standardno svjetlo S"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr "ISO studio volfram"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "In�"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "in"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Centimetar"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "Normalni program"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr "Prednost otvora"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "Otvor"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr "Prednost zatvara�a"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr "Zatvara�"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr "Stvarala�ki program (sklono dubini polja)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr "Stvaral�ko"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr "Stvarala�ki program (sklono brzom zatvaranju)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "Akcija"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "Poptretni mod (za slikanje izbliza kod kojih pozadina nije u žiži)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Pejzažni mod (za pejzažne fotografije kod kojih je pozadina u žiži)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "Blic nije bljesnuo"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr "Bez blica"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr "Fleš okinut"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2098,80 +2094,80 @@ msgstr "Fleš okinut"
 msgid "Yes"
 msgstr "Da"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr "Strob povratno svjetlo nije detektovano"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr "Bez stroba"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr "Detektovan odbljesak blica"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr "Sa strobe"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr "Fleš okinut, obavezan fleš mod"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr "Fleš okinut, obavezan fleš mod, povratno svjetlo nije detektovano"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr "Fleš okinut, obavezan fleš na�in, povratno svjetlo detektovano"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "Fleš nije okinuo, obavezan fleš na�in"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr "Fleš nije okinuo, automatski na�in"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr "Fleš okinut, automatski na�in"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr "Fleš okinut, automatski na�in, povratno svjetlo nije detektovano"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr "Fleš okinut, povratno svjetlo detektovano"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr "Nema blic"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr "Fleš okinut, redukcija efekta crvenih o�iju uklju�ena"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
 "Fleš okinut, redukcija efekta crvenih o�iju uklju�ena, povratno svjetlo nije "
 "detektovano"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
 "Fleš okinut, redukcija efekta crvenih o�iju uklju�ena, povratno svjetlo "
 "detektovano"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
 "Fleš okinut, obavezan fleš na�in, redukcija efekta crvenih o�iju uklju�ena"
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
@@ -2179,7 +2175,7 @@ msgstr ""
 "Fleš okinut, obavezan fleš na�in, redukcija efekta crvenih o�iju uklju�ena, "
 "povratno svjetlo nije detektovano"
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
@@ -2187,234 +2183,229 @@ msgstr ""
 "Fleš okinut, obavezan fleš na�in, uklju�ena redukcija efekta crvenih o�iju, "
 "povratno svjetlo detektovano"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr ""
 "Fleš nije okinuo, automatski na�in, uklju�ena redukcija efekta crvenih o�iju"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr ""
 "Fleš je okinuo, automatski na�in, uklju�ena redukcija efekta crvenih o�iju"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 "Fleš je okinuo, automatski na�in, povratno svjetlo nije detektovano, "
 "redukcija efekta crvenih o�iju uklju�ena"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 "Fleš je okinuo, automatski na�in, povratno svjetlo nije detektovano, "
 "redukcija efekta crvenih o�iju uklju�ena"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr "Pogleda izbliza"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr "Udaljen pogled"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr "Udaljeno"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr "Nepodešeno"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Neispravna veli�ina unosa (%i, traži se %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr "Nepodržan UNICODE string"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr "Nepodržan JIS string"
 
-#: libexif/exif-entry.c:935
-#, fuzzy
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
-"Etiketa 'Komentar korisnika' je prošireno na najmanje 8 bajtova ne bi "
-"ispoštovali specifikaciju."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Bajt na poziciji %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr "Nepoznata verzija Exif"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif verzija %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix verzija 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix verzija 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr "Nepoznata verzija FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[Ništa]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "(Fotograf)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Urednik)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35 odgovara: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " sec."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d sec.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d sec.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Unutrašnja greška (nepoznata vrijednost %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr "Rezervisano"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr "Direktno fotografirano"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "U okviru razdaljine %i of (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "U okviru pravougaonika (Å¡irina %i, visina %i) oko (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Neo�ekivan broj elemena (%li, traži se 2, 3, ili 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr "Nivo mora"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr "Referenca u odnosu na nivo mora"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr "Nepoznata vrijednost %i"
@@ -2500,11 +2491,11 @@ msgstr "Oštećeni podaci"
 msgid "The data provided does not follow the specification."
 msgstr "Proslijeđeni podaci nisu u skladu sa tehni�kim podacima."
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr "GPS oznaka verzije"
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2516,11 +2507,11 @@ msgstr ""
 "<GPSVersionID> se izražava u bajtovima, za razliku od etikete <ExifVersion>."
 "Ako je verzija 2.0.0.0, vrijednost etikete je 02000000.H)."
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr "Indeks interoperabilnosti"
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2532,11 +2523,11 @@ msgstr ""
 "terminacioni kod (NULL). Pogledajte zasebno poglavlje za preporu�ena pravila "
 "interoperabilnosti Exif standarda (ExifR98) za ostale oznake."
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr "Sjeverna ili južna geografska dužina"
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -2544,15 +2535,15 @@ msgstr ""
 "Ozna�ava sjevernu ili južnu geogr. širinu. ASCII slovo 'N' ozna�ava "
 "sjevernu, a 'S' južnu širinu.."
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr "Interoperabilna verzija"
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Geografska Å¡irina"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2566,11 +2557,11 @@ msgstr ""
 "minutima, i minuti su, recimo, izraženi u dvije decimale, oblik je dd/1,"
 "mmmm/100,0/1."
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr "Isto�na ili zapadna geogr. dužina"
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -2578,11 +2569,11 @@ msgstr ""
 "Ozna�ava isto�nu ili zapadnu geogr. dužinu.  ASCII slovo 'E' je za isto�nu, "
 "a 'W' za zapadnu dužinu."
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Geografska dužina"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2596,29 +2587,29 @@ msgstr ""
 "minutima, i minuti su, recimo, izraženi u dvije decimale, oblik je dd/1,"
 "mmmm/100,0/1."
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr "Refer"
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 "Ozna�ava visinu u odnosu na obilježiva� visine. Ako se mjeri u odnosu na "
 "nivo mora, i visina je iznad nivoa mora, postavlja se 0. Ako je visina ispod "
 "nivoa mora, postavlja se 1 i na visinu se gleda kao na apsolutnu vrijednost "
-"u etiketi GSPAltitude. Jedinica su metri. Ova etiketa je tipa BYTE, za "
+"u etiketi GPSAltitude. Jedinica su metri. Ova etiketa je tipa BYTE, za "
 "razliku od drugih etiketa upućiva�a."
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr "Visina"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -2626,11 +2617,11 @@ msgstr ""
 "Ozna�ava visinu u odnosu na upućiva� u GPSAltitudeRef. Visina se izražava "
 "kao racionalni broj. Jedinica su metri."
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr "GPS Vrijeme(Atomski sat)"
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
@@ -2639,11 +2630,11 @@ msgstr ""
 "je izražena kao tri racionalne vrijednosti koje predstavljaju sate, minute i "
 "sekunde."
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr "GPS Sateliti"
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2657,11 +2648,11 @@ msgstr ""
 "specificiran. Ako je GPS  prijemnik nesposoban za mjerenje, vrijednost "
 "oznake će biti postavljena na NULL."
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr "GPS prijemni status"
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 "
@@ -2670,11 +2661,11 @@ msgstr ""
 "Pokazuje status GPS prijemnika kada je slika snimljena. 'A' zna�i mjerenje "
 "je u tijeku, a 'V' zna�i da je mjerenje interoperabilno."
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr "GPS na�in mjerenja"
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
@@ -2682,11 +2673,11 @@ msgstr ""
 "Pokazuje GPS na�in mjerenja. '2' znali dvodimenzionalna mjerenja, a '3' "
 "zna�i trodimenzionalna mjerenja su u tijeku."
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr "Preciznost mjerenja"
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
@@ -2696,11 +2687,11 @@ msgstr ""
 "spremljena tijekom dvodimenzionalnih mjerenja, a PDOP tijekom "
 "trodimenzionalnih mjerenja."
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr "Jedinica brzine"
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
@@ -2708,19 +2699,19 @@ msgstr ""
 "Pokazuje jedinicu korištenu da se izrazi brzina pokretanja GPS  prijemnika. "
 "'K', 'M' i 'N' predstavljaju kilometre na sat, milje na sat i �vorove."
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr "Brzina GPS prijemnika"
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr "Pokazuje brzinu kretanja GPS prijemnika"
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr "Referentna vrijednost za smjer kretanja"
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
@@ -2728,11 +2719,11 @@ msgstr ""
 "Pokazuje referentnu vrijednost za zadavanje smjera kretanja GPS prijemniku. "
 "'T' ozna�ava pravi smjer i 'M' magnetni smjer."
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr "Smjer kretanja"
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
@@ -2740,11 +2731,11 @@ msgstr ""
 "Pokazuje smjer kretanja GPS  prijemnika. Raspon vrijednosti je od 0.00 do "
 "359.99"
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr "Referentna vrijednost za smjer GPS slike"
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2752,11 +2743,11 @@ msgstr ""
 "Pokazuje referentnu vrijednost za zadavanje smjera slike kada je uslikana. "
 "'T' ozna�ava pravi smjer, a 'M' magnetni smjer."
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr "GPS pravac slike"
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
@@ -2764,11 +2755,11 @@ msgstr ""
 "Pokazuje smjer slike kada je uslikana. Raspon vrijednosti je od 0.00 do "
 "359.99"
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr "Podaci geodetskih istraživanja korišteni"
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2780,11 +2771,11 @@ msgstr ""
 "'TOKYO' ili 'WGS-84'. Ako je GPS info oznaka snimljena, preporu�uje se da se "
 "ova oznaka snimi."
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr "Referentna vrijednost za geografsku Å¡irinu destinacije"
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 "
@@ -2794,11 +2785,11 @@ msgstr ""
 "ASCII vrijednost 'N' pokazuje sjevernu geografsku širinu, a 'S' južnu "
 "geografsku Å¡irinu."
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr "Geografska širina odredišta"
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2814,11 +2805,11 @@ msgstr ""
 "minute korištene i, na primjer, frakcije u minutama su dane do dva decimalna "
 "mjesta, format bi bio dd/1.mmmmm/100,0/1."
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr "Referentna vrijednost za geografsku dužinu"
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
@@ -2826,11 +2817,11 @@ msgstr ""
 "Pokazuje da li je geografska dužina destinacijske ta�ke isto�na ili zapadna. "
 "ASCII 'E' pokazuje isto�nu geografsku dužinu, a 'W' zapadnu."
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr "Geografska dužina odredišta"
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2846,11 +2837,11 @@ msgstr ""
 "stepeni i minute korištene i, na primjer, frakcije minuta su dane sa dva "
 "decimalna mjesta, format će biti ddd/1,mmmm/100,0/1."
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr "Referentna vrijednost za smjer destinacije."
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2858,42 +2849,39 @@ msgstr ""
 "Pokazuje referentnu vrijednost za zadavanje smjera destinacijskoj ta�ki. 'T' "
 "ozna�ava pravi smjer, a 'M' magnetni smjer."
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr "Smjer destinacije"
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr "Pokazuje smjer destinacije. Raspon vrijednosti je od 0.00 do 359.99."
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr "Referentna vrijednost za udaljenost od destinacije"
 
-#: libexif/exif-tag.c:194
-#, fuzzy
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
-"Pokazuje jedinicu korištenu za izražavanje udaljenosti destinacije. 'K', 'M' "
-"i 'N' predstavljaju kilometre, milje i �vorove."
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr "Udaljenost do destinacije"
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr "Pokazuje udaljenost do destinacije"
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr "Ime GPS procesorske metode"
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2904,11 +2892,11 @@ msgstr ""
 "bajt predstavlja tip kodiranja karakteras koji je korišten, i ovo je praćeno "
 "imenom metode. Budući da tip nije ASCII, NULL završetak nije neophodan"
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr "Ime GPS podru�ja"
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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 "
@@ -2918,11 +2906,11 @@ msgstr ""
 "koji je korišten, a ovo je praćeno imenom GPS podru�ja. Budući da tip nije "
 "ASCII, NULL terminacija nije neophodna."
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr "GPS datum"
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
@@ -2931,29 +2919,39 @@ msgstr ""
 "String znakova koji sprema datum i vrijeme relativno u odnosu na UTC. Format "
 "je \"YYYY:MM:DD\". Dužina stringa je 11 bajta uklju�ujući NULL."
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr "GPS diferencijalna korekcija"
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 "Ukazivanje na bilo koju druk�iju ispravku koja je korištena na GPS prijemnik"
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "Nova podvrsta datoteke"
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "Opšta naznaka vrste podataka koja se nalazi u ovom poddatoteci."
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Å irina slike"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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."
@@ -2961,11 +2959,11 @@ msgstr ""
 "Broj kolona u podacima slike, jednak broju piksela po redu. U JPEG sažetim "
 "podacima, JPEG etiketa se koristi umjesto ove etikete."
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr "Dužina slike"
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -2973,11 +2971,11 @@ msgstr ""
 "Broj redova podataka slike. U JPEG sažetim podacima, JPEG etiketa se koristi "
 "umjesto ove etikete."
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr "Bitova po uzorku"
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2988,11 +2986,11 @@ msgstr ""
 "bita, tako da je vrijednost etikete 8. Pogledajte <SamplesPerPixel>. Kod "
 "JPEG sažimanja, JPEG obeliživa� se koristi umjesto ove etikete."
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Sažimanje"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 "
@@ -3002,11 +3000,11 @@ msgstr ""
 "sažeta, oznaka nije neophodna i izostavljena je. Kada sli�ice za pregled "
 "koriste JPEG sažimanje, vrijednost etikete je 6."
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr "Fotometrijsko predstavljanje"
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -3014,19 +3012,19 @@ msgstr ""
 "Sastav piksela. Kod JPEG sažetih podataka, JPEG obilježiva� se koristi "
 "umjesto ove etikete."
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr "Redoslijed ispunjavanja"
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Ime dokumenta"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "Opis slike"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -3038,11 +3036,11 @@ msgstr ""
 "Ako je potrebno da se oni koriste, kuca se u Exif Private etiketi "
 "<UserComment>."
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Proizvođa�"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -3052,11 +3050,11 @@ msgstr ""
 "digitajzer ili druge opreme koja se koristi za stvaranje slika. Ako je polje "
 "prazno, smatra se da je nepoznato."
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Model"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 "
@@ -3066,11 +3064,11 @@ msgstr ""
 "video digitajzer ili druge opreme koja se koristi za stvaranje slika. Ako je "
 "polje prazno, smatra se da je nepoznato."
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr "Å tampane trake"
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -3081,19 +3079,19 @@ msgstr ""
 "vrijednost manja od 64 kilobajta. Kod JPEG sažetih podataka, oznaka nije "
 "neophodna i izostavljena je. Pogledajte i <RowsPerStrip> i <StripByteCounts>"
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "Položaj"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "Položaj slike u smislu redova i kolona."
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr "Uzoraka po pikselu"
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 "
@@ -3103,11 +3101,11 @@ msgstr ""
 "slike, vrijednost etikete je 3. Kod JPEG sažetih podataka, JPEG obilježiva� "
 "se koristi umjesto ove etikete."
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr "Redova po traci"
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -3118,11 +3116,11 @@ msgstr ""
 "JPEG sažetih podataka, oznaka nije neophodna i izostavljena je. Pogledajte i "
 "<StripOffsets> i <StripByteCounts>"
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr "Broj bajtova na traci"
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
@@ -3130,11 +3128,11 @@ msgstr ""
 "Ukupan broj bajtova za svaku traku. Kod JPEG sažetih podataka, oznaka nije "
 "neophodna i izostavljena je."
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr "X-Rezolucija"
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -3142,11 +3140,11 @@ msgstr ""
 "Broj piksela po <ResolutionUnit> u <ImageWidth> pravcu. Ako je nepoznata "
 "rezolucija, 72 [dpi] je postavljeno."
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr "Y-Rezolucija"
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -3154,11 +3152,11 @@ msgstr ""
 "Broj piksela po <ResolutionUnit> u <ImageWidth> pravcu. Postavlja se ista "
 "vrijednost kao u <XResolution>."
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr "Raspored Planara"
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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. "
@@ -3169,11 +3167,11 @@ msgstr ""
 "ove oznake. Ako ovo polje ne postoji, koristi se TIFF vrijednosti 1 "
 "(raštrkano)."
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr "Jedinica rezolucije"
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -3183,11 +3181,11 @@ msgstr ""
 "za <XResolution> i <YResolution>. Ako je nepoznata rezolucija slike, "
 "postavlja se 2 (in�a)."
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr "Funkcija prijenosa"
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 "
@@ -3196,11 +3194,11 @@ msgstr ""
 "Funkcija prijenosa za sliku, opisana u tabularnom stilu. Obi�no ova oznaka "
 "niej neophodna, obzirom da je paleta boja ozna�ena pomoću <ColorSpace>."
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Softver"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3212,11 +3210,11 @@ msgstr ""
 "preporu�ljivo da bude sli�no primjeru koji je prikazan dolje. Ako se polje "
 "ostavi prazno, smatra se da je nepoznato."
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Datum i vrijeme"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
@@ -3224,11 +3222,11 @@ msgstr ""
 "Vrijeme i datum slikanja fotografije. U ovom standardu (EXIF-2.1) to je "
 "datum i vrijeme izmjene datoteke."
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Umjetnik"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3240,11 +3238,11 @@ msgstr ""
 "unijeta kao Å¡to je primjer koji je prikazan dolje. Ako se polje ostavi "
 "prazno, smatra se da je nepoznato."
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Bela ta�ka"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
@@ -3253,11 +3251,11 @@ msgstr ""
 "Kromacititet bijele ta�ke slike. Normalno, ovaj tag nije neophodan, budući "
 "da je prostor boje specificiran u tagu za prostor boju (<ColorSpace>)."
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr "Glavna nijansiranost"
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
@@ -3266,21 +3264,21 @@ msgstr ""
 "Kromacititet tri primarne boje slike. Normalno, ovaj tag nije neophodan, "
 "budući da je prostor boje specificiran u tagu za prostor boju (<ColorSpace>)."
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 "Određeno od strane Adobe korporacije za omogićavanje TIFF Trees u okviru "
 "TIFF datoteke."
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr "Domet prijenosa"
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr "JPEG format"
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
@@ -3288,11 +3286,11 @@ msgstr ""
 "Raspon prema startnom bajtu (SOI) JPEG kompresovanog umanjenog prikaza "
 "slike. Ovo se ne koristi kao primarni podatak JPEG slike."
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr "JPEG format dužine"
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3307,11 +3305,11 @@ msgstr ""
 "biti zapisani u ne više od 64 kilobajtova, uklju�ujući i sve postale podatke "
 "koji se zapisuju u APP1."
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr "YCbCr koeficijenti"
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3325,11 +3323,11 @@ msgstr ""
 "tagu prostora boje, sa podrazumijevanom vrijednošću koja daje optimalne "
 "karakteristike slike u ovim uslovima."
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr "YCbCr Sub-Sampling"
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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."
@@ -3337,11 +3335,11 @@ msgstr ""
 "Odnos uzoraka dijelova hromiranja u odnosu na ja�inu osvjetljenja. Kod JPEG "
 "sažetih podataka, JPEG obilježiva� se koristi umjesto ove etikete."
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr "YCbCr položaj"
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3367,11 +3365,11 @@ msgstr ""
 "polju. Preporu�ljivo je da �ita�i butu sposobni i za centrirano i za co-"
 "sited pozicioniranje."
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr "Referentni nivo crno/bele"
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3385,19 +3383,19 @@ msgstr ""
 "boja, a podrazumijevane vrijednosti su one koje daju optimalne "
 "karakteristike slike."
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr "XML skup"
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr "XMP metapodaci"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr "CFA Å¡ablon"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 "
@@ -3407,15 +3405,15 @@ msgstr ""
 "koristi senzor opsega boja na jednom �ipu. Nema uticaja na sve metode "
 "senzora."
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Stanje baterije"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "Copyright"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3448,23 +3446,19 @@ msgstr ""
 "ide dio o autorskim pravima uređiva�a (pogledajte primjer 3). Kada je polje "
 "prazno, smatra se da autorska prava nisu poznata."
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Vrijeme osvjetljenja u sekundama (sec)."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "F-Broj"
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr "F broj."
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr "Image Resources Block"
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 "
@@ -3474,22 +3468,22 @@ msgstr ""
 "kao kod IFD-a navedenog u TIFF-u, ali ne sadrži podatke slike  kao u slu�aju "
 "TIFF-a."
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr "Program ekspozicije"
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 "Programska klasa koju aparat koristi da podesi osvjetljenje kada slika."
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr "Spektralna osjetljivost"
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 "
@@ -3499,11 +3493,11 @@ msgstr ""
 "Vrijednost etikete je ASCII string koje je u skladu sa standardnom koji je "
 "razvio ASTM tehn�ki komitet."
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr "GPS Info IFD Pointer"
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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."
@@ -3511,11 +3505,11 @@ msgstr ""
 "Pokaziva� na GPS Info IFD. Interoperabilna struktura GPS Info IFD-a kao kod "
 "Exif IFD ali ne sadrži podatke slike."
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr "Stopa ISO brzine"
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -3523,11 +3517,11 @@ msgstr ""
 "Ozna�ava ISO brzinu i ISO obim aparata ili ulaznog uređaja kao što je "
 "precizirano u ISO 12232."
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr "Opto-elektroni�ke pretvorbe funkcija"
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
@@ -3536,19 +3530,19 @@ msgstr ""
 "Pokazuje opto-elektroni�ku funkciju konvercije (OECF) specificiranu u  ISO "
 "14524. <OECF> je odnos između optimalnog ulaza kamere i vrijednosti slike."
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr "Pomak vremenske zone"
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr "Enkodira vremensku zonu kamere relativno u odnosu na GMT."
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr "Exif verzija"
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -3556,11 +3550,11 @@ msgstr ""
 "Verzija ovog standarda je podržana. Nepostojanje ovog polja je odstupanje od "
 "prilagođenosti ovom standardu."
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr "Datum i vrijeme (originalno)"
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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."
@@ -3568,19 +3562,19 @@ msgstr ""
 "Datum i vrijeme pravljenja prvobitne fotografije. Za digitalne aparate pamte "
 "se datum i vrijeme stvaranja slike."
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr "Datum i vrijeme (digitalizirano)"
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr "Datum i vrijeme kada je slika pohranjena kao digitalni podatak"
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr "Postavke komponenti"
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3596,11 +3590,11 @@ msgstr ""
 "ova oznaka je obezbeđena kada kompresovani podaci koriste komponente "
 "drugacije od Y, Cb, i Cr i da bi se obezbijedila podrška za druge sekvence."
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr "Sažeti biti po pikselu"
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -3608,11 +3602,11 @@ msgstr ""
 "Informacije vezane za sažete podatke. Mod za sažimanje koji se koristi za "
 "sažimanje slika se mjeri u jedinici bitovi po pikselu."
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Brzina zatvaranja"
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -3620,15 +3614,15 @@ msgstr ""
 "Brzina zatvara�a. Jedinica je u  APEX (Additive System of Photographic "
 "Exposure) podešavanju."
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Otvor so�iva. Jedinica je u APEX vrijednosti."
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Svjetlina"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -3636,11 +3630,11 @@ msgstr ""
 "Vrijednost svjetline. Jedinica je vrijednost APEX-a. Obi�no je u opsegu "
 "-99.99 to 99.99."
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr "Osvjetljenje kosine"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -3648,11 +3642,11 @@ msgstr ""
 "Pretpostavka osvjetljenja. Jedinica je vrijednost APEX-a. Obi�no je u opsegu "
 "-99.99 to 99.99."
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr "Maksimalna vrijednost otvaranja"
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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."
@@ -3660,34 +3654,34 @@ msgstr ""
 "Najmanji broj F so�iva. Jedinica je vrijednost APEX-a. Obi�no je u opsegu "
 "00.00 to 99.99, ali nije ograni�ena u ovom opsegu."
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr "Udaljenost subjekta"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr "Udaljenost subjekta u metrima."
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr "Mod za mjerenje."
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "Izvor svjetla"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr "Vrsta izvora"
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "Ova etiketa se popuni kada se fotografiše uz pomoć elektronskog blica "
 "(stroba)."
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -3695,11 +3689,11 @@ msgstr ""
 "Stvarna žižna daljina so�iva u mm. Nema pretvaranja za žižnu daljinu 35 mm "
 "filmske kamere."
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr "Oblast subjekta"
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
@@ -3707,15 +3701,15 @@ msgstr ""
 "Ova etiketa ozna�ava položaj i mjesto glavnog subjekta na sveobuhvatnoj "
 "slici."
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr "TIFF/EP standardni ID"
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr "Beleška autora"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -3723,11 +3717,11 @@ msgstr ""
 "Etiketa za prizvođa�a Exif u kojoj smešta željene informacije. Sadržaj "
 "zavisi od proizvođa�a."
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "Beleška korisnika"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3766,64 +3760,64 @@ msgstr ""
 "ASCII i da korisni�ki komentari koji slijede budu popunjeni sa praznim "
 "znakovima [20.H]."
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr "Sub-second vrijeme"
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr "Etiketa koja pamti djeliće sekunde za etiketu <DateTime>."
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr "Sub-second Vrijeme(Original)"
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr "Etiketa koja pamti djeliće sekunde za etiketu <DateTimeOriginal>."
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr "Sub-second Vrijeme(Digitized)"
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr "Etiketa koja pamti djeliće sekunde za etiketu <DateTimeDigitized>."
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr "XP naslov"
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr "String znakova koji daje naziv slike, enkodiran u UTF-16LE."
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr "XP primjedba"
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr "String znakova koji sadrži komentar o slici, enkodiran u UTF-16LE."
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr "XP autor"
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr "String znakova koji sadrži ime kreatora slike, enkodiran u UTF-16LE."
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr "XP klju�ne rije�i"
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
@@ -3831,23 +3825,23 @@ msgstr ""
 "String znakova koji sadrži klju�ne rije�i koje opisuju sliku, enkodiran u "
 "UTF.16LE."
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr "XP subjekat"
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr "String znakova koji daje subjekt slike, enkodiran u UTF-16LE."
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "Format FlashPix verzije podržan od FPXR datoteke."
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Paleta boja"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3861,11 +3855,11 @@ msgstr ""
 "postavlja se Uncalibrated (=FFFF.H) - nekalibrisan. Podaci slike sa�uvane "
 "kao Uncalibrated mogu se tretirati kao sRGB kada se konvertuju u FlashPix."
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr "Piksel X dimenzija"
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3877,11 +3871,11 @@ msgstr ""
 "oznaci, bez obzira na to da li postoje poravnjavajući podaci ili marker "
 "restarta. Ova oznaka ne bi trebalo da se nalazi u nekompresovanom fajlu."
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr "Piksel Y dimenzija"
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3897,11 +3891,11 @@ msgstr ""
 "potrebno u vertikalnom smjeru, broj linija spremljenih u ovom tagu ustvari "
 "je isti kao i onaj spremljen u SOF."
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr "Povezana audio datoteka."
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3946,11 +3940,11 @@ msgstr ""
 "je ovaj tag korišten za mapiranje audio fajlova, relacija audio fajla u "
 "odnosu na sliku može također biti prikazana na kraju audio fajla."
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr "IFD pokazivac interoprebilnosti"
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3964,11 +3958,11 @@ msgstr ""
 "definirana IFD struktura, ali ne sadrći slikovne podatke karakteristi�no "
 "uspoređene sa normalnim TIFF IFD."
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr "Stanje energije blica"
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -3976,11 +3970,11 @@ msgstr ""
 "Ozna�ava vrijednost stroba (blica) kada je slika napravljena i mjeri se Beam "
 "Candle Power Seconds (BCPS)."
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr "Prostorni odgovor u�estanosti"
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 "
@@ -3990,11 +3984,11 @@ msgstr ""
 "dužine, visine i dijagonalnog smjera slike, kao što je specificirano u ISO "
 "12233."
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr "X- rezolucija žarišne ravni,"
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -4002,11 +3996,11 @@ msgstr ""
 "Indicates the number of pixels in the image width (X) direction pir "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr "Y- rezolucija žarišne ravni,"
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -4014,11 +4008,11 @@ msgstr ""
 "Pokazuje broj piksela u smjeru visine slike (V) po "
 "<FocalPlaneResolutionUnit> na žarišnoj ravni kamere."
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr "Jedinica rezolucije žižne ravni"
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -4026,11 +4020,11 @@ msgstr ""
 "Ozna�ava jedinicu mjere za <FocalPlaneXResolution> i "
 "<FocalPlaneYResolution>. Ova vrijednost je ista kao kod <ResolutionUnit>."
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr "Položaj subjekata"
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -4043,11 +4037,11 @@ msgstr ""
 "procesa okretanja u etiketi 'Okretanje'. Prva vrijednost ozna�ava broj X "
 "kolone, a druga   Y"
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr "Indeks ekspozicije"
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
@@ -4055,19 +4049,19 @@ msgstr ""
 "Ozna�ava vrijednost osvjetljenja na aparatu ili ulaznom uređaju kada je "
 "uslikano."
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr "Sensing Method"
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr "Ozna�ava tip senzora na aparatu ili ulaznom uređaju."
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Izvor datoteke"
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -4075,11 +4069,11 @@ msgstr ""
 "Ozna�ava izvor fotografije. Ako je DSC uslikao fotografiju, vrijednost "
 "etikete mora uvijek biti 3, ozna�avajući da je fotografija uslikana na DSC."
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr "Vrsta prizora"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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."
@@ -4087,11 +4081,11 @@ msgstr ""
 "Ozna�ava vrstu prizora. Ako je DSC uslikao fotografiju, vrijednost etikete "
 "mora uvijek biti 1, ozna�avajući da je fotografija neposredno uslikana."
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr "Prilagođeno renderovanje"
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 "
@@ -4102,7 +4096,7 @@ msgstr ""
 "�ita�a se o�ekuje da onesposobi ili minimizira bilo kakvo daljnje "
 "procesovanje."
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 "
@@ -4112,15 +4106,15 @@ msgstr ""
 "bracketing modu, kamera snima seriju okvirova iste scene pod razli�itim "
 "postavkama izloženosti."
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr "Ova etiketa ozna�ava vrijednost moda ravnoteže bele kada je uslikano."
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr "Odnos digitalno uvećanja"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 "
@@ -4129,11 +4123,11 @@ msgstr ""
 "Ova etiketa ozna�ava vrijednost digitalnog uvećanja kada je slikano. "
 "Vrijednost 0 ozna�ava da digitalno uvećanje nije korišćeno."
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr "Žićna daljina u 35mm Filmu"
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 "
@@ -4143,11 +4137,11 @@ msgstr ""
 "kamere. Vrijednost 0 zna�i da je žarišna dužina nepoznata. Primijetite da se "
 "ovaj tag razlikuje od FocalLength taga."
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr "Tip uslikane fotografije"
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
@@ -4157,15 +4151,15 @@ msgstr ""
 "zapamti mod u kojem je slikano. Primijetite da se razlikuje od etikete tipa "
 "slike <SceneType>."
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr "Zadobij kontrolu"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "This tag indicates the degree of overall image gain adjustment."
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -4173,7 +4167,7 @@ msgstr ""
 "Etiketa ozna�ava smjer obrade kontrasta koji je aparat primijenio kada je "
 "uslikao."
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -4181,7 +4175,7 @@ msgstr ""
 "Etiketa ozna�ava smjer obrade zasićenja koji je aparat primijenio kada je "
 "uslikao."
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
@@ -4189,11 +4183,11 @@ msgstr ""
 "Etiketa ozna�ava smjer obrade oštrine koja je aparat primijenio kada je "
 "uslikao."
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr "Djevice Setting Description"
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 "
@@ -4202,19 +4196,19 @@ msgstr ""
 "Etiketa ozna�ava uslove slikanja tog specifi�nog foto-aparata. The tag is "
 "used only to indicate the picture-taking conditions in the reader."
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr "Opseg udaljenosti subjekta"
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr "Ova etiketa ozna�ava udaljenost subjekta."
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr "Jedinstveni ID slike"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 "
@@ -4223,27 +4217,27 @@ msgstr ""
 "Etiketa jedinstveno obilježava svaku fotografiju. Pamti se kao ASCII string "
 "koji je jednak heksadecimalnoj bilježenju i stalne je dužine od 128 bitova."
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr "Gama"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr "Pokazuje vrijednost koeficijenta game."
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr "ISPIÅ I slaganje slike."
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr "Vezano za Epsonovu PRINT Image Matching tehnologiju"
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr "Popunjavanje"
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4425,17 +4419,11 @@ msgstr "Å iroki1 (230%)"
 msgid "Wide2 (400%)"
 msgstr "Å iroki1 (400%)"
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr "%2.2f mm"
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr "%i bajtova nepoznatih podataka"
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr "Verzija napomene proizvođaća"
@@ -4861,117 +4849,117 @@ msgstr "15 kadrova/s"
 msgid "20 frames/sec"
 msgstr "20 kadrova/s"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "Crvena korekcija %f. plava korekcija  %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr "Nije izabrano ru�no podešavanje žiže"
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f metara"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr "AF pozicija: centar"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr "AF pozicija: vrh"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr "AF pozicija: dno"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr "AF pozicija: lijevo"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr "AF pozicija: desno"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr "AF pozicija: gore-lijevo"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr "AF pozicija: gore-desno"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr "AF pozicija: dolje-lijevo"
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr "AF pozicija: dolje-desno"
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr "AF pozicija: daleko lijevo"
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr "AF pozicija: daleko desno"
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr "Nepoznata AF pozicija"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Interna greška (nepoznata vrijednost %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Nepoznata vrijednost %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr "Nepoznato %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr "2 sec."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr "Brzo"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "Automatsko"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr "Ru�no: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr "Ru�no: nepoznato"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr "Jedan dodir"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr "beskona�no"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i bajtova nepoznatih podataka: "
@@ -5073,8 +5061,7 @@ msgid "Contrast Curve"
 msgstr "Kriva kontrasta"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr "Režim boja"
 
@@ -5246,13 +5233,11 @@ msgstr "Nivo crne"
 msgid "White Balance Setting"
 msgstr "Podešavanje ravnoteže bele"
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr "Balans crvene"
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr "Balans plave"
 
@@ -5600,11 +5585,21 @@ msgstr "3008x2008 ili 3040x2024"
 msgid "Digital filter?"
 msgstr "Digitalni filter?"
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr "Interna greška (nepoznata vrijednost %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Unutrašnja greška (nepoznata vrijednost %hu %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Unutrašnja greška (nepoznata vrijednost %i %i)"
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Unutrašnja greška (nepoznata vrijednost %hi %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5807,7 +5802,5 @@ msgstr "Finije"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
-#~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr ""
-#~ "Zastavica Korisni�kiKomentar se ne uklapa sa standardom, već sadrži "
-#~ "podatke."
+#~ msgid "FNumber"
+#~ msgstr "FBroj"
diff --git a/po/cs.gmo b/po/cs.gmo
deleted file mode 100644
index 3eb09cb..0000000
--- a/po/cs.gmo
+++ /dev/null
diff --git a/po/cs.po b/po/cs.po
index 4797d1f..2c79c21 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.20\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2010-12-15 22:14-0800\n"
 "PO-Revision-Date: 2010-12-16 22:23+0000\n"
 "Last-Translator: Jan Patera <patera@users.sourceforge.net>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,8 +38,8 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Spatný po�et položek (%i, o�ekáváno %i nebo %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
-#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:796
+#: libexif/olympus/mnote-olympus-entry.c:196
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
 #: libexif/pentax/mnote-pentax-entry.c:209
@@ -49,14 +49,14 @@ msgstr "Makro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
-#: libexif/olympus/mnote-olympus-entry.c:121
-#: libexif/olympus/mnote-olympus-entry.c:198
-#: libexif/olympus/mnote-olympus-entry.c:206
-#: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:674
+#: libexif/exif-entry.c:677 libexif/exif-entry.c:678 libexif/exif-entry.c:679
+#: libexif/exif-entry.c:745 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:213
+#: libexif/olympus/mnote-olympus-entry.c:586
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -81,33 +81,33 @@ msgstr "RAW"
 msgid "Superfine"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
-#: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
-#: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
-#: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:301
+#: libexif/canon/mnote-canon-entry.c:304 libexif/canon/mnote-canon-entry.c:312
+#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:357
+#: libexif/canon/mnote-canon-entry.c:370 libexif/canon/mnote-canon-entry.c:372
+#: libexif/canon/mnote-canon-entry.c:574 libexif/canon/mnote-canon-entry.c:671
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
-#: libexif/olympus/mnote-olympus-entry.c:181
-#: libexif/olympus/mnote-olympus-entry.c:189
-#: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:178
+#: libexif/olympus/mnote-olympus-entry.c:186
+#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:530
+#: libexif/olympus/mnote-olympus-entry.c:547
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
 msgstr "Vypnuto"
 
 #: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
-#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
-#: libexif/canon/mnote-canon-entry.c:403 libexif/fuji/mnote-fuji-entry.c:73
+#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:328
+#: libexif/canon/mnote-canon-entry.c:400 libexif/fuji/mnote-fuji-entry.c:73
 #: libexif/fuji/mnote-fuji-entry.c:101 libexif/fuji/mnote-fuji-entry.c:111
 #: libexif/fuji/mnote-fuji-entry.c:119
-#: libexif/olympus/mnote-olympus-entry.c:134
-#: libexif/olympus/mnote-olympus-entry.c:186
-#: libexif/olympus/mnote-olympus-entry.c:202
-#: libexif/olympus/mnote-olympus-entry.c:247
+#: libexif/olympus/mnote-olympus-entry.c:131
+#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/olympus/mnote-olympus-entry.c:244
 #: libexif/pentax/mnote-pentax-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:88
 #: libexif/pentax/mnote-pentax-entry.c:91
@@ -119,21 +119,21 @@ msgstr "Vypnuto"
 msgid "Auto"
 msgstr "Automaticky"
 
-#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
-#: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
-#: libexif/canon/mnote-canon-entry.c:374 libexif/fuji/mnote-fuji-entry.c:102
+#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:302
+#: libexif/canon/mnote-canon-entry.c:347 libexif/canon/mnote-canon-entry.c:361
+#: libexif/canon/mnote-canon-entry.c:371 libexif/fuji/mnote-fuji-entry.c:102
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
-#: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:179
+#: libexif/olympus/mnote-olympus-entry.c:533
+#: libexif/olympus/mnote-olympus-entry.c:550
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
 msgstr "Zapnuto"
 
 #: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
-#: libexif/olympus/mnote-olympus-entry.c:187
+#: libexif/olympus/mnote-olympus-entry.c:184
 #: libexif/pentax/mnote-pentax-entry.c:94
 msgid "Red-eye reduction"
 msgstr "Redukce �ervených o�í"
@@ -156,12 +156,12 @@ msgid "External flash"
 msgstr "Přídavný blesk"
 
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
-#: libexif/canon/mnote-canon-entry.c:297
+#: libexif/canon/mnote-canon-entry.c:294
 msgid "Single"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
-#: libexif/canon/mnote-canon-entry.c:298
+#: libexif/canon/mnote-canon-entry.c:295
 msgid "Continuous"
 msgstr ""
 
@@ -271,11 +271,11 @@ msgid "Full auto"
 msgstr "Plně automatický"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
-#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
+#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:285
+#: libexif/canon/mnote-canon-entry.c:392 libexif/exif-entry.c:744
 #: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
-#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:90
+#: libexif/olympus/mnote-olympus-entry.c:200
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
 #: libexif/pentax/mnote-pentax-entry.c:133
@@ -285,8 +285,8 @@ msgstr "Plně automatický"
 msgid "Manual"
 msgstr "Ru�ní"
 
-#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:430
+#: libexif/exif-entry.c:671 libexif/exif-entry.c:755
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -301,7 +301,7 @@ msgid "Slow shutter"
 msgstr "Pomalá uzávěrka"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
-#: libexif/olympus/mnote-olympus-entry.c:257
+#: libexif/olympus/mnote-olympus-entry.c:254
 msgid "Night"
 msgstr "Noc"
 
@@ -309,13 +309,13 @@ msgstr "Noc"
 msgid "Grayscale"
 msgstr "Odstíny šedi"
 
-#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
+#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:308
 #: libexif/pentax/mnote-pentax-entry.c:128
 msgid "Sepia"
 msgstr "Sépie"
 
-#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:429
+#: libexif/exif-entry.c:671 libexif/exif-entry.c:753
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -327,18 +327,18 @@ msgstr "Na výšku"
 msgid "Sports"
 msgstr "Sport"
 
-#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
-#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
+#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:309
+#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
 #: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
 msgid "Black & white"
 msgstr "Černobílý"
 
-#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
+#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:305
 msgid "Vivid"
 msgstr "Živé"
 
-#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
-#: libexif/canon/mnote-canon-entry.c:434
+#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:306
+#: libexif/canon/mnote-canon-entry.c:431
 msgid "Neutral"
 msgstr "Neutrální"
 
@@ -352,7 +352,7 @@ msgid "Long shutter"
 msgstr "Dlouhá uzávěrka"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
-#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:171
 msgid "Super macro"
 msgstr "Super Makro"
 
@@ -373,8 +373,8 @@ msgstr "Ohňostroj"
 msgid "Beach"
 msgstr "Na pláži"
 
-#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
-#: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:344
+#: libexif/canon/mnote-canon-entry.c:416 libexif/fuji/mnote-fuji-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
@@ -421,11 +421,11 @@ msgstr "Akvárium"
 msgid "ISO 3200"
 msgstr "ISO 3200"
 
-#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
-#: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
-#: libexif/olympus/mnote-olympus-entry.c:192
-#: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:348
+#: libexif/canon/mnote-canon-entry.c:365 libexif/canon/mnote-canon-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:189
+#: libexif/olympus/mnote-olympus-entry.c:226
+#: libexif/olympus/mnote-olympus-entry.c:451
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Žádný"
@@ -438,20 +438,20 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:702
+#: libexif/exif-entry.c:732
 msgid "Other"
 msgstr "Jiný"
 
 #: libexif/canon/mnote-canon-entry.c:158 libexif/canon/mnote-canon-entry.c:161
-#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:401
+#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:398
 #: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
 #: libexif/pentax/mnote-pentax-entry.c:117
 msgid "High"
 msgstr "Vysoký"
 
 #: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
-#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
+#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:396
 #: libexif/pentax/mnote-pentax-entry.c:111
 #: libexif/pentax/mnote-pentax-entry.c:116
 msgid "Low"
@@ -489,11 +489,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Výchozí"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:698
 msgid "Spot"
 msgstr "Bodový"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:696
 msgid "Average"
 msgstr "Průměrný"
 
@@ -501,11 +501,11 @@ msgstr "Průměrný"
 msgid "Evaluative"
 msgstr "Vyhodnocující"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:701
 msgid "Partial"
 msgstr "Částe�ný"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:697
 msgid "Center-weighted average"
 msgstr "Vážený průměr"
 
@@ -517,7 +517,7 @@ msgstr "Neznámý"
 msgid "Very close"
 msgstr "Velmi blízký"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:797
 msgid "Close"
 msgstr "Blízký"
 
@@ -538,7 +538,7 @@ msgstr "Nekone�no"
 msgid "Manual AF point selection"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
+#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:349
 msgid "None (MF)"
 msgstr ""
 
@@ -546,19 +546,19 @@ msgstr ""
 msgid "Auto-selected"
 msgstr "Automaticky zvolený"
 
-#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
+#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:224
 #: libexif/pentax/mnote-pentax-entry.c:238
 msgid "Right"
 msgstr "Vpravo"
 
-#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
+#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:351
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
 msgid "Center"
 msgstr "Uprostřed"
 
-#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
+#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:220
 #: libexif/pentax/mnote-pentax-entry.c:236
 msgid "Left"
@@ -654,444 +654,429 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 nebo Sigma 15mm f/2.8 EX rybí oko"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
-msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
-
-#: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
 msgstr "Canon EF 75-300mm f/4-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:221
+#: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 28-80mm f/3.5-5.6"
 msgstr "Canon EF 28-80mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:222
+#: libexif/canon/mnote-canon-entry.c:221
 msgid "Canon EF 28-105mm f/4-5.6"
 msgstr "Canon EF 28-105mm f/4-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:223
+#: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
-msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
-
-#: libexif/canon/mnote-canon-entry.c:225
+#: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 msgstr "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 
-#: libexif/canon/mnote-canon-entry.c:226
+#: libexif/canon/mnote-canon-entry.c:224
 msgid "Canon TS-E 24mm f/3.5L"
 msgstr "Canon TS-E 24mm f/3.5L"
 
-#: libexif/canon/mnote-canon-entry.c:227
+#: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon TS-E 45mm f/2.8"
 msgstr "Canon TS-E 45mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:228
+#: libexif/canon/mnote-canon-entry.c:226
 msgid "Canon TS-E 90mm f/2.8"
 msgstr "Canon TS-E 90mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:229
+#: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon EF 50mm f/1.0L"
 msgstr "Canon EF 50mm f/1.0L"
 
-#: libexif/canon/mnote-canon-entry.c:230
+#: libexif/canon/mnote-canon-entry.c:228
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 msgstr "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 
-#: libexif/canon/mnote-canon-entry.c:231
+#: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 600mm f/4L IS"
 msgstr "Canon EF 600mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:232
+#: libexif/canon/mnote-canon-entry.c:230
 msgid "Canon EF 200mm f/1.8L"
 msgstr "Canon EF 200mm f/1.8L"
 
-#: libexif/canon/mnote-canon-entry.c:233
+#: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 300mm f/2.8L"
 msgstr "Canon EF 300mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:234
+#: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 85mm f/1.2L"
 msgstr "Canon EF 85mm f/1.2L"
 
-#: libexif/canon/mnote-canon-entry.c:235
+#: libexif/canon/mnote-canon-entry.c:233
 msgid "Canon EF 400mm f/2.8L"
 msgstr "Canon EF 400mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:236
+#: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 500mm f/4.5L"
 msgstr "Canon EF 500mm f/4.5L"
 
-#: libexif/canon/mnote-canon-entry.c:237
+#: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 300mm f/2.8L IS"
 msgstr "Canon EF 300mm f/2.8L IS"
 
-#: libexif/canon/mnote-canon-entry.c:238
+#: libexif/canon/mnote-canon-entry.c:236
 msgid "Canon EF 500mm f/4L IS"
 msgstr "Canon EF 500mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:239
+#: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 100mm f/2"
 msgstr "Canon EF 100mm f/2"
 
-#: libexif/canon/mnote-canon-entry.c:240
+#: libexif/canon/mnote-canon-entry.c:238
 msgid "Sigma 20mm EX f/1.8"
 msgstr "Sigma 20mm EX f/1.8"
 
-#: libexif/canon/mnote-canon-entry.c:241
+#: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 200mm f/2.8L"
 msgstr "Canon EF 200mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:242
+#: libexif/canon/mnote-canon-entry.c:240
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
 msgstr "Sigma 10-20mm F4-5.6, 12-24mm f/4.5-5.6 nebo 14mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:243
+#: libexif/canon/mnote-canon-entry.c:241
 msgid "Canon EF 35-350mm f/3.5-5.6L"
 msgstr "Canon EF 35-350mm f/3.5-5.6L"
 
-#: libexif/canon/mnote-canon-entry.c:244
+#: libexif/canon/mnote-canon-entry.c:242
 msgid "Canon EF 85mm f/1.8 USM"
 msgstr "Canon EF 85mm f/1.8 USM"
 
-#: libexif/canon/mnote-canon-entry.c:245
+#: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 28-105mm f/3.5-4.5 USM"
 msgstr "Canon EF 28-105mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:246
+#: libexif/canon/mnote-canon-entry.c:244
 msgid "Canon EF 20-35mm f/3.5-4.5 USM"
 msgstr "Canon EF 20-35mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:247
+#: libexif/canon/mnote-canon-entry.c:245
 msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
 msgstr "Canon EF 28-70mm f/2.8L nebo Sigma 24-70mm EX f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:248
+#: libexif/canon/mnote-canon-entry.c:246
 msgid "Canon EF 70-200mm f/2.8 L"
 msgstr "Canon EF 70-200mm f/2.8 L"
 
-#: libexif/canon/mnote-canon-entry.c:249
+#: libexif/canon/mnote-canon-entry.c:247
 msgid "Canon EF 70-200mm f/2.8 L + x1.4"
 msgstr "Canon EF 70-200mm f/2.8 L + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:250
+#: libexif/canon/mnote-canon-entry.c:248
 msgid "Canon EF 70-200mm f/2.8 L + x2"
 msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
-#: libexif/canon/mnote-canon-entry.c:251
+#: libexif/canon/mnote-canon-entry.c:249
 msgid "Canon EF 28mm f/1.8 USM"
 msgstr "Canon EF 28mm f/1.8 USM"
 
-#: libexif/canon/mnote-canon-entry.c:252
+#: libexif/canon/mnote-canon-entry.c:250
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
 msgstr "Sigma 15-30mm f/3.5-4.5 EX DG asférický"
 
-#: libexif/canon/mnote-canon-entry.c:253
+#: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 200mm f/2.8L II"
 msgstr "Canon EF 200mm f/2.8L II"
 
-#: libexif/canon/mnote-canon-entry.c:254
+#: libexif/canon/mnote-canon-entry.c:252
 msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
 msgstr "Canon EF 180mm Macro f/3.5L nebo Sigma 180mm EX HSM Macro f/3.5"
 
-#: libexif/canon/mnote-canon-entry.c:255
+#: libexif/canon/mnote-canon-entry.c:253
 msgid "Canon EF 135mm f/2L"
 msgstr "Canon EF 135mm f/2L"
 
-#: libexif/canon/mnote-canon-entry.c:256
+#: libexif/canon/mnote-canon-entry.c:254
 msgid "Canon EF 24-85mm f/3.5-4.5 USM"
 msgstr "Canon EF 24-85mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:257
+#: libexif/canon/mnote-canon-entry.c:255
 msgid "Canon EF 300mm f/4L IS"
 msgstr "Canon EF 300mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:258
+#: libexif/canon/mnote-canon-entry.c:256
 msgid "Canon EF 28-135mm f/3.5-5.6 IS"
 msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
 
-#: libexif/canon/mnote-canon-entry.c:259
+#: libexif/canon/mnote-canon-entry.c:257
 msgid "Canon EF 35mm f/1.4L"
 msgstr "Canon EF 35mm f/1.4L"
 
-#: libexif/canon/mnote-canon-entry.c:260
+#: libexif/canon/mnote-canon-entry.c:258
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:261
+#: libexif/canon/mnote-canon-entry.c:259
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 
-#: libexif/canon/mnote-canon-entry.c:262
+#: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
 
-#: libexif/canon/mnote-canon-entry.c:263
+#: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 400mm f/2.8L + x2"
 msgstr "Canon EF 400mm f/2.8L + x2"
 
-#: libexif/canon/mnote-canon-entry.c:264
+#: libexif/canon/mnote-canon-entry.c:262
 msgid "Canon EF 70-200mm f/4L"
 msgstr "Canon EF 70-200mm f/4L"
 
-#: libexif/canon/mnote-canon-entry.c:265
+#: libexif/canon/mnote-canon-entry.c:263
 msgid "Canon EF 100mm f/2.8 Macro"
 msgstr "Canon EF 100mm f/2.8 Macro"
 
-#: libexif/canon/mnote-canon-entry.c:266
+#: libexif/canon/mnote-canon-entry.c:264
 msgid "Canon EF 400mm f/4 DO IS"
 msgstr "Canon EF 400mm f/4 DO IS"
 
-#: libexif/canon/mnote-canon-entry.c:267
+#: libexif/canon/mnote-canon-entry.c:265
 msgid "Canon EF 75-300mm f/4-5.6 IS"
 msgstr "Canon EF 75-300mm f/4-5.6 IS"
 
-#: libexif/canon/mnote-canon-entry.c:268
+#: libexif/canon/mnote-canon-entry.c:266
 msgid "Canon EF 50mm f/1.4"
 msgstr "Canon EF 50mm f/1.4"
 
-#: libexif/canon/mnote-canon-entry.c:269
+#: libexif/canon/mnote-canon-entry.c:267
 msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
 msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
-#: libexif/canon/mnote-canon-entry.c:270
+#: libexif/canon/mnote-canon-entry.c:268
 msgid "Canon EF 28-200mm f/3.5-5.6"
 msgstr "Canon EF 28-200mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:271
+#: libexif/canon/mnote-canon-entry.c:269
 msgid "Canon EF 90-300mm f/4.5-5.6"
 msgstr "Canon EF 90-300mm f/4.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:272
+#: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
 msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:273
+#: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 70-200mm f/2.8L IS USM"
 msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:274
+#: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:275
+#: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
 msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
-#: libexif/canon/mnote-canon-entry.c:276
+#: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 16-35mm f/2.8L"
 msgstr "Canon EF 16-35mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:277
+#: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 24-70mm f/2.8L"
 msgstr "Canon EF 24-70mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:278
+#: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 17-40mm f/4L"
 msgstr "Canon EF 17-40mm f/4L"
 
-#: libexif/canon/mnote-canon-entry.c:279
+#: libexif/canon/mnote-canon-entry.c:277
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:280
+#: libexif/canon/mnote-canon-entry.c:278
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
 msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:281
+#: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
 msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:282
+#: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S60mm F2.8 Macro USM"
 msgstr "Canon EF-S60mm F2.8 Macro USM"
 
-#: libexif/canon/mnote-canon-entry.c:283
+#: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF 24-105mm f/4L IS"
 msgstr "Canon EF 24-105mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:284
+#: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
 msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:285
+#: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 50mm F1.2L USM"
 msgstr "Canon EF 50mm F1.2L USM"
 
-#: libexif/canon/mnote-canon-entry.c:286
+#: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
-msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
-
-#: libexif/canon/mnote-canon-entry.c:289
+#: libexif/canon/mnote-canon-entry.c:286
 msgid "TTL"
 msgstr "TTL"
 
-#: libexif/canon/mnote-canon-entry.c:290
+#: libexif/canon/mnote-canon-entry.c:287
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: libexif/canon/mnote-canon-entry.c:291
+#: libexif/canon/mnote-canon-entry.c:288
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/canon/mnote-canon-entry.c:289
 msgid "FP sync enabled"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/canon/mnote-canon-entry.c:290
 msgid "2nd-curtain sync used"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:294
+#: libexif/canon/mnote-canon-entry.c:291
 msgid "FP sync used"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:295
-#: libexif/olympus/mnote-olympus-entry.c:193
+#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/olympus/mnote-olympus-entry.c:190
 msgid "Internal"
 msgstr "Vnitřní"
 
-#: libexif/canon/mnote-canon-entry.c:296
-#: libexif/olympus/mnote-olympus-entry.c:194
+#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/olympus/mnote-olympus-entry.c:191
 msgid "External"
 msgstr "Přídavný"
 
-#: libexif/canon/mnote-canon-entry.c:299
+#: libexif/canon/mnote-canon-entry.c:296
 msgid "Normal AE"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:300
+#: libexif/canon/mnote-canon-entry.c:297
 msgid "Exposure compensation"
 msgstr "Kompenzace expozice"
 
-#: libexif/canon/mnote-canon-entry.c:301
+#: libexif/canon/mnote-canon-entry.c:298
 msgid "AE lock"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:302
+#: libexif/canon/mnote-canon-entry.c:299
 msgid "AE lock + exposure compensation"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:303
+#: libexif/canon/mnote-canon-entry.c:300
 msgid "No AE"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:306
+#: libexif/canon/mnote-canon-entry.c:303
 msgid "On, shot only"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:310
+#: libexif/canon/mnote-canon-entry.c:307
 msgid "Smooth"
 msgstr "Jemný"
 
-#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
-#: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
+#: libexif/canon/mnote-canon-entry.c:310 libexif/canon/mnote-canon-entry.c:334
+#: libexif/canon/mnote-canon-entry.c:393 libexif/canon/mnote-canon-entry.c:406
 #: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
 msgid "Custom"
 msgstr "Uživatelský"
 
-#: libexif/canon/mnote-canon-entry.c:314
+#: libexif/canon/mnote-canon-entry.c:311
 msgid "My color data"
 msgstr "Vlastní barevné nastavení"
 
-#: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
+#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:375
 #: libexif/pentax/mnote-pentax-entry.c:126
 #: libexif/pentax/mnote-pentax-entry.c:145
 msgid "Full"
 msgstr "Plný"
 
-#: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
+#: libexif/canon/mnote-canon-entry.c:314 libexif/canon/mnote-canon-entry.c:374
 msgid "2/3"
 msgstr "2/3"
 
-#: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
+#: libexif/canon/mnote-canon-entry.c:315 libexif/canon/mnote-canon-entry.c:373
 msgid "1/3"
 msgstr "1/3"
 
-#: libexif/canon/mnote-canon-entry.c:324
+#: libexif/canon/mnote-canon-entry.c:321
 msgid "Fixed"
 msgstr "Pevný"
 
-#: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
+#: libexif/canon/mnote-canon-entry.c:322 libexif/pentax/mnote-pentax-tag.c:44
 msgid "Zoom"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:332
+#: libexif/canon/mnote-canon-entry.c:329
 msgid "Sunny"
 msgstr "Slune�ný"
 
-#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
-#: libexif/olympus/mnote-olympus-entry.c:139
+#: libexif/canon/mnote-canon-entry.c:330 libexif/canon/mnote-canon-entry.c:402
+#: libexif/exif-entry.c:719 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Obla�ný"
 
-#: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/canon/mnote-canon-entry.c:331 libexif/canon/mnote-canon-entry.c:403
+#: libexif/exif-entry.c:716 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/canon/mnote-canon-entry.c:332 libexif/canon/mnote-canon-entry.c:404
+#: libexif/exif-entry.c:715 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Světélkující"
 
-#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
+#: libexif/exif-entry.c:717 libexif/exif-entry.c:759 libexif/exif-tag.c:577
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Blesk"
 
-#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
+#: libexif/exif-entry.c:720 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Stín"
 
-#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
+#: libexif/canon/mnote-canon-entry.c:337 libexif/canon/mnote-canon-entry.c:409
 msgid "Manual temperature (Kelvin)"
 msgstr "Ru�ní teplota (Kelvin)"
 
-#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
 msgid "PC set 1"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
+#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
 msgid "PC set 2"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
+#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "PC set 3"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+#: libexif/exif-entry.c:721 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Světélkující denní světlo"
 
-#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
+#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "Custom 1"
 msgstr "Uživatelský 1"
 
-#: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
+#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "Custom 2"
 msgstr "Uživatelský 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:346 libexif/exif-entry.c:672
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1099,184 +1084,184 @@ msgstr "Uživatelský 2"
 msgid "Night scene"
 msgstr "No�ní scéna"
 
-#: libexif/canon/mnote-canon-entry.c:355
+#: libexif/canon/mnote-canon-entry.c:352
 msgid "Center-right"
 msgstr "Uprostřed - vpravo"
 
-#: libexif/canon/mnote-canon-entry.c:357
+#: libexif/canon/mnote-canon-entry.c:354
 msgid "Left-right"
 msgstr "Zleva doprava"
 
-#: libexif/canon/mnote-canon-entry.c:358
+#: libexif/canon/mnote-canon-entry.c:355
 msgid "Left-center"
 msgstr "Vlevo - uprostřed"
 
-#: libexif/canon/mnote-canon-entry.c:359
+#: libexif/canon/mnote-canon-entry.c:356
 msgid "All"
 msgstr "VÅ¡e"
 
-#: libexif/canon/mnote-canon-entry.c:361
+#: libexif/canon/mnote-canon-entry.c:358
 msgid "On (shot 1)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:362
+#: libexif/canon/mnote-canon-entry.c:359
 msgid "On (shot 2)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:363
+#: libexif/canon/mnote-canon-entry.c:360
 msgid "On (shot 3)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:365
+#: libexif/canon/mnote-canon-entry.c:362
 msgid "EOS high-end"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:366
+#: libexif/canon/mnote-canon-entry.c:363
 msgid "Compact"
 msgstr "Kompakt"
 
-#: libexif/canon/mnote-canon-entry.c:367
+#: libexif/canon/mnote-canon-entry.c:364
 msgid "EOS mid-range"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:369
+#: libexif/canon/mnote-canon-entry.c:366
 msgid "Rotate 90 CW"
 msgstr "Oto�it vpravo o 90st."
 
-#: libexif/canon/mnote-canon-entry.c:370
+#: libexif/canon/mnote-canon-entry.c:367
 msgid "Rotate 180"
 msgstr "Oto�it o 180st."
 
-#: libexif/canon/mnote-canon-entry.c:371
+#: libexif/canon/mnote-canon-entry.c:368
 msgid "Rotate 270 CW"
 msgstr "Oto�it vlevo o 90st."
 
-#: libexif/canon/mnote-canon-entry.c:372
+#: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotated by software"
 msgstr "Oto�eno programově"
 
-#: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/canon/mnote-canon-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:606
 msgid "Left to right"
 msgstr "Zleva doprava"
 
-#: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/canon/mnote-canon-entry.c:382
+#: libexif/olympus/mnote-olympus-entry.c:609
 msgid "Right to left"
 msgstr "Zprava doleva"
 
-#: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/canon/mnote-canon-entry.c:383
+#: libexif/olympus/mnote-olympus-entry.c:612
 msgid "Bottom to top"
 msgstr "Zdola nahoru"
 
-#: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/canon/mnote-canon-entry.c:384
+#: libexif/olympus/mnote-olympus-entry.c:615
 msgid "Top to bottom"
 msgstr "Shora dolu"
 
-#: libexif/canon/mnote-canon-entry.c:388
+#: libexif/canon/mnote-canon-entry.c:385
 msgid "2x2 matrix (clockwise)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
-#: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/canon/mnote-canon-entry.c:391 libexif/canon/mnote-canon-entry.c:397
+#: libexif/canon/mnote-canon-entry.c:418 libexif/canon/mnote-canon-entry.c:428
+#: libexif/exif-entry.c:671 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
-#: libexif/olympus/mnote-olympus-entry.c:230
+#: libexif/olympus/mnote-olympus-entry.c:227
 msgid "Standard"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:397
+#: libexif/canon/mnote-canon-entry.c:394
 msgid "N/A"
 msgstr "Není k dispozici"
 
-#: libexif/canon/mnote-canon-entry.c:398
+#: libexif/canon/mnote-canon-entry.c:395
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#: libexif/canon/mnote-canon-entry.c:402
+#: libexif/canon/mnote-canon-entry.c:399
 msgid "Highest"
 msgstr "Nejvyšší"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
+#: libexif/canon/mnote-canon-entry.c:401 libexif/exif-entry.c:714
 #: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/olympus/mnote-olympus-entry.c:133
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
 msgstr "Denní světlo"
 
-#: libexif/canon/mnote-canon-entry.c:422
+#: libexif/canon/mnote-canon-entry.c:419
 msgid "Set 1"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:423
+#: libexif/canon/mnote-canon-entry.c:420
 msgid "Set 2"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:424
+#: libexif/canon/mnote-canon-entry.c:421
 msgid "Set 3"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:425
+#: libexif/canon/mnote-canon-entry.c:422
 msgid "User def. 1"
 msgstr "Uživatelsky definovaný 1"
 
-#: libexif/canon/mnote-canon-entry.c:426
+#: libexif/canon/mnote-canon-entry.c:423
 msgid "User def. 2"
 msgstr "Uživatelsky definovaný 2"
 
-#: libexif/canon/mnote-canon-entry.c:427
+#: libexif/canon/mnote-canon-entry.c:424
 msgid "User def. 3"
 msgstr "Uživatelsky definovaný 3"
 
-#: libexif/canon/mnote-canon-entry.c:428
+#: libexif/canon/mnote-canon-entry.c:425
 msgid "External 1"
 msgstr "Přídavný 1"
 
-#: libexif/canon/mnote-canon-entry.c:429
+#: libexif/canon/mnote-canon-entry.c:426
 msgid "External 2"
 msgstr "Přídavný 2"
 
-#: libexif/canon/mnote-canon-entry.c:430
+#: libexif/canon/mnote-canon-entry.c:427
 msgid "External 3"
 msgstr "Přídavný 3"
 
-#: libexif/canon/mnote-canon-entry.c:435
+#: libexif/canon/mnote-canon-entry.c:432
 msgid "Faithful"
 msgstr "Věrný"
 
-#: libexif/canon/mnote-canon-entry.c:436
-#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/canon/mnote-canon-entry.c:433
+#: libexif/olympus/mnote-olympus-entry.c:115
 msgid "Monochrome"
 msgstr "Černobílý"
 
-#: libexif/canon/mnote-canon-entry.c:494
+#: libexif/canon/mnote-canon-entry.c:491
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:621
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:645
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:655 libexif/exif-entry.c:1064
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:667
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
@@ -1295,7 +1280,7 @@ msgid "Settings (Second Part)"
 msgstr "Nastavení (druhá �ást)"
 
 #: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/olympus/mnote-olympus-entry.c:595
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1636,702 +1621,654 @@ msgstr "EXIF marker nebyl nalezen."
 msgid "EXIF header not found."
 msgstr "Hlavi�ka dat EXIF nebyla nalezena."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:884
 msgid "Unknown encoding."
 msgstr "Neznámé kódování"
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1168
 msgid "Ignore unknown tags"
 msgstr "Ignorovat neznámé zna�ky"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1169
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Ignorovat neznámé zna�ky při na�ítání EXIF dat."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1170
 msgid "Follow specification"
 msgstr "Dodržovat specifikaci"
 
-#: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
-"Dodržovat specifikaci EXIF dat pomocí přidání, opravení nebo odstranění "
-"položek."
+#: libexif/exif-data.c:1171
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Dodržovat specifikaci EXIF dat pomocí přidání, opravení nebo odstranění položek."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1173
 msgid "Do not change maker note"
 msgstr "Neměnit maker note"
 
-#: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
-"Neměnit maker note při na�ítání a ukládání dat Exif. Konzistence maker note "
-"tak ale může být poškozena."
+#: libexif/exif-data.c:1174
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Neměnit maker note při na�ítání a ukládání dat Exif. Konzistence maker note tak ale může být poškozena."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
-"Zna�ka '%s' měla typ '%s', což odporovalo specifikaci, proto byla změněna na "
-"typ '%s'."
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Zna�ka '%s' měla typ '%s', což odporovalo specifikaci, proto byla změněna na typ '%s'."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
-"Zna�ka '%s' má typ '%s', což odporuje specifikaci, ale nemuže být změněna na "
-"typ '%s'."
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Zna�ka '%s' má typ '%s', což odporuje specifikaci, ale nemuže být změněna na typ '%s'."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
-"Zna�ka 'Komentář' měla špatný typ '%s', proto byla změněna na typ "
-"'nedefinováno'."
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Zna�ka 'Komentář' měla špatný typ '%s', proto byla změněna na typ 'nedefinováno'."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
-"Zna�ka 'Komentář' byla zvětšena na alespoň 8 bajtů, aby odpovídala "
-"specifikaci."
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Zna�ka 'Komentář' byla zvětšena na alespoň 8 bajtů, aby odpovídala specifikaci."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
-"Zna�ka 'Komentář' nebyla prázdná a ani neza�ínala identifikátorem typu, což "
-"bylo nyní spraveno."
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Zna�ka 'Komentář' nebyla prázdná a ani neza�ínala identifikátorem typu, což bylo nyní spraveno."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
-"Zna�ka 'Komentář' neza�ínala identifikátorem typu, což nyní bylo spraveno."
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Zna�ka 'Komentář' neza�ínala identifikátorem typu, což nyní bylo spraveno."
 
 #: libexif/exif-entry.c:462
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i bajtů neznámých dat"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:589
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i bajtů dat neznámého typu"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:622
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr "Zna�ka '%s' obsahuje data špatného typu ('%s', o�ekáváno '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:635
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr "Zna�ka '%s' obsahuje špatný po�et položek (%i, o�ekáváno %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:649
 msgid "Chunky format"
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:649
 msgid "Planar format"
 msgstr ""
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
+#: libexif/exif-entry.c:651 libexif/exif-entry.c:743
 #: test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Nedefinováno"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:651
 msgid "One-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:652
 msgid "Two-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:652
 msgid "Three-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:653
 msgid "Color sequential area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:653
 msgid "Trilinear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:654
 msgid "Color sequential linear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Nahoře vlevo"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Nahoře vpravo"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Dole vpravo"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Dole vlevo"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:657
 msgid "Left-top"
 msgstr "Vlevo nahoře"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:657
 msgid "Right-top"
 msgstr "Vpravo nahoře"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:658
 msgid "Right-bottom"
 msgstr "Vpravo dole"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:658
 msgid "Left-bottom"
 msgstr "Vlevo dole"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:660
 msgid "Centered"
 msgstr "Uprostřed"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:660
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:662
 msgid "Reversed mono"
 msgstr "Negativní �ernobílý"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:662
 msgid "Normal mono"
 msgstr "Černobílý"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:662
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:662
 msgid "Palette"
 msgstr "Paleta"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:663
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:663
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:663
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:665
 msgid "Normal process"
 msgstr ""
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:665
 msgid "Custom process"
 msgstr ""
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:667
 msgid "Auto exposure"
 msgstr "Automatická expozice"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:667 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Ru�ní expozice"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:667
 msgid "Auto bracket"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:669
 msgid "Auto white balance"
 msgstr "Automatické vyvážení bílé"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:669
 msgid "Manual white balance"
 msgstr "Ru�ní vyvážení bílé"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:674
 msgid "Low gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:674
 msgid "High gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:675
 msgid "Low gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:675
 msgid "High gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:677
 msgid "Low saturation"
 msgstr "Nízká sytost"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:677 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Vysoká sytost"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:678 libexif/exif-entry.c:679
 #: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
-#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:205
+#: libexif/olympus/mnote-olympus-entry.c:214
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:678 libexif/exif-entry.c:679
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
-#: libexif/olympus/mnote-olympus-entry.c:207
-#: libexif/olympus/mnote-olympus-entry.c:215
+#: libexif/olympus/mnote-olympus-entry.c:204
+#: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/pentax/mnote-pentax-entry.c:107
 msgid "Hard"
 msgstr ""
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:695 libexif/exif-entry.c:713 libexif/exif-entry.c:795
+#: libexif/olympus/mnote-olympus-entry.c:589
+#: libexif/olympus/mnote-olympus-entry.c:683
+#: libexif/olympus/mnote-olympus-entry.c:738
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:696
 msgid "Avg"
 msgstr "Průměrný"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:697
 msgid "Center-weight"
 msgstr "Uprostřed - vpravo"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:699
 msgid "Multi spot"
 msgstr "Vícenásobný"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:700
 msgid "Pattern"
 msgstr "Vzorkování"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:705
 msgid "Uncompressed"
 msgstr "Nekomprimováno"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:706
 msgid "LZW compression"
 msgstr "Komprese LZW"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:707 libexif/exif-entry.c:708
 msgid "JPEG compression"
 msgstr "Komprese JPEG"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:709
 msgid "Deflate/ZIP compression"
 msgstr "Komprese Deflate/ZIP"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:710
 msgid "PackBits compression"
 msgstr "Komprese PackBits"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:716
 msgid "Tungsten incandescent light"
 msgstr ""
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:718
 msgid "Fine weather"
 msgstr "Pěkné po�así"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:719
 msgid "Cloudy weather"
 msgstr "Obla�né po�así"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:722 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:723
 msgid "Cool white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:724 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:725
 msgid "Standard light A"
 msgstr "Standardní světlo A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:726
 msgid "Standard light B"
 msgstr "Standardní světlo B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:727
 msgid "Standard light C"
 msgstr "Standardní světlo C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:728
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:729
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:730
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:731
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:735 libexif/exif-entry.c:739
 msgid "Inch"
 msgstr "Palec"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:735 libexif/exif-entry.c:739
 msgid "in"
 msgstr "palec"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "Centimeter"
 msgstr "cm"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:745
 msgid "Normal program"
 msgstr "Normální program"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:746
 msgid "Aperture priority"
 msgstr "S předvolbou clony"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:746 libexif/exif-tag.c:550
 msgid "Aperture"
 msgstr "Clona"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:747
 msgid "Shutter priority"
 msgstr ""
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:747
 msgid "Shutter"
 msgstr "Clona"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:748
 msgid "Creative program (biased toward depth of field)"
 msgstr ""
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:749
 msgid "Creative"
 msgstr ""
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:750
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr ""
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:751
 msgid "Action"
 msgstr ""
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:752
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "Režim na šířku (pro focení na blízko, bez důrazu na objekty v pozadí)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:754
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Režim na výšku (pro focení na dálku, s důrazem na pozadí)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
-#: libexif/olympus/mnote-olympus-entry.c:100
+#: libexif/exif-entry.c:758 libexif/exif-entry.c:763
+#: libexif/olympus/mnote-olympus-entry.c:97
 msgid "Flash did not fire"
 msgstr "Blesk nebleskl"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:758
 msgid "No flash"
 msgstr "Bez blesku"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:759
 msgid "Flash fired"
 msgstr "Blesk bleskl"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
-#: libexif/olympus/mnote-olympus-entry.c:178
-#: libexif/olympus/mnote-olympus-entry.c:212
-#: libexif/olympus/mnote-olympus-entry.c:221
-#: libexif/olympus/mnote-olympus-entry.c:244
+#: libexif/exif-entry.c:759 libexif/olympus/mnote-olympus-entry.c:170
+#: libexif/olympus/mnote-olympus-entry.c:175
+#: libexif/olympus/mnote-olympus-entry.c:209
+#: libexif/olympus/mnote-olympus-entry.c:218
+#: libexif/olympus/mnote-olympus-entry.c:241
 msgid "Yes"
 msgstr "Ano"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:760
 msgid "Strobe return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:760
 msgid "Without strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:762
 msgid "Strobe return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:762
 msgid "With strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:764
 msgid "Flash fired, compulsory flash mode"
 msgstr "Blesk bleskl, blesk zapnut"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:765
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr "Blesk bleskl, blesk zapnut, odraz světla nedetekován"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:767
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr "Blesk bleskl, blesk zapnut, odraz světla detekován"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:769
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "Blesk nebleskl, blesk zapnut"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:770
 msgid "Flash did not fire, auto mode"
 msgstr "Blesk nebleskl, automatický režim"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:771
 msgid "Flash fired, auto mode"
 msgstr "Blesk bleskl, automatický režim"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:772
 msgid "Flash fired, auto mode, return light not detected"
 msgstr "Blesk bleskl, automatický režim, odraz světla nedetekován"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:774
 msgid "Flash fired, auto mode, return light detected"
 msgstr "Blesk bleskl, automatický režim, odraz světla detekován"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:775
 msgid "No flash function"
 msgstr "Bez blesku"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:776
 msgid "Flash fired, red-eye reduction mode"
 msgstr "Blesk bleskl, režim redukce �ervených o�í"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:777
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr "Blesk bleskl, režim redukce �ervených o�í, odraz světla nedetekován"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:779
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr "Blesk bleskl, režim redukce �ervených o�í, odraz světla detekován"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:781
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "Blesk bleskl, blesk zapnut, režim redukce �ervených o�í"
 
-#: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"Blesk bleskl, blesk zapnut, režim redukce �ervených o�í, odraz světla "
-"nedetekován"
+#: libexif/exif-entry.c:783
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "Blesk bleskl, blesk zapnut, režim redukce �ervených o�í, odraz světla nedetekován"
 
-#: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"Blesk bleskl, blesk zapnut, režim redukce �ervených o�í, odraz světla "
-"detekován"
+#: libexif/exif-entry.c:785
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "Blesk bleskl, blesk zapnut, režim redukce �ervených o�í, odraz světla detekován"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:787
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr "Blesk nebleskl, automatický režim, režim redukce �ervených o�í"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:788
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "Blesk bleskl, automatický režim, režim redukce �ervených o�í"
 
-#: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"Blesk bleskl, automatický režim, režim redukce �ervených o�í, odraz světla "
-"nedetekován"
+#: libexif/exif-entry.c:789
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "Blesk bleskl, automatický režim, režim redukce �ervených o�í, odraz světla nedetekován"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"Blesk bleskl, automatický režim, režim redukce �ervených o�í, odraz světla "
-"detekován"
+msgstr "Blesk bleskl, automatický režim, režim redukce �ervených o�í, odraz světla detekován"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:795
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:797
 msgid "Close view"
 msgstr "Blízký pohled"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:798
 msgid "Distant view"
 msgstr "Vzdálený pohled"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:798
 msgid "Distant"
 msgstr "Vzdáleno"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:801
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:802
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:803
 msgid "Uncalibrated"
 msgstr "Nekalibrovaný"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:857
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Chybná velikost položky (%i, o�ekáváno %li x %i)"
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:890
 msgid "Unsupported UNICODE string"
 msgstr "Nepodporovaný text v Unicode"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:898
 msgid "Unsupported JIS string"
 msgstr "Nepodporaovný text v kódování JIS"
 
-#: libexif/exif-entry.c:935
-#, fuzzy
-msgid "Tag UserComment contains data but is against specification."
-msgstr ""
-"Zna�ka 'Komentář' byla zvětšena na alespoň 8 bajtů, aby odpovídala "
-"specifikaci."
+#: libexif/exif-entry.c:914
+msgid "Tag UserComment does not comply with standard but contains data."
+msgstr "Zna�ka Komentář neodpovídá specifikaci, avšak obsahuje data."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:918
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Bajt na pozici %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:927
 msgid "Unknown Exif Version"
 msgstr "Neznámá verze Exif"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:931
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif verze %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:942
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix verze 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:944
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix verze 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:946
 msgid "Unknown FlashPix Version"
 msgstr "Neznámá verze FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:959 libexif/exif-entry.c:972 libexif/exif-entry.c:1628
+#: libexif/exif-entry.c:1633 libexif/exif-entry.c:1637
+#: libexif/exif-entry.c:1642 libexif/exif-entry.c:1643
 msgid "[None]"
 msgstr "[Žádný]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:961
 msgid "(Photographer)"
 msgstr "(Fotograf)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:975
 msgid "(Editor)"
 msgstr "(Editor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:999 libexif/exif-entry.c:1079
+#: libexif/exif-entry.c:1096 libexif/exif-entry.c:1140
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1000
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1034
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35 ekvivalent: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1067 libexif/exif-entry.c:1068
 msgid " sec."
 msgstr " s"
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1082
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d s)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1084
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d s)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1097
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1107
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
+#: libexif/exif-entry.c:1109 libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1236 libexif/exif-entry.c:1287
+#: libexif/exif-entry.c:1296 libexif/exif-entry.c:1332
 #: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
 #: libexif/pentax/mnote-pentax-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:359
@@ -2339,74 +2276,74 @@ msgstr "DSC"
 msgid "Internal error (unknown value %i)"
 msgstr "Vnitřní chyba (neznámá hodnota %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1117
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1118
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1119
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1120
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1121
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1122
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1123
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1124
 msgid "Reserved"
 msgstr "Rezervováno"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1147
 msgid "Directly photographed"
 msgstr "Přímo fotografováno"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1160
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1162
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1179
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "Do vzdálenosti %d od (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1188
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "V obdélníku (šířka %i, výška %i) okolo (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1194
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Neo�ekávaný po�et položek (%li, o�ekáváno 2, 3 nebo 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1232
 msgid "Sea level"
 msgstr ""
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1234
 msgid "Sea level reference"
 msgstr ""
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1342
 #, c-format
 msgid "Unknown value %i"
 msgstr "Neznámá hodnota %i"
@@ -2497,11 +2434,7 @@ msgid "GPS Tag Version"
 msgstr "Verze zna�ky GPS"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
 #: libexif/exif-tag.c:69
@@ -2509,11 +2442,7 @@ msgid "Interoperability Index"
 msgstr ""
 
 #: libexif/exif-tag.c:70
-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."
+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 ""
 
 #: libexif/exif-tag.c:76
@@ -2521,12 +2450,8 @@ msgid "North or South Latitude"
 msgstr "Směr zeměpisné šířky"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
-"Ur�uje, zda zeměpisná šířka je severní nebo jižní. Znak 'N' ur�uje severní "
-"šířku, znak 'S' ur�uje jižní šířku."
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Ur�uje, zda zeměpisná šířka je severní nebo jižní. Znak 'N' ur�uje severní šířku, znak 'S' ur�uje jižní šířku."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
@@ -2537,12 +2462,7 @@ msgid "Latitude"
 msgstr "Zeměpisná šířka"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:91
@@ -2550,24 +2470,15 @@ msgid "East or West Longitude"
 msgstr "Směr zeměpisné délky"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
-"Ur�uje, zda zeměpisná délka je západní nebo východní. Znak 'W' ur�uje "
-"západní délku, znak 'E' ur�uje východní délku."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Ur�uje, zda zeměpisná délka je západní nebo východní. Znak 'W' ur�uje západní délku, znak 'E' ur�uje východní délku."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
 msgstr "Zeměpisná délka"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:103
@@ -2575,12 +2486,7 @@ msgid "Altitude Reference"
 msgstr ""
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
+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 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."
 msgstr ""
 
 #: libexif/exif-tag.c:110
@@ -2588,9 +2494,7 @@ msgid "Altitude"
 msgstr ""
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
 #: libexif/exif-tag.c:114
@@ -2598,9 +2502,7 @@ msgid "GPS Time (Atomic Clock)"
 msgstr "Čas GPS (atomový �as)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
 #: libexif/exif-tag.c:118
@@ -2608,12 +2510,7 @@ msgid "GPS Satellites"
 msgstr ""
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
+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, 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 shall be set to NULL."
 msgstr ""
 
 #: libexif/exif-tag.c:125
@@ -2621,10 +2518,7 @@ msgid "GPS Receiver Status"
 msgstr ""
 
 #: libexif/exif-tag.c:126
-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."
+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 ""
 
 #: libexif/exif-tag.c:129
@@ -2632,9 +2526,7 @@ msgid "GPS Measurement Mode"
 msgstr "Režim měření GPS"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
 #: libexif/exif-tag.c:133
@@ -2642,10 +2534,7 @@ msgid "Measurement Precision"
 msgstr "Přesnost měření"
 
 #: libexif/exif-tag.c:134
-msgid ""
-"Indicates the GPS DOP (data degree of precision). An HDOP value is written "
-"during two-dimensional measurement, and PDOP during three-dimensional "
-"measurement."
+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 ""
 
 #: libexif/exif-tag.c:137
@@ -2653,12 +2542,8 @@ msgid "Speed Unit"
 msgstr "Jednotka rychlosti"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
-"Jednotka použitá pro rychlost pohybu GPS přijíma�e. Písmena 'K', 'M' a 'N' "
-"udávají kilometry za hodinu, míle za hodinu, resp. uzly."
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Jednotka použitá pro rychlost pohybu GPS přijíma�e. Písmena 'K', 'M' a 'N' udávají kilometry za hodinu, míle za hodinu, resp. uzly."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
@@ -2673,9 +2558,7 @@ msgid "Reference for direction of movement"
 msgstr ""
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
 #: libexif/exif-tag.c:147
@@ -2683,9 +2566,7 @@ msgid "Direction of Movement"
 msgstr "Směr pohybu"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
 msgstr "Směr pohybu GPS přijíma�e. Rozsah hodnot je 0 až 359,99."
 
 #: libexif/exif-tag.c:150
@@ -2693,9 +2574,7 @@ msgid "GPS Image Direction Reference"
 msgstr ""
 
 #: libexif/exif-tag.c:151
-msgid ""
-"Indicates the reference for giving the direction of the image when it is "
-"captured. 'T' denotes true direction and 'M' is magnetic direction."
+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 ""
 
 #: libexif/exif-tag.c:153
@@ -2703,9 +2582,7 @@ msgid "GPS Image Direction"
 msgstr "Směr obrazu GPS"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
 msgstr ""
 
 #: libexif/exif-tag.c:156
@@ -2713,11 +2590,7 @@ msgid "Geodetic Survey Data Used"
 msgstr ""
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
 msgstr ""
 
 #: libexif/exif-tag.c:161
@@ -2725,26 +2598,15 @@ msgid "Reference For Latitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:162
-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 ""
-"Ur�uje, zda zeměpisná šířka je severní nebo jižní. Znak 'N' ur�uje severní "
-"šířku, znak 'S' ur�uje jižní šířku."
+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 "Ur�uje, zda zeměpisná šířka je severní nebo jižní. Znak 'N' ur�uje severní šířku, znak 'S' ur�uje jižní šířku."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:173
@@ -2752,25 +2614,15 @@ msgid "Reference for Longitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:174
-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 ""
-"Ur�uje, zda zeměpisná délka je západní nebo východní. Znak 'W' ur�uje "
-"západní délku, znak 'E' ur�uje východní délku."
+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 "Ur�uje, zda zeměpisná délka je západní nebo východní. Znak 'W' ur�uje západní délku, znak 'E' ur�uje východní délku."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:186
@@ -2778,9 +2630,7 @@ msgid "Reference for Bearing of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
 #: libexif/exif-tag.c:190
@@ -2788,9 +2638,7 @@ msgid "Bearing of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
 msgstr ""
 
 #: libexif/exif-tag.c:193
@@ -2798,13 +2646,8 @@ msgid "Reference for Distance to Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:194
-#, fuzzy
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and knots."
 msgstr ""
-"Jednotka použitá pro rychlost pohybu GPS přijíma�e. Písmena 'K', 'M' a 'N' "
-"udávají kilometry za hodinu, míle za hodinu, resp. uzly."
 
 #: libexif/exif-tag.c:197
 msgid "Distance to Destination"
@@ -2819,11 +2662,7 @@ msgid "Name of GPS Processing Method"
 msgstr ""
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
+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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
 #: libexif/exif-tag.c:205
@@ -2831,10 +2670,7 @@ msgid "Name of GPS Area"
 msgstr ""
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
+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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
 #: libexif/exif-tag.c:210
@@ -2842,10 +2678,7 @@ msgid "GPS Date"
 msgstr ""
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
 msgstr ""
 
 #: libexif/exif-tag.c:215
@@ -2853,11 +2686,20 @@ msgid "GPS Differential Correction"
 msgstr ""
 
 #: libexif/exif-tag.c:216
-msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+msgid "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
@@ -2870,66 +2712,40 @@ msgid "Image Width"
 msgstr "Šířka obrázku"
 
 #: libexif/exif-tag.c:223
-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 ""
-"Po�et sloupe�ků v obrázku, neboli po�et pixelů na řádek. V komprimovaných "
-"datech typu JPEG se používá speciální JPEG marker místo této zna�ky."
+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 "Po�et sloupe�ků v obrázku, neboli po�et pixelů na řádek. V komprimovaných datech typu JPEG se používá speciální JPEG marker místo této zna�ky."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
 msgstr "Výška obrázku"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"Po�et řádků v obrázku. V komprimovaných datech typu JPEG se používá "
-"speciální JPEG marker místo této zna�ky."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Po�et řádků v obrázku. V komprimovaných datech typu JPEG se používá speciální JPEG marker místo této zna�ky."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
 msgstr "Po�et bitů na komponentu"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
-"Po�et bitů na jednu barevnou složku. Pro digitální fotografie se obvykle "
-"používá 8 bitů. Viz též 'Po�et komponent'. V komprimovaných datech typu JPEG "
-"se používá speciální JPEG marker místo této zna�ky."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Po�et bitů na jednu barevnou složku. Pro digitální fotografie se obvykle používá 8 bitů. Viz též 'Po�et komponent'. V komprimovaných datech typu JPEG se používá speciální JPEG marker místo této zna�ky."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Komprese"
 
 #: libexif/exif-tag.c:238
-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é pro obrazoví data. Pokud primární obrázek je JPEG, "
-"pak se tato zna�ka pro něj nepoužívá, neboť nemá význam. Nicméně se používá "
-"pro náhled, který obvykle bývá komprimován také metodou JPEG."
+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é pro obrazoví data. Pokud primární obrázek je JPEG, pak se tato zna�ka pro něj nepoužívá, neboť nemá význam. Nicméně se používá pro náhled, který obvykle bývá komprimován také metodou JPEG."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
 msgstr "Interpretace barev"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
-"Ur�uje barevný model obrázku nebo sadu inkoustů pro tisk. Např. RGB, CMYK, "
-"CieLAB. V komprimovaných datech typu JPEG se používá speciální JPEG marker "
-"místo této zna�ky."
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Ur�uje barevný model obrázku nebo sadu inkoustů pro tisk. Např. RGB, CMYK, CieLAB. V komprimovaných datech typu JPEG se používá speciální JPEG marker místo této zna�ky."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
@@ -2944,53 +2760,31 @@ msgid "Image Description"
 msgstr "Popis obrázku"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
-"Textový komentář popisující obrázek, např. \"firemní ve�írek\". Vícebajtové "
-"znakové sady (�ínština, japonština, korejština) zde nemohou být použity, pro "
-"ně je ur�ena soukromá EXIF zna�ka 'Komentář uživatele'."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "Textový komentář popisující obrázek, např. \"firemní ve�írek\". Vícebajtové znakové sady (�ínština, japonština, korejština) zde nemohou být použity, pro ně je ur�ena soukromá EXIF zna�ka 'Komentář uživatele'."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Výrobce"
 
 #: libexif/exif-tag.c:261
-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 ""
-"Výrobce zařízení, které zaznamenalo obrazová data. Tj. výrobce fotoaparátu, "
-"skeneru, digitizéru apod. Je-li tato položka prázdná, pak je výrobce neznámý."
+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 "Výrobce zařízení, které zaznamenalo obrazová data. Tj. výrobce fotoaparátu, skeneru, digitizéru apod. Je-li tato položka prázdná, pak je výrobce neznámý."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr ""
 
 #: libexif/exif-tag.c:268
-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 ""
-"Model nebo typová řada zařízení, které zaznamenalo obrazová data. Tj. "
-"výrobce fotoaparátu, skeneru, digitizéru apod. Je-li tato položka prázdná, "
-"pak je výrobce neznámý."
+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 "Model nebo typová řada zařízení, které zaznamenalo obrazová data. Tj. výrobce fotoaparátu, skeneru, digitizéru apod. Je-li tato položka prázdná, pak je výrobce neznámý."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
 msgstr "Pozice pásů v souboru"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
 #: libexif/exif-tag.c:280
@@ -2999,115 +2793,70 @@ msgstr "Orientace"
 
 #: libexif/exif-tag.c:281
 msgid "The image orientation viewed in terms of rows and columns."
-msgstr ""
-"Ur�uje, z kterého rohu a kterým směrem se má obrázek vykreslovat při "
-"postupném �tení ze souboru."
+msgstr "Ur�uje, z kterého rohu a kterým směrem se má obrázek vykreslovat při postupném �tení ze souboru."
 
 #: libexif/exif-tag.c:284
 msgid "Samples per Pixel"
 msgstr "Po�et komponent"
 
 #: libexif/exif-tag.c:285
-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 ""
-"Po�et barevných komponent na pixel. Pro digitální fotografie, jež se obvykle "
-"ukládájí v YCbCr nebo RGB barvách, je tato hodnota 3. Pro �ernobílé náhledy "
-"bývá 1. V komprimovaných datech typu JPEG se používá speciální JPEG marker "
-"místo této zna�ky."
+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 "Po�et barevných komponent na pixel. Pro digitální fotografie, jež se obvykle ukládájí v YCbCr nebo RGB barvách, je tato hodnota 3. Pro �ernobílé náhledy bývá 1. V komprimovaných datech typu JPEG se používá speciální JPEG marker místo této zna�ky."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
 msgstr "Po�et řádek na pás"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
-"Po�et řádků v jednom pásu (rows per strip). Pro snadnější manipulaci obvykle "
-"bývá obrázek rozdělen do pásů o stejné výšce, která je uvedena v této "
-"zna�ce. Viz též 'Strip offsets' a 'Po�et bajtů na pás'."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Po�et řádků v jednom pásu (rows per strip). Pro snadnější manipulaci obvykle bývá obrázek rozdělen do pásů o stejné výšce, která je uvedena v této zna�ce. Viz též 'Strip offsets' a 'Po�et bajtů na pás'."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
 msgstr "Po�et bajtů na pás"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
-"Po�ty bajtů v jednotlivých pásech (strip byte count), jak jsou "
-"(komprimované) uložené na disku. Údajů je tolik, kolik pásu. Díky kompresi "
-"se jednotlivé údaje mohou lišit."
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Po�ty bajtů v jednotlivých pásech (strip byte count), jak jsou (komprimované) uložené na disku. Údajů je tolik, kolik pásu. Díky kompresi se jednotlivé údaje mohou lišit."
 
 #: libexif/exif-tag.c:301
 msgid "X-Resolution"
 msgstr "Horizontální rozlišení"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
-"Po�et pixelů na 'Jednotku rozlišení' ve směru 'Šířka obrázku'. Je-li "
-"rozlišení neznámé, obvykle se použije hodnota 72 dpi (pixelů na palec)."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Po�et pixelů na 'Jednotku rozlišení' ve směru 'Šířka obrázku'. Je-li rozlišení neznámé, obvykle se použije hodnota 72 dpi (pixelů na palec)."
 
 #: libexif/exif-tag.c:306
 msgid "Y-Resolution"
 msgstr "Vertikální rozlišení"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"Po�et pixelů na 'Jednotku rozlišení' ve směru 'Výška obrázku'. Je-li "
-"rozlišení neznámé, obvykle se použije hodnota 72 dpi (pixelů na palec)."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Po�et pixelů na 'Jednotku rozlišení' ve směru 'Výška obrázku'. Je-li rozlišení neznámé, obvykle se použije hodnota 72 dpi (pixelů na palec)."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
 msgstr ""
 
 #: libexif/exif-tag.c:312
-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 ""
-"Ur�uje, jakým způsobem jsou jednotlivé pixely a řádky uloženy, zda "
-"prokládaně �i nikoli. Bu� mohou být všechny komponenty jednoho pixelu "
-"uloženy vedle (RGBRGBRGB) sebe nebo naopak 1 komponenta všech pixelů celého "
-"řádku vedle sebe následována další komponentou všech pixelů celého řádku "
-"(RRRGGGBBB)."
+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 "Ur�uje, jakým způsobem jsou jednotlivé pixely a řádky uloženy, zda prokládaně �i nikoli. Bu� mohou být všechny komponenty jednoho pixelu uloženy vedle (RGBRGBRGB) sebe nebo naopak 1 komponenta všech pixelů celého řádku vedle sebe následována další komponentou všech pixelů celého řádku (RRRGGGBBB)."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "Jednotka rozlišení"
 
 #: libexif/exif-tag.c:318
-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 ""
-"Jednotka pro hodnoty 'Horizontální rozlišení' a 'Vertikální rozlišení'. Není-"
-"li jednotka specifikována, použije se hodnota palec (inch)."
+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 "Jednotka pro hodnoty 'Horizontální rozlišení' a 'Vertikální rozlišení'. Není-li jednotka specifikována, použije se hodnota palec (inch)."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
 msgstr "Přechodová funkce"
 
 #: libexif/exif-tag.c:324
-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>)."
+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 ""
 
 #: libexif/exif-tag.c:328
@@ -3115,38 +2864,23 @@ msgid "Software"
 msgstr "Software"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
-"Udává software (nebo firmware zařízení) a jeho verzi, které soubor "
-"vygenerovalo. Formát tohoto údaje je zcela libovolný. Prázdný údaj znamená, "
-"že není známo."
+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 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."
+msgstr "Udává software (nebo firmware zařízení) a jeho verzi, které soubor vygenerovalo. Formát tohoto údaje je zcela libovolný. Prázdný údaj znamená, že není známo."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Datum a �as"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"Datum a �as vytvoření obrázku. Standard EXIF udává, že se jedná o okamžik "
-"poslední modifikace souboru."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "Datum a �as vytvoření obrázku. Standard EXIF udává, že se jedná o okamžik poslední modifikace souboru."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Umělec"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
@@ -3154,10 +2888,7 @@ msgid "White Point"
 msgstr "Bílý bod"
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
 msgstr ""
 
 #: libexif/exif-tag.c:353
@@ -3165,17 +2896,12 @@ msgid "Primary Chromaticities"
 msgstr ""
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
 msgstr ""
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
-"Definováno spole�ností Adobe pro umožnění TIFF hierarchií uvnitř souboru "
-"TIFF."
+msgstr "Definováno spole�ností Adobe pro umožnění TIFF hierarchií uvnitř souboru TIFF."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
@@ -3186,9 +2912,7 @@ msgid "JPEG Interchange Format"
 msgstr "JPEG Interchange Format"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
 msgstr ""
 
 #: libexif/exif-tag.c:372
@@ -3196,12 +2920,7 @@ msgid "JPEG Interchange Format Length"
 msgstr "Délka dat JPEG Interchange Format"
 
 #: libexif/exif-tag.c:373
-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."
+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 ""
 
 #: libexif/exif-tag.c:382
@@ -3209,12 +2928,7 @@ msgid "YCbCr Coefficients"
 msgstr "Koeficienty YCbCr"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
 msgstr ""
 
 #: libexif/exif-tag.c:392
@@ -3222,9 +2936,7 @@ msgid "YCbCr Sub-Sampling"
 msgstr ""
 
 #: libexif/exif-tag.c:393
-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."
+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 ""
 
 #: libexif/exif-tag.c:398
@@ -3232,18 +2944,7 @@ msgid "YCbCr Positioning"
 msgstr ""
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:414
@@ -3251,12 +2952,7 @@ msgid "Reference Black/White"
 msgstr ""
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
+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 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."
 msgstr ""
 
 #: libexif/exif-tag.c:423
@@ -3272,10 +2968,7 @@ msgid "CFA Pattern"
 msgstr "CFA Pattern"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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."
+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 ""
 
 #: libexif/exif-tag.c:443
@@ -3287,22 +2980,7 @@ msgid "Copyright"
 msgstr "Copyright"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
 msgstr ""
 
 #: libexif/exif-tag.c:467
@@ -3322,10 +3000,7 @@ msgid "Image Resources Block"
 msgstr ""
 
 #: libexif/exif-tag.c:477
-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."
+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 ""
 
 #: libexif/exif-tag.c:485
@@ -3333,22 +3008,15 @@ msgid "Exposure Program"
 msgstr "Program expozice"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"Typ programu použitého fotoaparátem pro nastavení expozice pro pořízení "
-"tohoto snímku."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "Typ programu použitého fotoaparátem pro nastavení expozice pro pořízení tohoto snímku."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
 msgstr ""
 
 #: libexif/exif-tag.c:491
-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."
+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 ""
 
 #: libexif/exif-tag.c:496
@@ -3356,9 +3024,7 @@ msgid "GPS Info IFD Pointer"
 msgstr ""
 
 #: libexif/exif-tag.c:497
-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."
+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 ""
 
 #: libexif/exif-tag.c:503
@@ -3366,9 +3032,7 @@ msgid "ISO Speed Ratings"
 msgstr ""
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
 msgstr ""
 
 #: libexif/exif-tag.c:507
@@ -3376,10 +3040,7 @@ msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
 msgstr ""
 
 #: libexif/exif-tag.c:513
@@ -3395,24 +3056,16 @@ msgid "Exif Version"
 msgstr "Verze Exif"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
-"Verze standardu, které odpovídá tento soubor. Chybějící ozna�ení verze by "
-"bylo v rozporu se standardem."
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "Verze standardu, které odpovídá tento soubor. Chybějící ozna�ení verze by bylo v rozporu se standardem."
 
 #: libexif/exif-tag.c:520
 msgid "Date and Time (Original)"
 msgstr "Datum a �as pořízení"
 
 #: libexif/exif-tag.c:521
-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 ""
-"Datum a �as, kdy byla vytvořena původní obrazová data. V případě digitálních "
-"fotografií se jedná o okamžik vyfotografování."
+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 "Datum a �as, kdy byla vytvořena původní obrazová data. V případě digitálních fotografií se jedná o okamžik vyfotografování."
 
 #: libexif/exif-tag.c:526
 msgid "Date and Time (Digitized)"
@@ -3427,13 +3080,7 @@ msgid "Components Configuration"
 msgstr ""
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
+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 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."
 msgstr ""
 
 #: libexif/exif-tag.c:541
@@ -3441,24 +3088,16 @@ msgid "Compressed Bits per Pixel"
 msgstr "Komprimované bity na pixel"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
-"Informace o vlastních komprimovaných datech. Udává kompresní poměr pro "
-"komprimovaná obrazová data jako přibližný po�et bitů na pixel."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Informace o vlastních komprimovaných datech. Udává kompresní poměr pro komprimovaná obrazová data jako přibližný po�et bitů na pixel."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Rychlost uzávěrky"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
-"Rychlost uzávěrky, uložená v jednotkách APEX (Additive System of "
-"Photographic Exposure)."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Rychlost uzávěrky, uložená v jednotkách APEX (Additive System of Photographic Exposure)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
@@ -3469,35 +3108,24 @@ msgid "Brightness"
 msgstr "Jas"
 
 #: libexif/exif-tag.c:554
-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 ""
-"Úroveň jasu, v jednotkách APEX. Obvykle se nachází v rozsahu -99,99 až 99,99."
+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 "Úroveň jasu, v jednotkách APEX. Obvykle se nachází v rozsahu -99,99 až 99,99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
 msgstr "Kompenzace expozice"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
-"Kompenzace expozice, v jednotkách APEX. Obvykle se nachází v rozsahu -99,99 "
-"až 99,99."
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "Kompenzace expozice, v jednotkách APEX. Obvykle se nachází v rozsahu -99,99 až 99,99."
 
 #: libexif/exif-tag.c:562
 msgid "Maximum Aperture Value"
 msgstr "Maximální clona"
 
 #: libexif/exif-tag.c:563
-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 ""
-"Nejmenší �íslo F �o�ek, v jednotkách APEX. Obvykle se nachází v rozsahu "
-"-99,99 až 99,99, ale není to podmínkou."
+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 "Nejmenší �íslo F �o�ek, v jednotkách APEX. Obvykle se nachází v rozsahu -99,99 až 99,99, ale není to podmínkou."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
@@ -3520,26 +3148,19 @@ msgid "The kind of light source."
 msgstr "Typ zdroje světla."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr "Tento údaj se zaznamenává při použití blesku."
 
 #: libexif/exif-tag.c:582
-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 ""
-"Skute�ná ohnisková vzdálenost �o�ek. Hodnota není přepo�tena pro fotoaparáty "
-"na 35mm film."
+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 "Skute�ná ohnisková vzdálenost �o�ek. Hodnota není přepo�tena pro fotoaparáty na 35mm film."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr ""
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
+msgid "This tag indicates the location and area of the main subject in the overall scene."
 msgstr "Udává pozici a velikost hlavního objektu ve fotografované scéně."
 
 #: libexif/exif-tag.c:590
@@ -3551,38 +3172,15 @@ msgid "Maker Note"
 msgstr "Maker note"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Do této sekce zapisují různí výrobci fotoaparátů různé doplňkové informace, "
-"které se mohou lišit i typ od typu fotoaparátu. Každý výrobce ukládá tyto "
-"informace jiným způsobem."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Do této sekce zapisují různí výrobci fotoaparátů různé doplňkové informace, které se mohou lišit i typ od typu fotoaparátu. Každý výrobce ukládá tyto informace jiným způsobem."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
 msgstr "Komentář"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
 msgstr ""
 
 #: libexif/exif-tag.c:619
@@ -3598,8 +3196,7 @@ msgid "Sub-second Time (Original)"
 msgstr "Zlomky vteřin �asu pořízení"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr "Zlomky sekundy z údaje 'Datum a �as pořízení'."
 
 #: libexif/exif-tag.c:629
@@ -3607,8 +3204,7 @@ msgid "Sub-second Time (Digitized)"
 msgstr "Zlomky vteřin �asu digitalizace"
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr "Zlomky sekundy z údaje 'Datum a �as digitalizace'."
 
 #: libexif/exif-tag.c:634
@@ -3624,8 +3220,7 @@ msgid "XP Comment"
 msgstr "Komentář (Windows)"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr "Text s komentářem k fotografii, uložený v Unicode."
 
 #: libexif/exif-tag.c:644
@@ -3633,9 +3228,7 @@ msgid "XP Author"
 msgstr "Autor (Windows)"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
 msgstr "Text se jménem autora fotografie, uložený v Unicode."
 
 #: libexif/exif-tag.c:649
@@ -3643,11 +3236,8 @@ msgid "XP Keywords"
 msgstr "Klí�ová slova (Windows)"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
-"Text s klí�ovými slovy vztahujícími se k fotografii, uložený v Unicode."
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "Text s klí�ovými slovy vztahujícími se k fotografii, uložený v Unicode."
 
 #: libexif/exif-tag.c:654
 msgid "XP Subject"
@@ -3666,12 +3256,7 @@ msgid "Color Space"
 msgstr "Barevný model"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
 #: libexif/exif-tag.c:670
@@ -3679,11 +3264,7 @@ msgid "Pixel X Dimension"
 msgstr ""
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
 msgstr ""
 
 #: libexif/exif-tag.c:677
@@ -3691,13 +3272,7 @@ msgid "Pixel Y Dimension"
 msgstr ""
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
+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, 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."
 msgstr ""
 
 #: libexif/exif-tag.c:688
@@ -3705,28 +3280,7 @@ msgid "Related Sound File"
 msgstr ""
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
 msgstr ""
 
 #: libexif/exif-tag.c:719
@@ -3734,12 +3288,7 @@ msgid "Interoperability IFD Pointer"
 msgstr ""
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:729
@@ -3747,9 +3296,7 @@ msgid "Flash Energy"
 msgstr "Energie blesku"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
 #: libexif/exif-tag.c:734
@@ -3757,10 +3304,7 @@ msgid "Spatial Frequency Response"
 msgstr ""
 
 #: libexif/exif-tag.c:735
-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."
+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 ""
 
 #: libexif/exif-tag.c:741
@@ -3768,9 +3312,7 @@ msgid "Focal Plane X-Resolution"
 msgstr "Horizontální rozlišení ohniskové roviny"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
 #: libexif/exif-tag.c:746
@@ -3778,9 +3320,7 @@ msgid "Focal Plane Y-Resolution"
 msgstr "Vertikální rozlišení ohniskové roviny"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
 #: libexif/exif-tag.c:751
@@ -3788,9 +3328,7 @@ msgid "Focal Plane Resolution Unit"
 msgstr "Jednotky rozlišení ohniskové roviny"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
 #: libexif/exif-tag.c:757
@@ -3798,12 +3336,7 @@ msgid "Subject Location"
 msgstr "Umístění objektu"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
 msgstr ""
 
 #: libexif/exif-tag.c:765
@@ -3811,9 +3344,7 @@ msgid "Exposure Index"
 msgstr ""
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
 msgstr ""
 
 #: libexif/exif-tag.c:769
@@ -3822,52 +3353,35 @@ msgstr ""
 
 #: libexif/exif-tag.c:770
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr ""
-"Udává typ obrazového senzoru na fotoaparátu resp. jiném vstupním zařízení."
+msgstr "Udává typ obrazového senzoru na fotoaparátu resp. jiném vstupním zařízení."
 
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Zdroj souboru"
 
 #: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"Ur�uje zdroj obrazových dat. Pro fotoaparáty (Digital Still Camera) se "
-"používá hodnota DSC."
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Ur�uje zdroj obrazových dat. Pro fotoaparáty (Digital Still Camera) se používá hodnota DSC."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
 msgstr "Typ scény"
 
 #: libexif/exif-tag.c:779
-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 ""
-"Ur�uje typ scény. Pokud obrázek byl vyfotografován, musí být hodnota 1 "
-"ur�ující, že obrázek byl pořízen fotografováním."
+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 "Ur�uje typ scény. Pokud obrázek byl vyfotografován, musí být hodnota 1 ur�ující, že obrázek byl pořízen fotografováním."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
 msgstr ""
 
 #: libexif/exif-tag.c:790
-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."
+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 ""
 
 #: libexif/exif-tag.c:796
-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 ""
-"Udává režim expozice při pořizování snímků. V režimu auto bracket fotoaparát "
-"pořizuje sekvenci snímků s různým nastavením expozice."
+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 "Udává režim expozice při pořizování snímků. V režimu auto bracket fotoaparát pořizuje sekvenci snímků s různým nastavením expozice."
 
 #: libexif/exif-tag.c:801
 msgid "This tag indicates the white balance mode set when the image was shot."
@@ -3878,39 +3392,24 @@ msgid "Digital Zoom Ratio"
 msgstr "Faktor digitálního zvětšení"
 
 #: libexif/exif-tag.c:806
-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 ""
-"Udává poměr digitálního zvětšení při pořízování snímku. Hodnota nula v "
-"�itateli znamená, že digitální zvětšení nebylo použito."
+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 "Udává poměr digitálního zvětšení při pořízování snímku. Hodnota nula v �itateli znamená, že digitální zvětšení nebylo použito."
 
 #: libexif/exif-tag.c:811
 msgid "Focal Length in 35mm Film"
 msgstr "Ohnisková vzdálenost pro 35mm film"
 
 #: libexif/exif-tag.c:812
-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 ""
-"Ohnisková vzdálenost přepo�tená pro fotoaparáty na 35mm film. Hodnota nula "
-"znamená, že ohnisková vzdálenost je neznámá."
+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 "Ohnisková vzdálenost přepo�tená pro fotoaparáty na 35mm film. Hodnota nula znamená, že ohnisková vzdálenost je neznámá."
 
 #: libexif/exif-tag.c:818
 msgid "Scene Capture Type"
 msgstr ""
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
-"Udává typ fotografované scény. Někdy se též používá pro zaznamenání způsobu, "
-"jakým byla fotografie pořízena. Tato zna�ka má jiný význam než 'Typ scény'."
+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 scene type <SceneType> tag."
+msgstr "Udává typ fotografované scény. Někdy se též používá pro zaznamenání způsobu, jakým byla fotografie pořízena. Tato zna�ka má jiný význam než 'Typ scény'."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
@@ -3921,21 +3420,15 @@ msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
 msgstr "Udává směr zpracování kontrastu fotoaparátem při pořizování snímku."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
 msgstr "Udává směr zpracování sytosti fotoaparátem při pořizování snímku."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
 msgstr "Udává směr zpracování ostrosti fotoaparátem při pořizování snímku."
 
 #: libexif/exif-tag.c:841
@@ -3943,10 +3436,7 @@ msgid "Device Setting Description"
 msgstr ""
 
 #: libexif/exif-tag.c:842
-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."
+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 ""
 
 #: libexif/exif-tag.c:848
@@ -3962,13 +3452,8 @@ msgid "Image Unique ID"
 msgstr "Jednozna�né ID obrázku"
 
 #: libexif/exif-tag.c:852
-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 ""
-"Jednozna�ný identifikátor obrázku. Jedná se o 128-bitové �íslo uložené v "
-"hexadecimálním zápisu jako ASCII řetězec."
+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 "Jednozna�ný identifikátor obrázku. Jedná se o 128-bitové �íslo uložené v hexadecimálním zápisu jako ASCII řetězec."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
@@ -3984,20 +3469,14 @@ msgstr ""
 
 #: libexif/exif-tag.c:861
 msgid "Related to Epson's PRINT Image Matching technology"
-msgstr ""
-"Údaj pravděpodobně pro Epson PRINT Image Matching technology, jeho přesný "
-"význam není znám."
+msgstr "Údaj pravděpodobně pro Epson PRINT Image Matching technology, jeho přesný význam není znám."
 
 #: libexif/exif-tag.c:863
 msgid "Padding"
 msgstr ""
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
 msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:62
@@ -4282,441 +3761,441 @@ msgstr "Číslo snímku"
 msgid "Invalid format '%s', expected '%s' or '%s'."
 msgstr "Špatný formát '%s', o�ekáván je '%s' nebo '%s'."
 
-#: libexif/olympus/mnote-olympus-entry.c:92
+#: libexif/olympus/mnote-olympus-entry.c:89
 msgid "AF non D lens"
 msgstr "Čo�ky AF jiné než D"
 
-#: libexif/olympus/mnote-olympus-entry.c:94
+#: libexif/olympus/mnote-olympus-entry.c:91
 msgid "AF-D or AF-S lens"
 msgstr "Čo�ky AF-D nebo AF-S"
 
-#: libexif/olympus/mnote-olympus-entry.c:95
+#: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF-D G lens"
 msgstr "Čo�ky AF-D G"
 
-#: libexif/olympus/mnote-olympus-entry.c:96
+#: libexif/olympus/mnote-olympus-entry.c:93
 msgid "AF-D VR lens"
 msgstr "Čo�ky AF-D VR"
 
-#: libexif/olympus/mnote-olympus-entry.c:97
+#: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D G VR lens"
 msgstr "Čo�ky AF-D VR"
 
-#: libexif/olympus/mnote-olympus-entry.c:101
+#: libexif/olympus/mnote-olympus-entry.c:98
 msgid "Flash unit unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:102
+#: libexif/olympus/mnote-olympus-entry.c:99
 msgid "Flash is external"
 msgstr "Blesk je přídavný"
 
-#: libexif/olympus/mnote-olympus-entry.c:103
+#: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash is on camera"
 msgstr "Blesk je vestavěn"
 
-#: libexif/olympus/mnote-olympus-entry.c:106
+#: libexif/olympus/mnote-olympus-entry.c:103
 msgid "VGA basic"
 msgstr "VGA basic"
 
-#: libexif/olympus/mnote-olympus-entry.c:107
+#: libexif/olympus/mnote-olympus-entry.c:104
 msgid "VGA normal"
 msgstr "VGA normal"
 
-#: libexif/olympus/mnote-olympus-entry.c:108
+#: libexif/olympus/mnote-olympus-entry.c:105
 msgid "VGA fine"
 msgstr "VGA fine"
 
-#: libexif/olympus/mnote-olympus-entry.c:109
+#: libexif/olympus/mnote-olympus-entry.c:106
 msgid "SXGA basic"
 msgstr "SXGA basic"
 
-#: libexif/olympus/mnote-olympus-entry.c:110
+#: libexif/olympus/mnote-olympus-entry.c:107
 msgid "SXGA normal"
 msgstr "SXGA normal"
 
-#: libexif/olympus/mnote-olympus-entry.c:111
+#: libexif/olympus/mnote-olympus-entry.c:108
 msgid "SXGA fine"
 msgstr "SXGA fine"
 
-#: libexif/olympus/mnote-olympus-entry.c:112
+#: libexif/olympus/mnote-olympus-entry.c:109
 msgid "2 Mpixel basic"
 msgstr "2 MPixel basic"
 
-#: libexif/olympus/mnote-olympus-entry.c:113
+#: libexif/olympus/mnote-olympus-entry.c:110
 msgid "2 Mpixel normal"
 msgstr "2 MPixel normal"
 
-#: libexif/olympus/mnote-olympus-entry.c:114
+#: libexif/olympus/mnote-olympus-entry.c:111
 msgid "2 Mpixel fine"
 msgstr "2 MPixel fine"
 
-#: libexif/olympus/mnote-olympus-entry.c:117
+#: libexif/olympus/mnote-olympus-entry.c:114
 msgid "Color"
 msgstr "Barevný"
 
-#: libexif/olympus/mnote-olympus-entry.c:122
+#: libexif/olympus/mnote-olympus-entry.c:119
 msgid "Bright+"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:123
+#: libexif/olympus/mnote-olympus-entry.c:120
 msgid "Bright-"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:124
+#: libexif/olympus/mnote-olympus-entry.c:121
 msgid "Contrast+"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:125
+#: libexif/olympus/mnote-olympus-entry.c:122
 msgid "Contrast-"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:125
 msgid "ISO 80"
 msgstr "ISO 80"
 
-#: libexif/olympus/mnote-olympus-entry.c:129
+#: libexif/olympus/mnote-olympus-entry.c:126
 msgid "ISO 160"
 msgstr "ISO 160"
 
-#: libexif/olympus/mnote-olympus-entry.c:130
+#: libexif/olympus/mnote-olympus-entry.c:127
 msgid "ISO 320"
 msgstr "ISO 320"
 
-#: libexif/olympus/mnote-olympus-entry.c:131
-#: libexif/olympus/mnote-olympus-entry.c:249
+#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:246
 msgid "ISO 100"
 msgstr "ISO 100"
 
-#: libexif/olympus/mnote-olympus-entry.c:135
+#: libexif/olympus/mnote-olympus-entry.c:132
 msgid "Preset"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:137
+#: libexif/olympus/mnote-olympus-entry.c:134
 msgid "Incandescence"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:138
+#: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Fluorescence"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:140
+#: libexif/olympus/mnote-olympus-entry.c:137
 msgid "SpeedLight"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:143
+#: libexif/olympus/mnote-olympus-entry.c:140
 msgid "No fisheye"
 msgstr "Bez rybího oka"
 
-#: libexif/olympus/mnote-olympus-entry.c:144
+#: libexif/olympus/mnote-olympus-entry.c:141
 msgid "Fisheye on"
 msgstr "Rybí oko zapnuto"
 
-#: libexif/olympus/mnote-olympus-entry.c:147
+#: libexif/olympus/mnote-olympus-entry.c:144
 msgid "Normal, SQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:148
+#: libexif/olympus/mnote-olympus-entry.c:145
 msgid "Normal, HQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:149
+#: libexif/olympus/mnote-olympus-entry.c:146
 msgid "Normal, SHQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:150
+#: libexif/olympus/mnote-olympus-entry.c:147
 msgid "Normal, RAW"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:151
+#: libexif/olympus/mnote-olympus-entry.c:148
 msgid "Normal, SQ1"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:152
+#: libexif/olympus/mnote-olympus-entry.c:149
 msgid "Normal, SQ2"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:153
+#: libexif/olympus/mnote-olympus-entry.c:150
 msgid "Normal, super high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:154
+#: libexif/olympus/mnote-olympus-entry.c:151
 msgid "Normal, standard"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:155
+#: libexif/olympus/mnote-olympus-entry.c:152
 msgid "Fine, SQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:156
+#: libexif/olympus/mnote-olympus-entry.c:153
 msgid "Fine, HQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:157
+#: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Fine, SHQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:158
+#: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, RAW"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:159
+#: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, SQ1"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:160
+#: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SQ2"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:161
+#: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, super high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:162
+#: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Super fine, SQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:163
+#: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Super fine, HQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:164
+#: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Super fine, SHQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:165
+#: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, RAW"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:166
+#: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, SQ1"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:167
+#: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SQ2"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:168
+#: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, super high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:172
-#: libexif/olympus/mnote-olympus-entry.c:177
-#: libexif/olympus/mnote-olympus-entry.c:211
-#: libexif/olympus/mnote-olympus-entry.c:220
-#: libexif/olympus/mnote-olympus-entry.c:243
+#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:240
 msgid "No"
 msgstr "Ne"
 
-#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:180
 msgid "On (Preset)"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:188
+#: libexif/olympus/mnote-olympus-entry.c:185
 msgid "Fill"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:192
 msgid "Internal + external"
 msgstr "Vnitřní + vnější"
 
-#: libexif/olympus/mnote-olympus-entry.c:224
+#: libexif/olympus/mnote-olympus-entry.c:221
 msgid "Interlaced"
 msgstr "Prokládaný"
 
-#: libexif/olympus/mnote-olympus-entry.c:225
+#: libexif/olympus/mnote-olympus-entry.c:222
 msgid "Progressive"
 msgstr "Progresivní"
 
-#: libexif/olympus/mnote-olympus-entry.c:231
+#: libexif/olympus/mnote-olympus-entry.c:228
 #: libexif/pentax/mnote-pentax-entry.c:85
 #: libexif/pentax/mnote-pentax-entry.c:139
 msgid "Best"
 msgstr "Nejlepší"
 
-#: libexif/olympus/mnote-olympus-entry.c:232
+#: libexif/olympus/mnote-olympus-entry.c:229
 msgid "Adjust exposure"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:235
+#: libexif/olympus/mnote-olympus-entry.c:232
 msgid "Spot focus"
 msgstr "Bodové ostření"
 
-#: libexif/olympus/mnote-olympus-entry.c:236
+#: libexif/olympus/mnote-olympus-entry.c:233
 msgid "Normal focus"
 msgstr "Normální ostření"
 
-#: libexif/olympus/mnote-olympus-entry.c:239
+#: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Record while down"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:240
+#: libexif/olympus/mnote-olympus-entry.c:237
 msgid "Press start, press stop"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:248
+#: libexif/olympus/mnote-olympus-entry.c:245
 msgid "ISO 50"
 msgstr "ISO 50"
 
-#: libexif/olympus/mnote-olympus-entry.c:250
+#: libexif/olympus/mnote-olympus-entry.c:247
 msgid "ISO 200"
 msgstr "ISO 200"
 
-#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 400"
 msgstr "ISO 400"
 
-#: libexif/olympus/mnote-olympus-entry.c:255
+#: libexif/olympus/mnote-olympus-entry.c:252
 #: libexif/pentax/mnote-pentax-entry.c:168
 msgid "Sport"
 msgstr "Sport"
 
-#: libexif/olympus/mnote-olympus-entry.c:256
+#: libexif/olympus/mnote-olympus-entry.c:253
 msgid "TV"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:258
+#: libexif/olympus/mnote-olympus-entry.c:255
 msgid "User 1"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:259
+#: libexif/olympus/mnote-olympus-entry.c:256
 msgid "User 2"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:260
+#: libexif/olympus/mnote-olympus-entry.c:257
 msgid "Lamp"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:263
+#: libexif/olympus/mnote-olympus-entry.c:260
 msgid "5 frames/sec"
 msgstr "5 snímků/S"
 
-#: libexif/olympus/mnote-olympus-entry.c:264
+#: libexif/olympus/mnote-olympus-entry.c:261
 msgid "10 frames/sec"
 msgstr "10 snímků/S"
 
-#: libexif/olympus/mnote-olympus-entry.c:265
+#: libexif/olympus/mnote-olympus-entry.c:262
 msgid "15 frames/sec"
 msgstr "15 snímků/S"
 
-#: libexif/olympus/mnote-olympus-entry.c:266
+#: libexif/olympus/mnote-olympus-entry.c:263
 msgid "20 frames/sec"
 msgstr "20 snímků/S"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:375
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "Červená korekce %f, modrá korekce %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
-msgid "No manual focus selection"
-msgstr ""
-
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:383
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f m"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:385
+msgid "No manual focus selection"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:411
 msgid "AF position: center"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:412
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:413
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:414
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:415
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:416
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:417
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:433
+#: libexif/olympus/mnote-olympus-entry.c:503
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Vnitřní chyba (neznámá hodnota %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:441
+#: libexif/olympus/mnote-olympus-entry.c:511
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Neznámá hodnota %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:536
+#: libexif/olympus/mnote-olympus-entry.c:556
 #, c-format
 msgid "Unknown %hu"
 msgstr "Neznámá hodnota %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:553
 msgid "2 sec."
 msgstr "2 s"
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:592
 msgid "Fast"
 msgstr "Rychlý"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:696
 msgid "Automatic"
 msgstr "Automatický"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:726
 #, c-format
 msgid "Manual: %liK"
 msgstr "Ru�ní: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:729
 msgid "Manual: unknown"
 msgstr "Ru�ní: neznámý"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:735
 msgid "One-touch"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:791
+#: libexif/olympus/mnote-olympus-entry.c:801
 msgid "Infinite"
 msgstr "Nekone�ný"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:809
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i bajtů neznámých dat: "
@@ -5555,9 +5034,6 @@ msgstr ""
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr ""
 
-#~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr "Zna�ka Komentář neodpovídá specifikaci, avšak obsahuje data."
-
 #~ msgid "On + Red-eye reduction"
 #~ msgstr "Zapnuto + Redukce �ervených o�í"
 
diff --git a/po/da.gmo b/po/da.gmo
deleted file mode 100644
index 789001f..0000000
--- a/po/da.gmo
+++ /dev/null
diff --git a/po/da.po b/po/da.po
index 9a9821f..599491f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 # Danish translation libexif.
-# Copyright (C) 2012 Lutz Mueller og nedenstående oversættere.
+# Copyright (C) 2016 Lutz Mueller og nedenstående oversættere.
 # This file is distributed under the same license as the libexif package.
-# Joe Hansen <joedalton2@yahoo.dk>, 2009, 2010, 2012.
+# Joe Hansen <joedalton2@yahoo.dk>, 2009, 2010, 2012, 2016.
 # Korrekturlæst Lars Christian Jensen 2009.
 # Korrekturlæst Torben Grøn Helligsø, 2010. 
 #
@@ -11,7 +11,7 @@
 # ovenfor til hjælp for oversætterne.
 #
 # konventioner:
-# aperture -> blændetal
+# aperture -> blænde eller blændetal alt efter sammenhæng
 # bottom -> nederst
 # bracket -> sammenstilling (det er ikke kantparentes)
 # brightness -> lysstyrke
@@ -27,7 +27,12 @@
 # hue -> farvetone
 # incandescence -> hvidglødende
 # Interoperability -> (uafklaret; Erklæringen om brugsret?)
-# lens -> linse (men kunne vel også være objektiv)
+# lens -> objektiv (for at følge skikken blandt de fleste fotografer). Ved en
+#         skive -> linse (en linse er det enkelte konkav/konvekse element, og et objektiv
+#         består derfor består af flere elementer)
+#         bemærk at sprogbrugen i øjeblikket er under udvikling, og ofte bruges linse som
+#         betegnelse for lens (engelsk har egentlig også objective som korrekt form, men
+#         også her bruges ofte lens)
 # matrix -> matrice (alternativ matrix)
 # offset -> afsætning
 # shutter -> lukker
@@ -41,13 +46,14 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif-0.6.21-pre1\n"
+"Project-Id-Version: libexif-0.6.22-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2012-07-03 01:01I+0200\n"
+"POT-Creation-Date: 2016-09-02 00:46+0200\n"
+"PO-Revision-Date: 2016-09-04 01:01I+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -297,9 +303,11 @@ msgstr "Mellem 3"
 msgid "Postcard"
 msgstr "Postkort"
 
+# Widescreen er et formatforhold, og ikke om man bruger hele skærmen i dens format.
+# Jeg ville lade det stå uoversat.
 #: libexif/canon/mnote-canon-entry.c:119
 msgid "Widescreen"
-msgstr "Fuldskærm"
+msgstr "Widescreen"
 
 #: libexif/canon/mnote-canon-entry.c:120
 msgid "Full auto"
@@ -409,13 +417,14 @@ msgstr "Fyrværkeri"
 msgid "Beach"
 msgstr "Strand"
 
+# Undervands - forstået som undervandsfotografering
 #: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
 #: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
 msgid "Underwater"
-msgstr "Under vandet"
+msgstr "Undervands"
 
 #: libexif/canon/mnote-canon-entry.c:143 libexif/fuji/mnote-fuji-entry.c:134
 msgid "Snow"
@@ -623,14 +632,20 @@ msgstr "Tv-prioritet"
 msgid "Av-priority"
 msgstr "Av-prioritet"
 
+# DEP - DYB - tror jeg ikke på, så snarere en forkortelse for 
+# dependent - altså A(perture = blænde) betinget/afhængigt og 
+# M(anuelt). Lad det stå uoversat - der må komme en forklaring et 
+# andet sted.
 #: libexif/canon/mnote-canon-entry.c:202
 msgid "A-DEP"
-msgstr "A-DYB"
+msgstr "A-DEP"
 
 #: libexif/canon/mnote-canon-entry.c:203
 msgid "M-DEP"
-msgstr "M-DYB"
+msgstr "M-DEP"
 
+# Skulle der ikke være mellemrum mellem f.eks. 50mm = 50 mm
+# Kunne der sagtens være, er mere set som produktnavne.
 #: libexif/canon/mnote-canon-entry.c:204
 msgid "Canon EF 50mm f/1.8"
 msgstr "Canon EF 50mm f/1.8"
@@ -983,9 +998,10 @@ msgstr "E-TTL"
 msgid "FP sync enabled"
 msgstr "FP-synkronisering slået til"
 
+# lukkergardin
 #: libexif/canon/mnote-canon-entry.c:293
 msgid "2nd-curtain sync used"
-msgstr "2.-udskilt synkronisering brugt"
+msgstr "2. gardin-synkronisering brugt"
 
 #: libexif/canon/mnote-canon-entry.c:294
 msgid "FP sync used"
@@ -1320,6 +1336,7 @@ msgstr "1/%i"
 msgid "%u mm"
 msgstr "%u mm"
 
+# eller indstillinger
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr "Opsætning (første del)"
@@ -1329,6 +1346,7 @@ msgstr "Opsætning (første del)"
 msgid "Focal Length"
 msgstr "Brændvidde"
 
+# eller indstillinger
 #: libexif/canon/mnote-canon-tag.c:37
 msgid "Settings (Second Part)"
 msgstr "Opsætning (anden del)"
@@ -1438,7 +1456,7 @@ msgstr "Kontrast"
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
-msgstr "Mæthed"
+msgstr "Farvemætning"
 
 #: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
@@ -1460,9 +1478,10 @@ msgstr "MÃ¥letilstand"
 msgid "Focus Range"
 msgstr "Fokusafstand"
 
+# Man vælger ét blandt blere punkter
 #: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
 msgid "AF Point"
-msgstr "AF-position"
+msgstr "AF-punkt"
 
 #: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
 msgid "Exposure Mode"
@@ -1471,27 +1490,29 @@ msgstr "Belysningstilstand"
 #: libexif/canon/mnote-canon-tag.c:74 libexif/olympus/mnote-olympus-tag.c:61
 #: libexif/pentax/mnote-pentax-tag.c:106
 msgid "Lens Type"
-msgstr "Linsetype"
+msgstr "Objektivtype"
 
 #: libexif/canon/mnote-canon-tag.c:75
 msgid "Long Focal Length of Lens"
-msgstr "Lang brændvidde på linse"
+msgstr "Lang brændvidde på objektiv"
 
 #: libexif/canon/mnote-canon-tag.c:76
 msgid "Short Focal Length of Lens"
-msgstr "Kort brændvidde på linse"
+msgstr "Kort brændvidde på objektiv"
 
 #: libexif/canon/mnote-canon-tag.c:77
 msgid "Focal Units per mm"
 msgstr "Brændpunktsenheder per mm"
 
+# Jeg ville være lidt forsigtig med at sætte ordet "tal" på her, 
+# idet en lille blænde har et stort blændetal.
 #: libexif/canon/mnote-canon-tag.c:78
 msgid "Maximal Aperture"
-msgstr "Maksimal blændetal"
+msgstr "Maksimal blænde"
 
 #: libexif/canon/mnote-canon-tag.c:79
 msgid "Minimal Aperture"
-msgstr "Minimal blændetal"
+msgstr "Minimal blænde"
 
 #: libexif/canon/mnote-canon-tag.c:80
 msgid "Flash Activity"
@@ -1588,9 +1609,11 @@ msgstr "Langsom lukker"
 msgid "Sequence Number"
 msgstr "Sekvensnummer"
 
+# Guide Number er et tal for, hvor kraftig blitzen er 
+# (http://en.wikipedia.org/wiki/Guide_number) Det danske ord er "ledetal" 
 #: libexif/canon/mnote-canon-tag.c:104
 msgid "Flash Guide Number"
-msgstr "Vejledningsnummer for blitz"
+msgstr "Ledetal for blitz"
 
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
@@ -1602,31 +1625,45 @@ msgstr "Belysningskompensation for blitz"
 # pictures, especially in challenging lighting situations.
 # der tages et billede før og efter med under og overeksponering af lys.
 # Derfor ikke kantparenteser, måske omklamring eller sammenstilling.
+# .
+# Bracketing er som du rigtigt nok skriver, det at tage en serie 
+# (3-5-7 billeder) hvor kameraet automatisk flytter lidt eller meget 
+# på indstillingen (alt efter om man laver bracketing i ISO, hvidbalance,
+# tid eller blænde) og fotografen så 'bare' holder udløseren nede, 
+# indtil det forudindstillede antal billeder er taget - kameraet stopper 
+# selv. Vi har ikke noget dansk ord for den funktion, så jeg ville lade 
+# det stå uoversat.
 #: libexif/canon/mnote-canon-tag.c:107
 msgid "AE Bracketing"
 msgstr "AE-sammenstilling"
 
 #: libexif/canon/mnote-canon-tag.c:108
 msgid "AE Bracket Value"
-msgstr "AE-sammenstilingsværdi"
+msgstr "AE-sammenstillingsværdi"
 
 #: libexif/canon/mnote-canon-tag.c:109
 msgid "Focus Distance Upper"
-msgstr "Fokus - Afstand - Oppe"
+msgstr "Fokus - Afstand - Øvre"
 
 #: libexif/canon/mnote-canon-tag.c:110
 msgid "Focus Distance Lower"
-msgstr "Fokus - Afstand - Lavt"
+msgstr "Fokus - Afstand - Nedre"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "FNummer"
+# Blændetal?
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:469
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "F-nummer"
 
 #: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Belysningstid"
 
+# Igen en af de svære - når man fotograferer 'Bulb' er der 
+# tale om lange belysningstider, tider som kameraet ikke selv 
+# kan 'dosere' typisk fra en 10-15 sekunder og mere. Jeg kender 
+# ikke til nogen danske ord for det.
 #: libexif/canon/mnote-canon-tag.c:113
 msgid "Bulb Duration"
 msgstr "Pærevarighed"
@@ -1700,75 +1737,43 @@ msgid "Follow specification"
 msgstr "Følg specifikation"
 
 #: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
-"Tilføj, ret eller fjern poster for at få EXIF-data som følger "
-"specifikationen."
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Tilføj, ret eller fjern poster for at få EXIF-data som følger specifikationen."
 
 #: libexif/exif-data.c:1183
 msgid "Do not change maker note"
 msgstr "Ændr ikke fremstillernote"
 
 #: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
-"Ved indlæsning og gemning af Exif-data, gem fremstillernoten uændret. Vær "
-"opmærksom på at markørnoten kan gå i stykker."
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Ved indlæsning og gemning af Exif-data, gem fremstillernoten uændret. Vær opmærksom på at markørnoten kan gå i stykker."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
-"Mærke '%s' var af format '%s' (som er imod specifikation), og er blevet "
-"ændret til format '%s'."
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Mærke '%s' var af format '%s' (som er imod specifikation), og er blevet ændret til format '%s'."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
-"Mærke '%s' er af format '%s' (som er imod specifikation), men kan ikke "
-"ændres til format '%s'."
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Mærke '%s' er af format '%s' (som er imod specifikation), men kan ikke ændres til format '%s'."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
-"Mærke 'Brugerkommentar' havde ugyldigt format '%s'. Format er blevet sat til "
-"'udefineret'."
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Mærke 'Brugerkommentar' havde ugyldigt format '%s'. Format er blevet sat til 'udefineret'."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
-"Mærke 'Brugerkommentar' er blevet udvidet til mindst 8 byte for at følge "
-"specifikationen."
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Mærke 'Brugerkommentar' er blevet udvidet til mindst 8 byte for at følge specifikationen."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
-"Mærke 'Brugerkommentar' er ikke tom, men starter ikke med en "
-"formatidentifikation. Dette er rettet."
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Mærke 'Brugerkommentar' er ikke tom, men starter ikke med en formatidentifikation. Dette er rettet."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
-"Mærke 'Brugerkommentar' startede ikke med en formatidentifikation. Dette er "
-"blevet rettet."
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Mærke 'Brugerkommentar' startede ikke med en formatidentifikation. Dette er blevet rettet."
 
 #: libexif/exif-entry.c:462
 #, c-format
@@ -1783,15 +1788,12 @@ msgstr "%i byte datatype der ikke er understøttet"
 #: libexif/exif-entry.c:642
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
-"Mærket '%s' indeholder data i et ugyldigt format ('%s', forventede '%s')."
+msgstr "Mærket '%s' indeholder data i et ugyldigt format ('%s', forventede '%s')."
 
 #: libexif/exif-entry.c:655
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr ""
-"Mærket '%s' indeholder et ugyldigt antal af komponenter (%i, forventede %i)."
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "Mærket '%s' indeholder et ugyldigt antal af komponenter (%i, forventede %i)."
 
 #: libexif/exif-entry.c:669
 msgid "Chunky format"
@@ -2071,9 +2073,10 @@ msgstr "ISO-studiowolfram"
 msgid "Inch"
 msgstr "Tomme"
 
+# kortform af Inch 
 #: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "in"
-msgstr "i"
+msgstr "t"
 
 #: libexif/exif-entry.c:756 libexif/exif-entry.c:760
 msgid "Centimeter"
@@ -2206,34 +2209,23 @@ msgstr "Blitz blev brugt, reduktiontilstand for røde øjne"
 
 #: libexif/exif-entry.c:797
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
-"Blitz blev brugt, reduktiontilstand for røde øjne, intet returlys detekteret"
+msgstr "Blitz blev brugt, reduktiontilstand for røde øjne, intet returlys detekteret"
 
 #: libexif/exif-entry.c:799
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
-"Blitz blev brugt, reduktiontilstand for røde øjne, intet returlys detekteret"
+msgstr "Blitz blev brugt, reduktiontilstand for røde øjne, intet returlys detekteret"
 
 #: libexif/exif-entry.c:801
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
-msgstr ""
-"Blitz blev brugt, tvungen blitztilstand, reduktiontilstand for røde øjne"
+msgstr "Blitz blev brugt, tvungen blitztilstand, reduktiontilstand for røde øjne"
 
 #: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"Blitz blev brugt, tvungen blitztilstand, reduktiontilstand for røde øjne, "
-"intet returlys detekteret"
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "Blitz blev brugt, tvungen blitztilstand, reduktiontilstand for røde øjne, intet returlys detekteret"
 
 #: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"Blitz blev brugt, tvungen blitztilstand, reduktiontilstand for røde øjne, "
-"returlys detekteret"
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "Blitz blev brugt, tvungen blitztilstand, reduktiontilstand for røde øjne, returlys detekteret"
 
 #: libexif/exif-entry.c:807
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
@@ -2244,17 +2236,12 @@ msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "Blitz blev brugt, autotilstand, reduktiontilstand for røde øjne"
 
 #: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"Blitz blev brugt, autotilstand, intet returlys detekteret, reduktiontilstand "
-"for røde øjne"
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "Blitz blev brugt, autotilstand, intet returlys detekteret, reduktiontilstand for røde øjne"
 
 #: libexif/exif-entry.c:811
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"Blitz blev brugt, autotilstand, returlys detekteret, reduktiontilstand for "
-"røde øjne"
+msgstr "Blitz blev brugt, autotilstand, returlys detekteret, reduktiontilstand for røde øjne"
 
 #: libexif/exif-entry.c:815
 msgid "?"
@@ -2327,9 +2314,9 @@ msgstr "FlashPix version 1.01"
 msgid "Unknown FlashPix Version"
 msgstr "Ukendt FlashPix version"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1668
+#: libexif/exif-entry.c:1673 libexif/exif-entry.c:1677
+#: libexif/exif-entry.c:1682 libexif/exif-entry.c:1683
 msgid "[None]"
 msgstr "[Ingen]"
 
@@ -2339,7 +2326,7 @@ msgstr "(fotograf)"
 
 #: libexif/exif-entry.c:1000
 msgid "(Editor)"
-msgstr "(Redigering)"
+msgstr "(Redigeret af)"
 
 #: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
 #: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
@@ -2548,44 +2535,24 @@ msgid "GPS Tag Version"
 msgstr "GPS-mærkeversion"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
-"Indikerer versionen på <GPSInfoIFD>. Versionen er angivet som 2.0.0.0. Dette "
-"mærke er obligatorisk når <GPSInfo>-mærket er til stede. (Bemærk: Mærket "
-"<GPSVersionID> angives i byte, til forskel for mærket <ExifVersion>. Når "
-"versionen er 2.0.0.0, er mærkeværdien 02000000.H)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Indikerer versionen på <GPSInfoIFD>. Versionen er angivet som 2.0.0.0. Dette mærke er obligatorisk når <GPSInfo>-mærket er til stede. (Bemærk: Mærket <GPSVersionID> angives i byte, til forskel for mærket <ExifVersion>. Når versionen er 2.0.0.0, er mærkeværdien 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
 msgstr "Interoperability indeks"
 
 #: libexif/exif-tag.c:70
-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 ""
-"Indikerer identifikationen af interoperabilityreglen. Brug »R98« for at vise "
-"ExifR98-regler. Fire byte brugt inklusiv terminationskoden (NULL). Se den "
-"separate volume for anbefalede Exif interoperabilityregler (ExifR98) for "
-"andre mærker brugt i ExifR98."
+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 "Indikerer identifikationen af interoperabilityreglen. Brug »R98« for at vise ExifR98-regler. Fire byte brugt inklusiv terminationskoden (NULL). Se den separate volume for anbefalede Exif interoperabilityregler (ExifR98) for andre mærker brugt i ExifR98."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
 msgstr "Nordlig eller sydlig breddegrad"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
-"Indikerer om breddegradden er nordlig eller sydlig breddegrad. ASCII-værdien "
-"'N' indikerer nordlig breddegrad, og 'S' er sydlig breddegrad."
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Indikerer om breddegradden er nordlig eller sydlig breddegrad. ASCII-værdien 'N' indikerer nordlig breddegrad, og 'S' er sydlig breddegrad."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
@@ -2596,78 +2563,40 @@ msgid "Latitude"
 msgstr "Breddegrad"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
-"Indikerer breddegraden. Breddegraden udtrykkes som tre RATIONELLE værdier i "
-"form af henholdsvis grader, minutter og sekunder. NÃ¥r grader, minutter og "
-"sekunder udtrykkes er formatet dd/1,mm/1,ss/s. NÃ¥r grader og minutter "
-"anvendes og, for eksempel, fraktioner af minutter er angivet med op til to "
-"decimaler, er formatet dd/1,mmmm/100,0/1."
+msgid "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."
+msgstr "Indikerer breddegraden. Breddegraden udtrykkes som tre RATIONELLE værdier i form af henholdsvis grader, minutter og sekunder. Når grader, minutter og sekunder udtrykkes er formatet dd/1,mm/1,ss/s. Når grader og minutter anvendes og, for eksempel, fraktioner af minutter er angivet med op til to decimaler, er formatet dd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
 msgstr "Østlig eller vestlig længdegrad"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
-"Indikerer om længdegraden er østlig eller vestlig længdegrad. ASCII 'E' "
-"indikerer østlig længdegrad, og 'W' er vestlig længdegrad."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Indikerer om længdegraden er østlig eller vestlig længdegrad. ASCII 'E' indikerer østlig længdegrad, og 'W' er vestlig længdegrad."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
 msgstr "Længdegrad"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
-"Indikerer længdegraden. Længdegraden udtrykkes som tre RATIONELLE værdier i "
-"form af henholdsvis grader, minutter og sekunder. NÃ¥r grader, minutter og "
-"sekunder udtrykkes er formatet ddd/1,mm/1,ss/s. NÃ¥r grader og minutter "
-"anvendes og, for eksempel, fraktioner af minutter er angivet med op til to "
-"decimaler, er formatet ddd/1,mmmm/100,0/1."
+msgid "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."
+msgstr "Indikerer længdegraden. Længdegraden udtrykkes som tre RATIONELLE værdier i form af henholdsvis grader, minutter og sekunder. Når grader, minutter og sekunder udtrykkes er formatet ddd/1,mm/1,ss/s. Når grader og minutter anvendes og, for eksempel, fraktioner af minutter er angivet med op til to decimaler, er formatet ddd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:103
 msgid "Altitude Reference"
 msgstr "Højdereference"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
-"Indikerer højden anvendt som referencehøjde. Hvis referencen er havniveauet "
-"og højden er over havniveau, angives 0. Hvis højden er under havniveau, "
-"angives en værdi på 1 og højden angives som en absolut værdi i mærket "
-"GSPAltitude. Referenceenheden er meter. Bemærk at dette mærke er af typen "
-"BYTE, til forskel fra andre referencemærker."
+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 is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GPSAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags."
+msgstr "Indikerer højden anvendt som referencehøjde. Hvis referencen er havniveauet og højden er over havniveau, angives 0. Hvis højden er under havniveau, angives en værdi på 1 og højden angives som en absolut værdi i mærket GPSAltitude. Referenceenheden er meter. Bemærk at dette mærke er af typen BYTE, til forskel fra andre referencemærker."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
 msgstr "Højde"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
-"Indikerer højden baseret på referencen i GPSAltitudeRef. Højden udtrykkes "
-"som en RATIONAL-værdi. Referenceenheden er meter."
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Indikerer højden baseret på referencen i GPSAltitudeRef. Højden udtrykkes som en RATIONAL-værdi. Referenceenheden er meter."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
@@ -2678,12 +2607,8 @@ msgstr "GPS-tid (atomur)"
 # gældende for alle sprog. På DRs tekst-tv kalder man det "Universal time
 # coordinated". Ifølge da.wikipedia kaldes det også "universel tid".
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
-"Indikerer tiden som UTC (Koordineret universel tid). TimeStamp udtrykkes som "
-"tre RATIONAL-værdier i form af time, minut og sekund."
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Indikerer tiden som UTC (Koordineret universel tid). TimeStamp udtrykkes som tre RATIONAL-værdier i form af time, minut og sekund."
 
 #: libexif/exif-tag.c:118
 msgid "GPS Satellites"
@@ -2691,18 +2616,8 @@ msgstr "GPS-satellitter"
 
 # hvad er SNR?
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
-"Indikerer GPS-satellitterne brugt til måling. Dette mærke kan bruges til at "
-"beskrive antallet af satellitter, deres id-nummer, vinkel for målinger, "
-"azimut, SNR og anden information med ASCII-notation. Formatet er ikke "
-"angivet. Hvis GPS-modtageren er ude af stand til at måle, vil værdien af "
-"mærket være angivet som NULL."
+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, 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 shall be set to NULL."
+msgstr "Indikerer GPS-satellitterne brugt til måling. Dette mærke kan bruges til at beskrive antallet af satellitter, deres id-nummer, vinkel for målinger, azimut, SNR og anden information med ASCII-notation. Formatet er ikke angivet. Hvis GPS-modtageren er ude af stand til at måle, vil værdien af mærket være angivet som NULL."
 
 #: libexif/exif-tag.c:125
 msgid "GPS Receiver Status"
@@ -2710,50 +2625,32 @@ msgstr "Status for GPS-modtager"
 
 # Nogen forslag til Interoperability?
 #: libexif/exif-tag.c:126
-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 ""
-"Indikerer status på GPS-modtageren når billedet optages. 'A' betyder at "
-"måling er i gang, og 'V' betyder at målingen er interoperability."
+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 "Indikerer status på GPS-modtageren når billedet optages. 'A' betyder at måling er i gang, og 'V' betyder at målingen er interoperability."
 
 #: libexif/exif-tag.c:129
 msgid "GPS Measurement Mode"
 msgstr "GPS-målingstilstand"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
-"Indikerer GPS-målingstilstanden. '2' betyder 2-dimensionel måling og '3' "
-"betyder 3-dimensionel måling er i gang."
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Indikerer GPS-målingstilstanden. '2' betyder 2-dimensionel måling og '3' betyder 3-dimensionel måling er i gang."
 
 #: libexif/exif-tag.c:133
 msgid "Measurement Precision"
 msgstr "Målingspræcision"
 
 #: libexif/exif-tag.c:134
-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 ""
-"Indikerer DOP (grad af præcision for data) for GPS-modtageren. En HDOP-værdi "
-"skrives via 2-dimensionel måling, og PDOP under 3-dimensionel måling."
+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 "Indikerer DOP (grad af præcision for data) for GPS-modtageren. En HDOP-værdi skrives via 2-dimensionel måling, og PDOP under 3-dimensionel måling."
 
 #: libexif/exif-tag.c:137
 msgid "Speed Unit"
 msgstr "Enhed for hastighed"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
-"Indikerer enheden brugt til at udtrykke GPS-modtagerens bevægelseshastighed. "
-"'K', 'M' og 'N' repræsenterer kilometer per time, mil per time og knop."
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Indikerer enheden brugt til at udtrykke GPS-modtagerens bevægelseshastighed. 'K', 'M' og 'N' repræsenterer kilometer per time, mil per time og knop."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
@@ -2768,64 +2665,40 @@ msgid "Reference for direction of movement"
 msgstr "Reference for bevægelsesretning"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"Indikerer referencen for retningen på GPS-modtagerens bevægelse. 'T' "
-"markerer reel retning og 'M' er magnetisk retning."
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Indikerer referencen for retningen på GPS-modtagerens bevægelse. 'T' markerer reel retning og 'M' er magnetisk retning."
 
 #: libexif/exif-tag.c:147
 msgid "Direction of Movement"
 msgstr "Bevægelsesretning"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
-msgstr ""
-"Indikerer retningen på GPS-modtagerbevægelsen. Værdierne kan gå fra 0.00 til "
-"359.99."
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
+msgstr "Indikerer retningen på GPS-modtagerbevægelsen. Værdierne kan gå fra 0.00 til 359.99."
 
 #: libexif/exif-tag.c:150
 msgid "GPS Image Direction Reference"
 msgstr "GPS-billedretningsreference"
 
 #: libexif/exif-tag.c:151
-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 ""
-"Indikerer referencen for retningen af billedet, når det optages. 'T' "
-"markerer reel retning og 'M' er magnetisk retning."
+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 "Indikerer referencen for retningen af billedet, når det optages. 'T' markerer reel retning og 'M' er magnetisk retning."
 
 #: libexif/exif-tag.c:153
 msgid "GPS Image Direction"
 msgstr "GPS-billedretning"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
-"Indikerer retningen på billedet da det blev optaget. Værdierne kan gå fra "
-"0.00 til 359.99."
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
+msgstr "Indikerer retningen på billedet da det blev optaget. Værdierne kan gå fra 0.00 til 359.99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
 msgstr "Anvendte geodætiske undersøgelsesdata"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
-"Indikerer de geodætiske undersøgelsesdata der bruges af GPS-modtageren. Hvis "
-"undersøgelsesdataene er begrænset til Japan er værdien af mærket 'TOKYO' "
-"eller 'WGS-84'. Hvis et GPS-infomærke er optaget, anbefales det kraftigt, at "
-"dette mærke registreres."
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Indikerer de geodætiske undersøgelsesdata der bruges af GPS-modtageren. Hvis undersøgelsesdataene er begrænset til Japan er værdien af mærket 'TOKYO' eller 'WGS-84'. Hvis et GPS-infomærke er optaget, anbefales det kraftigt, at dette mærke registreres."
 
 # "Reference for ankomststedets breddegrad"
 # Kan man skrive /stedets/ isf. ankomststedets?
@@ -2834,101 +2707,56 @@ msgid "Reference For Latitude of Destination"
 msgstr "Reference for ankomststedets breddegrad"
 
 #: libexif/exif-tag.c:162
-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 ""
-"Indikerer om breddegraden på ankomststedet er nordlig eller sydlig "
-"breddegrad. ASCII-værdien 'N' indikerer nordlig breddegrad, og 'S' er sydlig "
-"breddegrad."
+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 "Indikerer om breddegraden på ankomststedet er nordlig eller sydlig breddegrad. ASCII-værdien 'N' indikerer nordlig breddegrad, og 'S' er sydlig breddegrad."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
 msgstr "Ankomststedets breddegrad"
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
-"Indikerer breddegraden på ankomststedet. Breddegraden er udtrykt som tre "
-"RATIONAL-værdier, der angiver grader, minutter og sekunder. Hvis breddegrad "
-"er udtrykt som grader, minutter og sekunder, vil et typisk format være dd/1,"
-"mm/1,ss/1. NÃ¥r der for eksempel bruges grader, minutter og dele af minutter "
-"med op til to decimaler, vil formatet være dd/1,mmmm/100,0/1."
+msgid "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."
+msgstr "Indikerer breddegraden på ankomststedet. Breddegraden er udtrykt som tre RATIONAL-værdier, der angiver grader, minutter og sekunder. Hvis breddegrad er udtrykt som grader, minutter og sekunder, vil et typisk format være dd/1,mm/1,ss/1. Når der for eksempel bruges grader, minutter og dele af minutter med op til to decimaler, vil formatet være dd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
 msgstr "Reference for ankomststedets længdegrad"
 
 #: libexif/exif-tag.c:174
-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 ""
-"Indikerer om længdegraden på ankomststedet er østlig eller vestlig "
-"længdegrad. ASCII-værdien 'E' indikerer østlig breddegrad, og 'W' er vestlig "
-"længdegrad."
+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 "Indikerer om længdegraden på ankomststedet er østlig eller vestlig længdegrad. ASCII-værdien 'E' indikerer østlig breddegrad, og 'W' er vestlig længdegrad."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
 msgstr "Ankomststedets længdegrad"
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
-msgstr ""
-"Indikerer længdegraden på ankomststedet. Længdegraden er udtrykt som tre "
-"RATIONAL-værdier, der angiver grader, minutter og sekunder. Hvis længdegrad "
-"er udtrykt som grader, minutter og sekunder, vil et typisk format være ddd/1,"
-"mm/1,ss/1. NÃ¥r der for eksempel bruges grader, minutter og dele af minutter "
-"med op til to decimaler, vil formatet være ddd/1,mmmm/100,0/1."
+msgid "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."
+msgstr "Indikerer længdegraden på ankomststedet. Længdegraden er udtrykt som tre RATIONAL-værdier, der angiver grader, minutter og sekunder. Hvis længdegrad er udtrykt som grader, minutter og sekunder, vil et typisk format være ddd/1,mm/1,ss/1. Når der for eksempel bruges grader, minutter og dele af minutter med op til to decimaler, vil formatet være ddd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
 msgstr "Reference for retning på ankomststed"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"Indikerer referencen brugt for retningen til ankomststedet. 'T' markerer "
-"reel retning og 'M' er magnetisk retning."
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Indikerer referencen brugt for retningen til ankomststedet. 'T' markerer reel retning og 'M' er magnetisk retning."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
 msgstr "Destinationsretning"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
-msgstr ""
-"Indikerer retningen til destinationstedet. Værdierne kan gå fra 0.00 til "
-"359.99."
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
+msgstr "Indikerer retningen til destinationstedet. Værdierne kan gå fra 0.00 til 359.99."
 
 #: libexif/exif-tag.c:193
 msgid "Reference for Distance to Destination"
 msgstr "Reference for afstand til ankomststedet"
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
-"Indikerer enheden brugt til at udtrykke afstanden til ankomststedet. 'K', "
-"'M' og 'N' repræsenterer kilometer, mil og sømil."
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr "Indikerer enheden brugt til at udtrykke afstanden til ankomststedet. 'K', 'M' og 'N' repræsenterer kilometer, mil og sømil."
 
 #: libexif/exif-tag.c:197
 msgid "Distance to Destination"
@@ -2943,130 +2771,90 @@ msgid "Name of GPS Processing Method"
 msgstr "Navn på GPS-behandlingsmetoden"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
-"En tegnstreng der angiver navnet på metoden der bruges til stedbestemmelse. "
-"Den første byte indikerer den anvendte tegnkode, og dette efterfølges af "
-"navnet på metoden. Da typen ikke er ASCII, er NULL-terminering ikke "
-"nødvendig."
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "En tegnstreng der angiver navnet på metoden der bruges til stedbestemmelse. Den første byte indikerer den anvendte tegnkode, og dette efterfølges af navnet på metoden. Da typen ikke er ASCII, er NULL-terminering ikke nødvendig."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
 msgstr "Navn på GPS-område"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
-"En tegnstreng der registrerer navnet på GPS-området. Den første byte "
-"indikerer den anvendte tegnkode, og dette efterfølges af navnet på GPS-"
-"området. Da typen ikke er ASCII, er NULL-terminering ikke nødvendig."
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "En tegnstreng der registrerer navnet på GPS-området. Den første byte indikerer den anvendte tegnkode, og dette efterfølges af navnet på GPS-området. Da typen ikke er ASCII, er NULL-terminering ikke nødvendig."
 
 #: libexif/exif-tag.c:210
 msgid "GPS Date"
 msgstr "GPS-dato"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
-"En tegnstreng der registrerer dato- og tidsinformation i forhold til UTC "
-"(Koordineret universel tid). Formatet er »ÅÅÅÅ:MM:DD«. Længden på strengen "
-"er 11 byte inklusive NULL."
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "En tegnstreng der registrerer dato- og tidsinformation i forhold til UTC (Koordineret universel tid). Formatet er »ÅÅÅÅ:MM:DD«. Længden på strengen er 11 byte inklusive NULL."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
 msgstr "GPS-differentiel korrektion"
 
 #: libexif/exif-tag.c:216
-msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+msgid "Indicates whether differential correction is applied to the GPS receiver."
 msgstr "Indikerer hvorvidt differentiel korrektion anvendes på GPS-modtageren."
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "Ny underfilstype"
 
 #: libexif/exif-tag.c:220
 msgid "A general indication of the kind of data contained in this subfile."
-msgstr ""
-"En generel indikation af den type data der er indeholdt i denne underfil."
+msgstr "En generel indikation af den type data der er indeholdt i denne underfil."
 
 #: libexif/exif-tag.c:222
 msgid "Image Width"
 msgstr "Billedbredde"
 
 #: libexif/exif-tag.c:223
-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 ""
-"Antallet af kolonner med billeddata, lig antallet af billedpunkter per "
-"række. I JPEG-komprimeret data bliver en JPEG-markør brugt i steden for "
-"dette mærke."
+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 "Antallet af kolonner med billeddata, lig antallet af billedpunkter per række. I JPEG-komprimeret data bliver en JPEG-markør brugt i steden for dette mærke."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
 msgstr "Billedlængde"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"Antallet af rækker med billeddata. I JPEG-komprimeret data bliver en JPEG-"
-"markør brugt i steden for dette mærke."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Antallet af rækker med billeddata. I JPEG-komprimeret data bliver en JPEG-markør brugt i steden for dette mærke."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
 msgstr "Bit per eksempel"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
-"Antallet af bit per billedkomponent. I denne standard er hver "
-"billedkomponent på 8 bit, så væriden for dette mærke er 8. Se også "
-"<SamplesPerPixel>. I JPEG-komprimeret data bliver en JPEG-markør brugt i "
-"steden for dette mærke."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Antallet af bit per billedkomponent. I denne standard er hver billedkomponent på 8 bit, så væriden for dette mærke er 8. Se også <SamplesPerPixel>. I JPEG-komprimeret data bliver en JPEG-markør brugt i steden for dette mærke."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Komprimering"
 
 #: libexif/exif-tag.c:238
-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 ""
-"Komprimeringssystemet brugt til billeddataene. Når det primære billede er "
-"JPEG-komprimeret, så er denne skelnen ikke nødvendig og udelades. Når "
-"miniaturerbilleder bruger JPEG-komprimering, så sættes værdien af dette "
-"mærke til 6."
+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 "Komprimeringssystemet brugt til billeddataene. Når det primære billede er JPEG-komprimeret, så er denne skelnen ikke nødvendig og udelades. Når miniaturerbilleder bruger JPEG-komprimering, så sættes værdien af dette mærke til 6."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
 msgstr "Fotometrisk fortolkning"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
-"Billedpunktkompositionen. I JPEG-komprimeret data bruges en JPEG-markør i "
-"steden for dette mærke."
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Billedpunktkompositionen. I JPEG-komprimeret data bruges en JPEG-markør i steden for dette mærke."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
@@ -3081,60 +2869,32 @@ msgid "Image Description"
 msgstr "Billedbeskrivelse"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
-"En tegnstreng der angiver titlen på billedet. Det kan være en kommentar som "
-"»1988 firmaskovtur« eller noget lignende. To byte tegnkoder kan ikke bruges. "
-"Når en 2-byte kode er nødvendig, skal Exif Private-mærket <UserComment> "
-"bruges."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "En tegnstreng der angiver titlen på billedet. Det kan være en kommentar som »1988 firmaskovtur« eller noget lignende. To byte tegnkoder kan ikke bruges. Når en 2-byte kode er nødvendig, skal Exif Private-mærket <UserComment> bruges."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Producent"
 
 #: libexif/exif-tag.c:261
-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 ""
-"Producenten på optagelsesudstyret. Dette er producenten af DSC'en, "
-"skanneren, videooptageren eller andet udstyr som skabte billedet. NÃ¥r feltet "
-"er tomt, opfattes denne som ukendt."
+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 "Producenten på optagelsesudstyret. Dette er producenten af DSC'en, skanneren, videooptageren eller andet udstyr som skabte billedet. Når feltet er tomt, opfattes denne som ukendt."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Model"
 
 #: libexif/exif-tag.c:268
-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 ""
-"Modelnavnet eller modelnummeret på udstyret. Dette er modelnavnet eller "
-"nummeret på DSC'en, skanneren, videooptageren eller andet udstyr som skabte "
-"billedet. NÃ¥r feltet er tomt, opfattes dette som ukendt."
+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 "Modelnavnet eller modelnummeret på udstyret. Dette er modelnavnet eller nummeret på DSC'en, skanneren, videooptageren eller andet udstyr som skabte billedet. Når feltet er tomt, opfattes dette som ukendt."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
 msgstr "Strimmelafsætning"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
-"For hver strimmel, byteafsætningen på den strimmel. Det anbefales at denne "
-"vælges så antallet af strimmelbyte ikke overstiger 64 Kbyte. Med JPEG-"
-"komprimeret data er denne udpegning ikke nødvendig og udelades. Se også "
-"<RowsPerStrip< og <StripByteCounts>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "For hver strimmel, byteafsætningen på den strimmel. Det anbefales at denne vælges så antallet af strimmelbyte ikke overstiger 64 Kbyte. Med JPEG-komprimeret data er denne udpegning ikke nødvendig og udelades. Se også <RowsPerStrip< og <StripByteCounts>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
@@ -3149,152 +2909,88 @@ msgid "Samples per Pixel"
 msgstr "Eksempler per billedpunkt"
 
 #: libexif/exif-tag.c:285
-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 ""
-"Antallet af komponenter per billedpunkt. Da denne standard er gældende for "
-"RGB- og YCbCr-billeder, er værdien for dette mærke sat til 3. I JPEG-"
-"komprimeret data bruges en JPEG-markør i steden for det mærke."
+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 "Antallet af komponenter per billedpunkt. Da denne standard er gældende for RGB- og YCbCr-billeder, er værdien for dette mærke sat til 3. I JPEG-komprimeret data bruges en JPEG-markør i steden for det mærke."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
 msgstr "Rækker per strimmel"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
-"Antallet af rækker per strimmel. Dette er antallet af rækker i billedet af "
-"en strimmel når et billede opdeles i strimler. Med JPEG-komprimeret data "
-"behøves denne udpegning ikke og udelades. Se også <StripOffsets> og "
-"<StripBytecounts>."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Antallet af rækker per strimmel. Dette er antallet af rækker i billedet af en strimmel når et billede opdeles i strimler. Med JPEG-komprimeret data behøves denne udpegning ikke og udelades. Se også <StripOffsets> og <StripBytecounts>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
 msgstr "Strimmel byteoptælling"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
-"Det samlede antal byte i hver strimmel. Med JPEG-komprimeret data behøves "
-"denne udpegning ikke og udelades."
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Det samlede antal byte i hver strimmel. Med JPEG-komprimeret data behøves denne udpegning ikke og udelades."
 
 #: libexif/exif-tag.c:301
 msgid "X-Resolution"
 msgstr "X-opløsning"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
-"Antallet af billedpunkter per <ResolutionUnit> i <ImageWidth>-retningen. NÃ¥r "
-"denne billedopløsning er ukendt tildeles 72 [dpi]."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Antallet af billedpunkter per <ResolutionUnit> i <ImageWidth>-retningen. Når denne billedopløsning er ukendt tildeles 72 [dpi]."
 
 #: libexif/exif-tag.c:306
 msgid "Y-Resolution"
 msgstr "Y-opløsning"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"Antallet af billedpunkter per <ResolutionUnit> i <ImageLength>-retningen. "
-"Den samme værdi som <XResolution> tildeles."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Antallet af billedpunkter per <ResolutionUnit> i <ImageLength>-retningen. Den samme værdi som <XResolution> tildeles."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
 msgstr "Plan konfiguration"
 
 #: libexif/exif-tag.c:312
-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 ""
-"Indikerer om billedpunktkomponenter er optaget i klumpet eller plant format. "
-"I JPEG-komprimeret filer bruges en JPEG-markør i steden for dette mærke. "
-"Hvis dette felt ikke eksisterer, antages TIFF-standarden 1 (klumpet)."
+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 "Indikerer om billedpunktkomponenter er optaget i klumpet eller plant format. I JPEG-komprimeret filer bruges en JPEG-markør i steden for dette mærke. Hvis dette felt ikke eksisterer, antages TIFF-standarden 1 (klumpet)."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "Opløsningsenhed"
 
 #: libexif/exif-tag.c:318
-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 ""
-"Enheden der måler <XResolution> og <YResolution>. Den samme enhed bruges for "
-"både <XResolution> og <YResolution>. Hvis billedopløsningen er ukendt "
-"tildeles 2 (tommer)."
+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 "Enheden der måler <XResolution> og <YResolution>. Den samme enhed bruges for både <XResolution> og <YResolution>. Hvis billedopløsningen er ukendt tildeles 2 (tommer)."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
 msgstr "Overførelsesfunktion"
 
 #: libexif/exif-tag.c:324
-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 ""
-"En overførelsesfunktion for billedet, beskrevet i tabulær stil. Normalt er "
-"dette mærke ikke nødvendigt, da farvemellemrum er angivet i "
-"farvemellemrumsinformationsmærket (<ColorSpace>)."
+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 "En overførelsesfunktion for billedet, beskrevet i tabulær stil. Normalt er dette mærke ikke nødvendigt, da farvemellemrum er angivet i farvemellemrumsinformationsmærket (<ColorSpace>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Program"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
-"Dette mærke viser navnet og versionen på det program eller firmware på "
-"kameraet eller billedinddataenheden som blev brugt til at generere billedet. "
-"Det detaljerede format er ikke angivet, men det anbefales at eksempelt vist "
-"nedenfor følges. Når feltet efterlades uudfyldt, behandles det som ukendt."
+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 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."
+msgstr "Dette mærke viser navnet og versionen på det program eller firmware på kameraet eller billedinddataenheden som blev brugt til at generere billedet. Det detaljerede format er ikke angivet, men det anbefales at eksempelt vist nedenfor følges. Når feltet efterlades uudfyldt, behandles det som ukendt."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Dato og tid"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"Datoen og tiden for oprettelsen af billedet. I denne standard (EXIF-2.1) er "
-"det datoen og tiden filen sidst blev ændret."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "Datoen og tiden for oprettelsen af billedet. I denne standard (EXIF-2.1) er det datoen og tiden filen sidst blev ændret."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Kunstner"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
-"Dette mærke viser navnet på kameraejeren, fotografen eller personen der "
-"oprettede billedet. Det detaljerede format er ikke angivet, men det "
-"anbefales at informationerne skrives som vist i eksemplet nedenfor for at "
-"lette interoperabiliteten. NÃ¥r feltet er uudfyldt, opfattes det som ukendt."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "Dette mærke viser navnet på kameraejeren, fotografen eller personen der oprettede billedet. Det detaljerede format er ikke angivet, men det anbefales at informationerne skrives som vist i eksemplet nedenfor for at lette interoperabiliteten. Når feltet er uudfyldt, opfattes det som ukendt."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
@@ -3302,34 +2998,20 @@ msgstr "Hvidpunkt"
 
 # Kromaticiteten for billedets hvidpunkt
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
-"Kromaticiteten på det hvide punkt i billedet. Normalt er dette mærke ikke "
-"nødvendigt, da farverum er angivet i informationsmærket for farverum "
-"(<ColorSpace>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Kromaticiteten på det hvide punkt i billedet. Normalt er dette mærke ikke nødvendigt, da farverum er angivet i informationsmærket for farverum (<ColorSpace>)."
 
 #: libexif/exif-tag.c:353
 msgid "Primary Chromaticities"
 msgstr "Primære kromaticiteter"
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
-msgstr ""
-"Kromaticiteten på de tre primære farver i billedet. Normalt er dette mærke "
-"ikke nødvendigt, da farverum er angivet i informationsmærket for farverum "
-"(<ColorSpace>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Kromaticiteten på de tre primære farver i billedet. Normalt er dette mærke ikke nødvendigt, da farverum er angivet i informationsmærket for farverum (<ColorSpace>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
-"Defineret af Adobe Corporation for at kunne slå TIFF-træer til inden i en "
-"TIFF-fil."
+msgstr "Defineret af Adobe Corporation for at kunne slå TIFF-træer til inden i en TIFF-fil."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
@@ -3340,48 +3022,24 @@ msgid "JPEG Interchange Format"
 msgstr "JPEG-udvekslingsformat"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
-"Afsætningen til startbyten (SOI) på JPEG-komprimeret data for "
-"miniaturebillede. Denne bruges ikke til primære JPEG-billeddata."
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "Afsætningen til startbyten (SOI) på JPEG-komprimeret data for miniaturebillede. Denne bruges ikke til primære JPEG-billeddata."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
 msgstr "JPEG-udvekslingsformatlængde"
 
 #: libexif/exif-tag.c:373
-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 ""
-"Antallet af byte i JPEG-komprimeret miniaturedata. Dette bruges ikke til "
-"primære billed-JPEG-data. JPEG-miniaturebilleder opdeles ikke, men optages "
-"som en fortsættende JPEG-bitstrøm fra SOI til EOI. Appn- og COM-markører bør "
-"ikke optages. Komprimeret miniaturebilleder skal optages i ikke mere end 64 "
-"Kbyte, inklusive alle andre data der optages i APP1."
+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 "Antallet af byte i JPEG-komprimeret miniaturedata. Dette bruges ikke til primære billed-JPEG-data. JPEG-miniaturebilleder opdeles ikke, men optages som en fortsættende JPEG-bitstrøm fra SOI til EOI. Appn- og COM-markører bør ikke optages. Komprimeret miniaturebilleder skal optages i ikke mere end 64 Kbyte, inklusive alle andre data der optages i APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
 msgstr "YCbCr-koefficienter"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
-"Matricekoefficienterne for omdannelse fra RGB- til YCbCr-billeddata. Ingen "
-"standard er angivet i TIFF; men her bruges værdien angivet i »Color Space "
-"Guidelines« som standard. Farverummet er deklareret i informationsmærket for "
-"farverum, hvor standarden er værdien som giver denne betingelse den optimale "
-"billedkarakteristiske interoperabilitet."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "Matricekoefficienterne for omdannelse fra RGB- til YCbCr-billeddata. Ingen standard er angivet i TIFF; men her bruges værdien angivet i »Color Space Guidelines« som standard. Farverummet er deklareret i informationsmærket for farverum, hvor standarden er værdien som giver denne betingelse den optimale billedkarakteristiske interoperabilitet."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
@@ -3393,42 +3051,16 @@ msgstr "YCbCr undersampling"
 # Luminance is a photometricmeasure of the luminous intensity per unit
 # area of lighttravelling in a given direction. 
 #: libexif/exif-tag.c:393
-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 ""
-"Samplingsforholdet på chrominance-komponenter i forhold til "
-"lysstyrkekomponenten. I JPEG-komprimeret data bruges en JPEG-markør i steden "
-"for dette mærke."
+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 "Samplingsforholdet på chrominance-komponenter i forhold til lysstyrkekomponenten. I JPEG-komprimeret data bruges en JPEG-markør i steden for dette mærke."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
 msgstr "YCbCr-placering"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
-"Placeringen af chrominance-komponenterne i forhold til lysstyrkekomponenten. "
-"Dette felt er kun designet til brug for JPEG-komprimeret data eller "
-"ukomprimeret YCbCr-data. TIFF-værdien er 1 (centreret); men når Y:Cb:Cr = "
-"4:2;2 er det anbefalet i denne standard at 2 (co-placeret) bruges til at "
-"optage data med, for at forbedre billedkvaliteten ved visning på tv. Når "
-"dette felt ikke eksisterer vil læseren antage TIFF-standarden. I tilfældet "
-"med Y:Cb:Cr = 4:2;0 anbefales TIFF-standarden (centreret). Hvis læseren ikke "
-"har kapacitet til at understøtte begge slags <YCbCrPositioning> skal den "
-"følge TIFF-standarden uanset værdien i dette felt. Det er at foretrække hvis "
-"læserne kan understøtte både centreret og co-placeret positionering."
+msgid "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."
+msgstr "Placeringen af chrominance-komponenterne i forhold til lysstyrkekomponenten. Dette felt er kun designet til brug for JPEG-komprimeret data eller ukomprimeret YCbCr-data. TIFF-værdien er 1 (centreret); men når Y:Cb:Cr = 4:2;2 er det anbefalet i denne standard at 2 (co-placeret) bruges til at optage data med, for at forbedre billedkvaliteten ved visning på tv. Når dette felt ikke eksisterer vil læseren antage TIFF-standarden. I tilfældet med Y:Cb:Cr = 4:2;0 anbefales TIFF-standarden (centreret). Hvis læseren ikke har kapacitet til at understøtte begge slags <YCbCrPositioning> skal den følge TIFF-standarden uanset værdien i dette felt. Det er at foretrække hvis læserne kan understøtte både centreret og co-placeret positionering."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
@@ -3436,17 +3068,8 @@ msgstr "Reference for sort/hvid"
 
 # evt. noget med "sort- og hvidpunkt."
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
-"Referenceværdien for det sorte og hvide punkt. Ingen standarder er angivet i "
-"TIFF, men værdierne nedenfor er angivet som standarder her. Farverummet er "
-"angivet i et informationsmærke for farverum, hvor standarden er værdien som "
-"giver denne betingelse den optimale billedkarakteristiske interoperabilitet."
+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 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."
+msgstr "Referenceværdien for det sorte og hvide punkt. Ingen standarder er angivet i TIFF, men værdierne nedenfor er angivet som standarder her. Farverummet er angivet i et informationsmærke for farverum, hvor standarden er værdien som giver denne betingelse den optimale billedkarakteristiske interoperabilitet."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
@@ -3461,14 +3084,8 @@ msgid "CFA Pattern"
 msgstr "CFA-mønster"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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 ""
-"Indikerer det geometriske mønster for farvefiltertabellen (CFA) på "
-"billedsensoren når en farveområdesensor med én chip bruges. Mønsteret gælder "
-"ikke for alle sensormetoder."
+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 "Indikerer det geometriske mønster for farvefiltertabellen (CFA) på billedsensoren når en farveområdesensor med én chip bruges. Mønsteret gælder ikke for alle sensormetoder."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
@@ -3479,47 +3096,14 @@ msgid "Copyright"
 msgstr "Ophavsret"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
-"Information om ophavsret. I denne standard angives både fotografens og "
-"redaktørens ophavsret i samme mærke. Her angives  ophavsretsoplysningen for "
-"personen eller organisationen som hævder at have rettighederne til billedet. "
-"Interoperabilityerklæringen for ophavsret inklusive dato og rettigheder bør "
-"skrives i dette felt; for eksempel, »Ophavsret, Kaj Jensen, 19xx. Alle "
-"rettigheder forbeholdes.«. I denne standard registreres både fotografen og "
-"redaktøren i samme felt. Når der er en klar forskel på fotografens og "
-"redaktørens ophavsret, skal de skrives i rækkefølge med fotografen først "
-"efterfulgt af redaktørens ophavsret, adskilt af NULL (da udsagnet også "
-"afsluttes med NULL, er der i dette tilfælde to NULL-koder) (se eksempel 1). "
-"NÃ¥r kun fotografen er angivet, afsluttes med en NULL-kode (se eksempel 2). "
-"Når kun redaktørens rettighed er angivet, består fotografens ophavsretdel af "
-"et mellemrum efterfulgt af en afsluttende NULL-kode, hvorefter redaktørens "
-"ophavsret er angivet (se eksempel 3). NÃ¥r feltet efterlades blankt, "
-"behandles oplysningen som ukendt."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Information om ophavsret. I denne standard angives både fotografens og redaktørens ophavsret i samme mærke. Her angives  ophavsretsoplysningen for personen eller organisationen som hævder at have rettighederne til billedet. Interoperabilityerklæringen for ophavsret inklusive dato og rettigheder bør skrives i dette felt; for eksempel, »Ophavsret, Kaj Jensen, 19xx. Alle rettigheder forbeholdes.«. I denne standard registreres både fotografen og redaktøren i samme felt. Når der er en klar forskel på fotografens og redaktørens ophavsret, skal de skrives i rækkefølge med fotografen først efterfulgt af redaktørens ophavsret, adskilt af NULL (da udsagnet også afsluttes med NULL, er der i dette tilfælde to NULL-koder) (se eksempel 1). Når kun fotografen er angivet, afsluttes med en NULL-kode (se eksempel 2). Når kun redaktørens rettighed er angivet, består fotografens ophavsretdel af et mellemrum efterfulgt af en afsluttende NULL-kode, hvorefter redaktørens ophavsret er angivet (se eksempel 3). Når feltet efterlades blankt, behandles oplysningen som ukendt."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Belysningstid, opgivet i sekunder (sek)."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "F-nummer"
-
+# Blændetallet?
 #: libexif/exif-tag.c:470
 msgid "The F number."
 msgstr "F-nummeret."
@@ -3530,78 +3114,48 @@ msgstr "Billedressourceblok"
 
 # engelsk fejl, lille o.
 #: libexif/exif-tag.c:477
-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 ""
-"En peger til Exif IFD'en. Interoperability, Exif IFD har den samme struktur "
-"som den af IFD angivet i TIFF. Normalt indeholder den dog ikke billeddata "
-"som i tilfældet med TIFF."
+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 "En peger til Exif IFD'en. Interoperability, Exif IFD har den samme struktur som den af IFD angivet i TIFF. Normalt indeholder den dog ikke billeddata som i tilfældet med TIFF."
 
 #: libexif/exif-tag.c:485
 msgid "Exposure Program"
 msgstr "Belysningsprogram"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"Klassen af programmet, der bruges af kameraet til at angive belysning, når "
-"billedet tages."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "Klassen af programmet, der bruges af kameraet til at angive belysning, når billedet tages."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
 msgstr "Spektralsensitivitet"
 
 #: libexif/exif-tag.c:491
-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 ""
-"Indikerer spektralsensitiviteten på hver kanal der bruges af kameraet. "
-"Mærkeværdien er en ASCII-streng kompatibel med standarden udviklet af ASTM "
-"Technical Committee."
+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 "Indikerer spektralsensitiviteten på hver kanal der bruges af kameraet. Mærkeværdien er en ASCII-streng kompatibel med standarden udviklet af ASTM Technical Committee."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
 msgstr "IFD-peger for GPS-info"
 
 #: libexif/exif-tag.c:497
-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 ""
-"En peger for GPS Info IFD'en. Interoperabilitystrukturen på GPS Info IFD'en "
-"har som Exif IFD ingen billeddata."
+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 "En peger for GPS Info IFD'en. Interoperabilitystrukturen på GPS Info IFD'en har som Exif IFD ingen billeddata."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
 msgstr "ISO Speed-værdier"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
-"Indikerer ISO Speed og ISO Latitude på kameraet eller inddataenheden som "
-"angivet i ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Indikerer ISO Speed og ISO Latitude på kameraet eller inddataenheden som angivet i ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
 msgstr "Opto-Electronic konversionsfunktion"
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-msgstr ""
-"Indikerer Opto-Electronic konversionsfunktionen (OECF) som angivet i ISO "
-"14524. <OECF> er sammenhængen mellem kameraets optiske inddata og "
-"billedværdierne."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+msgstr "Indikerer Opto-Electronic konversionsfunktionen (OECF) som angivet i ISO 14524. <OECF> er sammenhængen mellem kameraets optiske inddata og billedværdierne."
 
 #: libexif/exif-tag.c:513
 msgid "Time Zone Offset"
@@ -3616,24 +3170,16 @@ msgid "Exif Version"
 msgstr "Version på Exif"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
-"Versionen på denne standard som er understøttet. Hvis dette felt ikke "
-"eksisterer antages det at standarden ikke overholdes."
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "Versionen på denne standard som er understøttet. Hvis dette felt ikke eksisterer antages det at standarden ikke overholdes."
 
 #: libexif/exif-tag.c:520
 msgid "Date and Time (Original)"
 msgstr "Dato og tid (oprindelig)"
 
 #: libexif/exif-tag.c:521
-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 ""
-"Datoen og tidspunktet da de originale billeddata blev skabt. For et digitalt "
-"stillkamera angives datoen og tiden billedet blev optaget på."
+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 "Datoen og tidspunktet da de originale billeddata blev skabt. For et digitalt stillkamera angives datoen og tiden billedet blev optaget på."
 
 #: libexif/exif-tag.c:526
 msgid "Date and Time (Digitized)"
@@ -3649,85 +3195,52 @@ msgstr "Komponentkonfiguration"
 
 # Evt. "Farvekanalerne for hver komponent"
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
-"Information specifik for komprimerede data. Kanalerne på hver komponent er "
-"arrangeret i rækkefølge fra den første komponent til den fjerde. For "
-"ukomprimerede data er dataarrangementet angivet i mærket "
-"<PhotometricInterpretation>. Da <PhotometricInterpretation> dog kun kan "
-"udtrykke rækkefølgen af Y, Cb og Cr, tilbydes dette mærke til tilfælde hvor "
-"komprimerede data bruger komponenter udover Y, Cb og Cr og for at aktivere "
-"understøttelse af andre sekvenser."
+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 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."
+msgstr "Information specifik for komprimerede data. Kanalerne på hver komponent er arrangeret i rækkefølge fra den første komponent til den fjerde. For ukomprimerede data er dataarrangementet angivet i mærket <PhotometricInterpretation>. Da <PhotometricInterpretation> dog kun kan udtrykke rækkefølgen af Y, Cb og Cr, tilbydes dette mærke til tilfælde hvor komprimerede data bruger komponenter udover Y, Cb og Cr og for at aktivere understøttelse af andre sekvenser."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
 msgstr "Komprimerede bit per billedpunkt"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
-"Information specifik for komprimerede data. Komprimeringstilstanden brugt "
-"for et komprimeret billede er indikeret i enheden bit per billedpunkt."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Information specifik for komprimerede data. Komprimeringstilstanden brugt for et komprimeret billede er indikeret i enheden bit per billedpunkt."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Lukkertid"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
-"Lukkertid. Denne enhed er APEX-indstillingen (Additive System of "
-"Photographic Exposure)."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Lukkertid. Denne enhed er APEX-indstillingen (Additive System of Photographic Exposure)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
-msgstr "Linsens blændetal. Enheden er APEX-værdien."
+msgstr "Objektivets blændetal. Enheden er APEX-værdien."
 
 #: libexif/exif-tag.c:553
 msgid "Brightness"
 msgstr "Lysstyrke"
 
 #: libexif/exif-tag.c:554
-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 ""
-"Værdien på lysstyrken. Enheden er APEX-værdien. Normalt angives den i "
-"intervallet -99.99 til 99.99."
+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 "Værdien på lysstyrken. Enheden er APEX-værdien. Normalt angives den i intervallet -99.99 til 99.99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
 msgstr "Belysningsbias"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
-"Belysningsbiasesn. Enheden er APEX-værdien. Normalt angives den i "
-"intervallet -99.99 til 99.99."
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "Belysningsbiasesn. Enheden er APEX-værdien. Normalt angives den i intervallet -99.99 til 99.99."
 
 #: libexif/exif-tag.c:562
 msgid "Maximum Aperture Value"
 msgstr "Maksimal blændetalsværdi"
 
 #: libexif/exif-tag.c:563
-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 ""
-"Linsens mindste F-tal. Enheden er APEX-værdien. Normalt angives den i "
-"intervallet 00.00 til 99.99, men den er ikke begrænset til dette interval."
+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 "Objektivets mindste F-tal. Enheden er APEX-værdien. Normalt angives den i intervallet 00.00 til 99.99, men den er ikke begrænset til dette interval."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
@@ -3750,28 +3263,19 @@ msgid "The kind of light source."
 msgstr "Lyskildetype."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
-msgstr ""
-"Dette mærke optages, når et billede bliver taget med brug af stroboskoplys "
-"(blitz)."
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
+msgstr "Dette mærke optages, når et billede bliver taget med brug af stroboskoplys (blitz)."
 
 #: libexif/exif-tag.c:582
-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 ""
-"Den faktiske brændvidde på linsen, i mm. Konvertering er ikke foretaget på "
-"brændvidden på et 35 mm filmkamera."
+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 "Den faktiske brændvidde på objektivet, i mm. Konvertering er ikke foretaget på brændvidden på et 35 mm filmkamera."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr "Emneområde"
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
+msgid "This tag indicates the location and area of the main subject in the overall scene."
 msgstr "Dette mærke indikerer stedet og området for hovedmotivet i scenen."
 
 #: libexif/exif-tag.c:590
@@ -3783,55 +3287,16 @@ msgid "Maker Note"
 msgstr "Producentnote"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Et mærke for producenter af Exif-forfattere til registrering af ønsket "
-"information. Indholdet er helt op til producenten."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Et mærke for producenter af Exif-forfattere til registrering af ønsket information. Indholdet er helt op til producenten."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
 msgstr "Brugerkommentar"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
-"Et mærke hvor Exifbrugere kan skrive nøgleord eller kommentarer til "
-"billederne udover dem i <ImageDescription>, og uden begrænsningerne på "
-"tegnkodningen i dette mærke. Tegnkoden brugt i mærket <UserComment> "
-"identificeres på grundlag af en id-kode i et fast 8-byte område i starten af "
-"mærkets dataområde. Den ubrugte del af området er fyldt med NULL (00.h). Id-"
-"koder tildeles ved registrering. Betegnelsesmetoden og referencer for hver "
-"tegnkode er defineret i specifikationen. Værdien af CountN afgøres på "
-"grundlag af de 8 byte i tegnkodningsområdet og antallet af byte i "
-"brugerkommentardelen. Da TYPEN ikke er ASCII, er NULL-terminering ikke "
-"nødvendig. Id-koden for området <UserComment> kan være en defineret kode som "
-"JIS eller ASCII, eller kan være udefineret. Det udefinerede navn er "
-"Udefineret tekst, og id-koden fyldes med 8 byte der alle er NULL (00.H). En "
-"Exiflæser som læser mærket <UserComment> skal have en funktion der kan "
-"aflæse id-koden. Denne funktion er ikke krævet hvis Exiflæseren ikke bruger "
-"mærket <UserComment>. Når et <UserComment>-område reserveres anbefales det "
-"at id-koden er i ASCII-format og at den følgende brugerkommentarplads fyldes "
-"med blanke tegn [20.H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "Et mærke hvor Exifbrugere kan skrive nøgleord eller kommentarer til billederne udover dem i <ImageDescription>, og uden begrænsningerne på tegnkodningen i dette mærke. Tegnkoden brugt i mærket <UserComment> identificeres på grundlag af en id-kode i et fast 8-byte område i starten af mærkets dataområde. Den ubrugte del af området er fyldt med NULL (00.h). Id-koder tildeles ved registrering. Betegnelsesmetoden og referencer for hver tegnkode er defineret i specifikationen. Værdien af CountN afgøres på grundlag af de 8 byte i tegnkodningsområdet og antallet af byte i brugerkommentardelen. Da TYPEN ikke er ASCII, er NULL-terminering ikke nødvendig. Id-koden for området <UserComment> kan være en defineret kode som JIS eller ASCII, eller kan være udefineret. Det udefinerede navn er Udefineret tekst, og id-koden fyldes med 8 byte der alle er NULL (00.H). En Exiflæser som læser mærket <UserComment> skal have en funktion der kan aflæse id-koden. Denne funktion er ikke krævet hvis Exiflæseren ikke bruger mærket <UserComment>. Når et <UserComment>-område reserveres anbefales det at id-koden er i ASCII-format og at den følgende brugerkommentarplads fyldes med blanke tegn [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
@@ -3846,20 +3311,16 @@ msgid "Sub-second Time (Original)"
 msgstr "Delsekundtid (oprindelig)"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
-msgstr ""
-"Et mærke brugt til at registrere delsekunder for mærket <DateTimeOriginal>."
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr "Et mærke brugt til at registrere delsekunder for mærket <DateTimeOriginal>."
 
 #: libexif/exif-tag.c:629
 msgid "Sub-second Time (Digitized)"
 msgstr "Delsekundtid (digitaliseret)"
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
-msgstr ""
-"Et mærke brugt til at registrere delsekunder for mærket <DateTimeDigitized>."
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr "Et mærke brugt til at registrere delsekunder for mærket <DateTimeDigitized>."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
@@ -3874,33 +3335,24 @@ msgid "XP Comment"
 msgstr "XP-bemærkning"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
-msgstr ""
-"En tegnstreng indeholdende en bemærkning om billedet, kodet i UTF-16LE."
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
+msgstr "En tegnstreng indeholdende en bemærkning om billedet, kodet i UTF-16LE."
 
 #: libexif/exif-tag.c:644
 msgid "XP Author"
 msgstr "XP-forfatter"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
-msgstr ""
-"En tegnstreng indeholdende navnet på personen der oprettede billedet, kodet "
-"i UTF-16LE."
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
+msgstr "En tegnstreng indeholdende navnet på personen der oprettede billedet, kodet i UTF-16LE."
 
 #: libexif/exif-tag.c:649
 msgid "XP Keywords"
 msgstr "XP-nøgleord"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
-"En tegnstreng indeholdende nøgleord der beskriver billedet, kodet i UTF-16LE."
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "En tegnstreng indeholdende nøgleord der beskriver billedet, kodet i UTF-16LE."
 
 #: libexif/exif-tag.c:654
 msgid "XP Subject"
@@ -3919,134 +3371,48 @@ msgid "Color Space"
 msgstr "Farverum"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
-"Mærket for farveruminformation optages altid som farverumangivelsen. Normalt "
-"bruges sRGB (=1) til at definere farverummet baseret på pc-monitorens "
-"forhold og miljø. Hvis et farverum andet end sRGB bruges angives ukalibreret "
-"(=FFFF.H). Billeddata optaget som ukalibreret kan behandles som sRGB når det "
-"er konverteret til FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "Mærket for farveruminformation optages altid som farverumangivelsen. Normalt bruges sRGB (=1) til at definere farverummet baseret på pc-monitorens forhold og miljø. Hvis et farverum andet end sRGB bruges angives ukalibreret (=FFFF.H). Billeddata optaget som ukalibreret kan behandles som sRGB når det er konverteret til FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
 msgstr "Billedpunktets x-dimension"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
-"Specifik information for komprimerede data. NÃ¥r en komprimeret fil optages, "
-"skal den gyldige bredde på det meningsfulde billede optages i dette mærke, "
-"uanset om der er fylddata eller en genstartsmarkør. Dette mærke bør ikke "
-"forefindes i en ukomprimeret fil."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Specifik information for komprimerede data. Når en komprimeret fil optages, skal den gyldige bredde på det meningsfulde billede optages i dette mærke, uanset om der er fylddata eller en genstartsmarkør. Dette mærke bør ikke forefindes i en ukomprimeret fil."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
 msgstr "Billedpunktets y-dimension"
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
-"Specifik information for komprimerede data. NÃ¥r en komprimeret fil optages, "
-"skal den gyldige højde på det meningsfulde billede optages i dette mærke, "
-"uanset om der er fylddata eller en genstartsmarkør. Dette mærke bør ikke "
-"forefindes i en ukomprimeret fil. Da datafyldning er unødvendigt lodret, vil "
-"antallet af linjer optaget i dette gyldige billedhøjdemærke være det samme "
-"som gemt i SOF'en."
+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, 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."
+msgstr "Specifik information for komprimerede data. Når en komprimeret fil optages, skal den gyldige højde på det meningsfulde billede optages i dette mærke, uanset om der er fylddata eller en genstartsmarkør. Dette mærke bør ikke forefindes i en ukomprimeret fil. Da datafyldning er unødvendigt lodret, vil antallet af linjer optaget i dette gyldige billedhøjdemærke være det samme som gemt i SOF'en."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
 msgstr "Forbundet lydfil"
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
-"Dette mærke bruges til at optage navnet på en lydfil som hænger sammen med "
-"billeddataene. Den eneste henførbare information genereret her er "
-"lydfilnavnet i Exif og filendelsen (en ASCII-streng bestående af 8 tegn + "
-"'.' + 3 tegn). Stien gemmes ikke. Stipulationer på lyd- og "
-"filnavnskonventioner er defineret i specifikationerne. Under brug af dette "
-"mærke, skal lydfiler optages i overensstemmelse med Exifs lydformat. "
-"Forfattere kan også gemme data som lyd indenfor APP2 som FlashPix-"
-"udvidelsesstrømdata. Lydfiler skal optages i overensstemmelse med Exifs "
-"lydformat. Mapningen af Exifs billedfiler og lydfiler gøres på en af "
-"følgende tre måder: [1], [2] og [3]. Hvis flere filer mappes til en fil som "
-"i [2] eller [3], bruges ovenstående format til at genere netop et "
-"lydfilnavn. Hvis der er flere lydfiler, angives den først genereret fil. I "
-"tilfældet [3] er for eksemplet »DSC00001.JPG« kun angivet »SND00001.WAV« som "
-"den forbundne Exif-lydfil. Når der er tre Exif-lydfiler »SND00001.WAV«, "
-"»SND00002.WAV« og »SND00003.WAV«, indikeres Exifs billedfilnavn for hvert af "
-"dem »DSC00001.JPG«. Ved at kombinere flere forbundne informationer, kan et "
-"bredt udvalg af afspilningsmuligheder understøttes. Metoden med at bruge "
-"forbundne informationer er overladt til implementationen på "
-"afspilningssiden. Da denne information er en ASCII-tegnstreng, afsluttes den "
-"med NULL. Når dette mærke bruges til at kortlægge lydfiler, skal relationen "
-"i lydfilen til billedet også angives ved lydfilens afslutning."
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Dette mærke bruges til at optage navnet på en lydfil som hænger sammen med billeddataene. Den eneste henførbare information genereret her er lydfilnavnet i Exif og filendelsen (en ASCII-streng bestående af 8 tegn + '.' + 3 tegn). Stien gemmes ikke. Stipulationer på lyd- og filnavnskonventioner er defineret i specifikationerne. Under brug af dette mærke, skal lydfiler optages i overensstemmelse med Exifs lydformat. Forfattere kan også gemme data som lyd indenfor APP2 som FlashPix-udvidelsesstrømdata. Lydfiler skal optages i overensstemmelse med Exifs lydformat. Mapningen af Exifs billedfiler og lydfiler gøres på en af følgende tre måder: [1], [2] og [3]. Hvis flere filer mappes til en fil som i [2] eller [3], bruges ovenstående format til at genere netop et lydfilnavn. Hvis der er flere lydfiler, angives den først genereret fil. I tilfældet [3] er for eksemplet »DSC00001.JPG« kun angivet »SND00001.WAV« som den forbundne Exif-lydfil. Når der er tre Exif-lydfiler »SND00001.WAV«, »SND00002.WAV« og »SND00003.WAV«, indikeres Exifs billedfilnavn for hvert af dem »DSC00001.JPG«. Ved at kombinere flere forbundne informationer, kan et bredt udvalg af afspilningsmuligheder understøttes. Metoden med at bruge forbundne informationer er overladt til implementationen på afspilningssiden. Da denne information er en ASCII-tegnstreng, afsluttes den med NULL. Når dette mærke bruges til at kortlægge lydfiler, skal relationen i lydfilen til billedet også angives ved lydfilens afslutning."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
 msgstr "Interoperability IFD-peger"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
-"Interoperabilitet-IFD består af mærker som gemmer informationen, der sikrer "
-"interoperabilitet og vejledt af det følgende mærke placeret i Exif-IFD. "
-"Interoperabilitetsstrukturen på interoperabilitet-IFD er den samme som TIFF "
-"defineret IFD-struktur, men indeholder ikke billeddatakarakteristika "
-"sammenlignet med normal TIFF-IFD."
+msgid "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."
+msgstr "Interoperabilitet-IFD består af mærker som gemmer informationen, der sikrer interoperabilitet og vejledt af det følgende mærke placeret i Exif-IFD. Interoperabilitetsstrukturen på interoperabilitet-IFD er den samme som TIFF defineret IFD-struktur, men indeholder ikke billeddatakarakteristika sammenlignet med normal TIFF-IFD."
 
 #: libexif/exif-tag.c:729
 msgid "Flash Energy"
 msgstr "Blitzenergi"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
-"Indikerer stroboskopenergien da billedet blev optaget, som målt i Beam "
-"Candle Power Seconds (BCPS)."
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Indikerer stroboskopenergien da billedet blev optaget, som målt i Beam Candle Power Seconds (BCPS)."
 
 # ups noget med hvor meget man kan udskille små ting og så forstørre dem op
 #: libexif/exif-tag.c:734
@@ -4054,80 +3420,48 @@ msgid "Spatial Frequency Response"
 msgstr "Rumlig frekvenssvar (SFR)"
 
 #: libexif/exif-tag.c:735
-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 ""
-"Dette mærke viser kameraets eller inddataenhedens rumlige frekvenssvartabel "
-"og SFR-værdier i forhold til billedets bredde, billedets højde og diagonale "
-"retning, som angivet i ISO 12233."
+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 "Dette mærke viser kameraets eller inddataenhedens rumlige frekvenssvartabel og SFR-værdier i forhold til billedets bredde, billedets højde og diagonale retning, som angivet i ISO 12233."
 
 #: libexif/exif-tag.c:741
 msgid "Focal Plane X-Resolution"
 msgstr "Brændpunktsplan x-opløsning"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Indikerer antallet af billedpunkter i billedbreddens (X) retning per "
-"<FocalPlaneResolutionUnit> på kameraets brændpunktsplan."
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indikerer antallet af billedpunkter i billedbreddens (X) retning per <FocalPlaneResolutionUnit> på kameraets brændpunktsplan."
 
 #: libexif/exif-tag.c:746
 msgid "Focal Plane Y-Resolution"
 msgstr "Brændpunktsplan y-opløsning"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Indikerer antallet af billedpunkter i billedets højderetning (V) per "
-"<FocalPlaneResolutionUnit> på kameraets brændpunktsplan."
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indikerer antallet af billedpunkter i billedets højderetning (V) per <FocalPlaneResolutionUnit> på kameraets brændpunktsplan."
 
 #: libexif/exif-tag.c:751
 msgid "Focal Plane Resolution Unit"
 msgstr "Brændpunktsopløsningsenhed"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
-"Indikerer enheden til målning af <FocalPlaneXResolutionUnit> og "
-"<FocalPlaneYResolutionUnit>. Denne værdi er den samme som <ResolutionUnit>."
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Indikerer enheden til målning af <FocalPlaneXResolutionUnit> og <FocalPlaneYResolutionUnit>. Denne værdi er den samme som <ResolutionUnit>."
 
 #: libexif/exif-tag.c:757
 msgid "Subject Location"
 msgstr "Emnelokalitet"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
-"Indikerer placeringen af hovedement i scenen. Værdien af dette mærke "
-"repræsenterer billedpunktet i centrum af hovedement set relativt i forhold "
-"til det venstre hjørne, før rotationsproces som fremgår af mærket "
-"<Rotation>. Den første værdi indikerer tallet for x-kolonnen og det andet "
-"indikerer tallet for y-kolonnen."
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Indikerer placeringen af hovedement i scenen. Værdien af dette mærke repræsenterer billedpunktet i centrum af hovedement set relativt i forhold til det venstre hjørne, før rotationsproces som fremgår af mærket <Rotation>. Den første værdi indikerer tallet for x-kolonnen og det andet indikerer tallet for y-kolonnen."
 
 #: libexif/exif-tag.c:765
 msgid "Exposure Index"
 msgstr "Belysningsindeks"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
-msgstr ""
-"Indikerer belysningsindekset valgt på kameraet eller inddataenheden på "
-"tidspunktet for billedoptagelsen."
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Indikerer belysningsindekset valgt på kameraet eller inddataenheden på tidspunktet for billedoptagelsen."
 
 #: libexif/exif-tag.c:769
 msgid "Sensing Method"
@@ -4142,80 +3476,48 @@ msgid "File Source"
 msgstr "Filkilde"
 
 #: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"Indikerer billedkilden. Hvis en DSC optog billedet, vil mærkeværdien på "
-"dette mærke altid være 3, hvilket viser at billedet blev optaget på en DSC."
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Indikerer billedkilden. Hvis en DSC optog billedet, vil mærkeværdien på dette mærke altid være 3, hvilket viser at billedet blev optaget på en DSC."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
 msgstr "Scenetype"
 
 #: libexif/exif-tag.c:779
-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 ""
-"Indikerer scenetypen. Hvis en DSC optog billedet, skal denne mærkeværdi "
-"altid være sat til 1, hvilket viser at billedet blev fotograferet direkte."
+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 "Indikerer scenetypen. Hvis en DSC optog billedet, skal denne mærkeværdi altid være sat til 1, hvilket viser at billedet blev fotograferet direkte."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
 msgstr "Brugerrenderet"
 
 #: libexif/exif-tag.c:790
-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 ""
-"Dette mærke indikerer brugen af speciel behandling på billeddataene, såsom "
-"rendering forbeholdt uddata. Når der udføres speciel behandling forventer "
-"læseren at slå  yderligere behandling fra eller minimere den."
+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 "Dette mærke indikerer brugen af speciel behandling på billeddataene, såsom rendering forbeholdt uddata. Når der udføres speciel behandling forventer læseren at slå  yderligere behandling fra eller minimere den."
 
 #: libexif/exif-tag.c:796
-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 ""
-"Dette mærke indikerer indstillingen for belysningstilstanden da billedet "
-"blev taget. I automatisk sammenstillingstilstand, optager kameraet en serie "
-"af billeder over den samme scene ved forskellige belysningsopsætninger."
+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 "Dette mærke indikerer indstillingen for belysningstilstanden da billedet blev taget. I automatisk sammenstillingstilstand, optager kameraet en serie af billeder over den samme scene ved forskellige belysningsopsætninger."
 
 #: libexif/exif-tag.c:801
 msgid "This tag indicates the white balance mode set when the image was shot."
-msgstr ""
-"Dette punkt indikerer tilstanden for hvidbalance når billedet bliver taget."
+msgstr "Dette punkt indikerer tilstanden for hvidbalance når billedet bliver taget."
 
 #: libexif/exif-tag.c:805
 msgid "Digital Zoom Ratio"
 msgstr "Digitalt zoomforhold"
 
 #: libexif/exif-tag.c:806
-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 ""
-"Dette mærke indikerer forholdt for den digitale zoom da billedet blev taget. "
-"Hvis det optaget tal er 0, indikerer det at digital zoom ikke blev brugt."
+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 "Dette mærke indikerer forholdt for den digitale zoom da billedet blev taget. Hvis det optaget tal er 0, indikerer det at digital zoom ikke blev brugt."
 
 #: libexif/exif-tag.c:811
 msgid "Focal Length in 35mm Film"
 msgstr "Brændvidde i 35 mm film"
 
 #: libexif/exif-tag.c:812
-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 ""
-"Dette mærke indikerer den tilsvarende brændvidde svarende til et 35 mm "
-"kamera, i mm. En værdi på 0 betyder at brændvidden er ukendt. Bemærk at "
-"dette mærke afviger fra BrændVidde-mærket."
+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 "Dette mærke indikerer den tilsvarende brændvidde svarende til et 35 mm kamera, i mm. En værdi på 0 betyder at brændvidden er ukendt. Bemærk at dette mærke afviger fra BrændVidde-mærket."
 
 # scenetype for optagelse
 #: libexif/exif-tag.c:818
@@ -4223,14 +3525,8 @@ msgid "Scene Capture Type"
 msgstr "Sceneoptagelsestype"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
-"Dette mærke indikerer typen af scene som blev optaget. Det kan også bruges "
-"til at optage tilstanden som billedet blev optaget i. Bemærk at dette er "
-"forskelligt fra mærket scenetype <SceneType>."
+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 scene type <SceneType> tag."
+msgstr "Dette mærke indikerer typen af scene som blev optaget. Det kan også bruges til at optage tilstanden som billedet blev optaget i. Bemærk at dette er forskelligt fra mærket scenetype <SceneType>."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
@@ -4241,42 +3537,24 @@ msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "Dette mærke indikerer graden af samlet billedforstærkningsjustering."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Dette mærke indikerer retningen på kontrastbehandlingen brugt af kameraet da "
-"billedet blev taget."
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Dette mærke indikerer retningen på kontrastbehandlingen brugt af kameraet da billedet blev taget."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Dette mærke indikerer retningen på farvemætningsbehandlingen brugt af "
-"kameraet, da billedet blev taget."
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Dette mærke indikerer retningen på farvemætningsbehandlingen brugt af kameraet, da billedet blev taget."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Dette mærke indikerer indstillingen for behandlingen af skarpheden brugt af "
-"kameraet, da billedet blev taget."
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Dette mærke indikerer indstillingen for behandlingen af skarpheden brugt af kameraet, da billedet blev taget."
 
 #: libexif/exif-tag.c:841
 msgid "Device Setting Description"
 msgstr "Beskrivelse af enhedsopsætningen"
 
 #: libexif/exif-tag.c:842
-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 ""
-"Dette mærke indikerer information om de billedtagende betingelser for en "
-"speciel kameramodel. Mærket bruges kun til at indikere de billedtagende "
-"betingelser i læseren."
+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 "Dette mærke indikerer information om de billedtagende betingelser for en speciel kameramodel. Mærket bruges kun til at indikere de billedtagende betingelser i læseren."
 
 #: libexif/exif-tag.c:848
 msgid "Subject Distance Range"
@@ -4291,14 +3569,8 @@ msgid "Image Unique ID"
 msgstr "Unik id for billede"
 
 #: libexif/exif-tag.c:852
-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 ""
-"Dette mærke indikerer en identifikation tildelt unikt til hvert billede. Den "
-"optages som en ASCII-streng svarende til hexadecimal notation og en fast 128-"
-"bit længde."
+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 "Dette mærke indikerer en identifikation tildelt unikt til hvert billede. Den optages som en ASCII-streng svarende til hexadecimal notation og en fast 128-bit længde."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
@@ -4321,16 +3593,8 @@ msgid "Padding"
 msgstr "Udfyldelse med nuller (datafyld)"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
-"Dette mærke reserverer plads som kan bruges senere når yderligere metadata "
-"tilføjes. Nye metadata kan skrives på plads ved at erstatte dette mærke med "
-"et lille dataelement og bruge pladsen til at gemme de nye eller udvidede "
-"metadatamærker."
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Dette mærke reserverer plads som kan bruges senere når yderligere metadata tilføjes. Nye metadata kan skrives på plads ved at erstatte dette mærke med et lille dataelement og bruge pladsen til at gemme de nye eller udvidede metadatamærker."
 
 #: libexif/fuji/mnote-fuji-entry.c:62
 msgid "Softest"
@@ -4408,12 +3672,15 @@ msgstr "NP & blitz"
 
 #: libexif/fuji/mnote-fuji-entry.c:137
 msgid "Aperture priority AE"
-msgstr "Blændetalsprioritet AE"
+msgstr "Blændeprioritet AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:138
 msgid "Shutter priority AE"
 msgstr "Lukkerprioritet AE"
 
+# Øhhhh - aner ikke hvad de bruger det F til her - jeg var ved at 
+# begynde med blænden igen, men det kan jeg ikke se den logiske 
+# sammenhæng i.
 #: libexif/fuji/mnote-fuji-entry.c:146
 msgid "F-Standard"
 msgstr "F-standard"
@@ -4597,11 +3864,11 @@ msgstr "Maksimal brændvidde"
 
 #: libexif/fuji/mnote-fuji-tag.c:62
 msgid "Maximum Aperture at Minimum Focal"
-msgstr "Maksimal blændetal ved minimal brændpunkt"
+msgstr "Maksimal blænde ved minimal brændpunkt"
 
 #: libexif/fuji/mnote-fuji-tag.c:63
 msgid "Maximum Aperture at Maximum Focal"
-msgstr "Maksimal blændetal ved maksimal brændpunkt"
+msgstr "Maksimal blænde ved maksimal brændpunkt"
 
 #: libexif/fuji/mnote-fuji-tag.c:65
 msgid "Order Number"
@@ -4618,23 +3885,29 @@ msgstr "Ugyldig format '%s', forventede '%s' eller '%s'."
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF non D lens"
-msgstr "Linse - AF ikke D"
+msgstr "AF ikke-D objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D or AF-S lens"
-msgstr "Linse - AF-D eller AF-S"
+msgstr "AF-D- eller AF-S-objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:95
 msgid "AF-D G lens"
-msgstr "Linse - AF-D G"
+msgstr "AF-D G-objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:96
 msgid "AF-D VR lens"
-msgstr "Linse - AF-D VR"
-
+msgstr "AF-D VR-objektiv"
+
+# Note: Jeg er selv Olympusbruger, og de sidste 5 linjer hører 
+# til Olympus betegnelserne i filen - det er bare ikke betegnelser
+# jeg kender til. F.eks betegner VR ved Nikon/Canon 
+# billedstabiliseringen, men denne findes indbygget i kamerahuset 
+# ved Olympus (og Sony m.fl.) så hvad det har med objektivet at gøre,
+# ved jeg ikke. MÃ¥ske er programudvikleren ikke klar over det.
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "AF-D G VR lens"
-msgstr "Linse - AF-D G VR"
+msgstr "AF-D G VR-objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:101
 msgid "Flash unit unknown"
@@ -4733,9 +4006,13 @@ msgstr "Hvidglødende"
 msgid "Fluorescence"
 msgstr "Fluorescens"
 
+# I 'gamle dage' fandtes et lyskildefabrikat (tidlig halogentype) af det 
+# navn, der var ret udbredt til fotobrug, så jeg går ud fra, at der er 
+# tale om en beskrivelse af den lystypes farvetone, og ikke noget med 
+# hastighed. Brug uoversat.
 #: libexif/olympus/mnote-olympus-entry.c:140
 msgid "SpeedLight"
-msgstr "HastighedLys"
+msgstr "SpeedLight"
 
 #: libexif/olympus/mnote-olympus-entry.c:143
 msgid "No fisheye"
@@ -5118,7 +4395,7 @@ msgstr "Billedjustering"
 
 #: libexif/olympus/mnote-olympus-tag.c:59
 msgid "Tone Compensation"
-msgstr "Belysningskompensation"
+msgstr "Tonekompensation"
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
@@ -5126,7 +4403,7 @@ msgstr "Adapter"
 
 #: libexif/olympus/mnote-olympus-tag.c:62
 msgid "Lens"
-msgstr "Linse"
+msgstr "Objektiv"
 
 #: libexif/olympus/mnote-olympus-tag.c:63
 #: libexif/olympus/mnote-olympus-tag.c:135
@@ -5148,7 +4425,7 @@ msgstr "Sammenstilling"
 
 #: libexif/olympus/mnote-olympus-tag.c:69
 msgid "Lens F Stops"
-msgstr "Linse F standsninger"
+msgstr "Objektivets blændeinterval"
 
 #: libexif/olympus/mnote-olympus-tag.c:70
 msgid "Contrast Curve"
@@ -5227,10 +4504,9 @@ msgstr "Miniaturebilled"
 msgid "Speed/Sequence/Panorama Direction"
 msgstr "Hastighed/sekvens/panoramaretning"
 
-# tilstand udeladt.
 #: libexif/olympus/mnote-olympus-tag.c:109
 msgid "Black & White Mode"
-msgstr "Sort & hvid"
+msgstr "S/H-tilstand"
 
 #: libexif/olympus/mnote-olympus-tag.c:111
 msgid "Focal Plane Diagonal"
@@ -5238,7 +4514,7 @@ msgstr "Brændpunktsplan diagonalt"
 
 #: libexif/olympus/mnote-olympus-tag.c:112
 msgid "Lens Distortion Parameters"
-msgstr "Linseforstyrrelsesparametre"
+msgstr "Objektivets forvrængningsparametre"
 
 #: libexif/olympus/mnote-olympus-tag.c:114
 msgid "Info"
@@ -5295,7 +4571,7 @@ msgstr "Sensortemperatur"
 
 #: libexif/olympus/mnote-olympus-tag.c:131
 msgid "Lens Temperature"
-msgstr "Linsetemperatur"
+msgstr "Objektivtemperatur"
 
 #: libexif/olympus/mnote-olympus-tag.c:132
 msgid "Light Condition"
@@ -5409,11 +4685,11 @@ msgstr "CCD-skanningstilstand"
 
 #: libexif/olympus/mnote-olympus-tag.c:164
 msgid "Infinity Lens Step"
-msgstr "Uendelig linsetrin"
+msgstr "Uendeligt objektivtrin"
 
 #: libexif/olympus/mnote-olympus-tag.c:165
 msgid "Near Lens Step"
-msgstr "Tæt på linsetrin"
+msgstr "Tæt på objektivtrin"
 
 #: libexif/olympus/mnote-olympus-tag.c:166
 msgid "Light Value Center"
@@ -5427,9 +4703,10 @@ msgstr "Lysværdiperiferi"
 msgid "Sequential Shot"
 msgstr "Sekvensskud"
 
+# I denne sammenhæng vil jeg mene, at Wide er bred ??? (lang eller bred?)
 #: libexif/olympus/mnote-olympus-tag.c:171
 msgid "Wide Range"
-msgstr "Lang afstand"
+msgstr "Breddeafstand"
 
 #: libexif/olympus/mnote-olympus-tag.c:172
 msgid "Color Adjustment Mode"
@@ -5484,10 +4761,12 @@ msgstr "Epsonbilledhøjde"
 msgid "Epson Software Version"
 msgstr "Epsonprogramversion"
 
+# Det at der tages flere billeder i det samme billede. Lad stå uoversat, 
+# ellers "Flergangsbelysning".
 #: libexif/pentax/mnote-pentax-entry.c:80
 #: libexif/pentax/mnote-pentax-entry.c:134
 msgid "Multi-exposure"
-msgstr "Flerbelysning"
+msgstr "Flergangsbelysning"
 
 #: libexif/pentax/mnote-pentax-entry.c:83
 #: libexif/pentax/mnote-pentax-entry.c:137
@@ -5570,7 +4849,7 @@ msgstr "Levende lys"
 
 #: libexif/pentax/mnote-pentax-entry.c:189
 msgid "Natural skin tone"
-msgstr "Naturlig hudfarve"
+msgstr "Naturlig hudtone"
 
 # er vist et navn
 #: libexif/pentax/mnote-pentax-entry.c:190
@@ -5721,7 +5000,7 @@ msgstr "Tidszone"
 
 #: libexif/pentax/mnote-pentax-tag.c:61
 msgid "Daylight Savings"
-msgstr "Dagslysforhold"
+msgstr "Sommertid"
 
 #: libexif/pentax/mnote-pentax-tag.c:64
 msgid "Preview Size"
@@ -5843,7 +5122,7 @@ msgstr "AE-info"
 
 #: libexif/pentax/mnote-pentax-tag.c:115
 msgid "Lens Info"
-msgstr "Linseinfo"
+msgstr "Objektivinfo"
 
 #: libexif/pentax/mnote-pentax-tag.c:116
 msgid "Flash Info"
@@ -5900,9 +5179,12 @@ msgstr "Finere"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER_da]"
 
+# Skal det være Blændetal?
+#~ msgid "FNumber"
+#~ msgstr "FNummer"
+
 #~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr ""
-#~ "Mærke Brugerkommentar overholder ikke standard, men indeholder data."
+#~ msgstr "Mærke Brugerkommentar overholder ikke standard, men indeholder data."
 
 #~ msgid "%.02lf EV"
 #~ msgstr "%.02lf EV"
diff --git a/po/de.gmo b/po/de.gmo
deleted file mode 100644
index 3fea5b2..0000000
--- a/po/de.gmo
+++ /dev/null
diff --git a/po/de.po b/po/de.po
index 44f5007..0093744 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,4 +1,4 @@
-# German Translation for libexif.
+# German Translation for libexif 0.6.21
 # Copyright:
 # This file is distributed under the same license as the libexif package.
 #
@@ -6,22 +6,22 @@
 #   Lutz Mueller <lutz@users.sourceforge.net>, 2002.
 #   Marcus Meissner <marcus@jet.franken.de>, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 #   Mario Blättermann <mario.blaettermann@gmail.com>, 2011.
-#   Christian Kirbach <Christian.Kirbach@googlemail.com>, 2011, 2012.
+#   Christian Kirbach <christian.kirbach@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.21-pre1\n"
+"Project-Id-Version: libexif 0.6.22-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2012-07-05 23:45+0100\n"
-"Last-Translator: Christian Kirbach <christian.kirbach@googlemail.com>\n"
+"POT-Creation-Date: 2019-07-01 15:57+0200\n"
+"PO-Revision-Date: 2019-07-01 16:04+0200\n"
+"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\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"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 2.0.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -45,7 +45,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Ungültige Anzahl von Komponenten (%i, %i oder %i wurden erwartet)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -56,14 +56,14 @@ msgstr "Makro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -92,15 +92,15 @@ msgstr "Sehr fein"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -132,8 +132,8 @@ msgstr "Automatisch"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -153,8 +153,7 @@ msgstr "Langsame Synchronisation"
 msgid "Auto, red-eye reduction"
 msgstr "Automatisch + Rote-Augen-Effekt"
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr "An, Rote-Augen-Effekt"
 
@@ -278,9 +277,8 @@ msgstr "Vollautomatisch"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -292,7 +290,7 @@ msgid "Manual"
 msgstr "Manuell"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -321,7 +319,7 @@ msgid "Sepia"
 msgstr "Sepia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -348,8 +346,7 @@ msgstr "Lebhaft"
 msgid "Neutral"
 msgstr "Neutral"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "Blitz aus"
 
@@ -431,7 +428,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Keine"
@@ -444,8 +441,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "Andere"
 
@@ -495,11 +492,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Standard"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "Punkt"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Mittelwert"
 
@@ -507,11 +504,11 @@ msgstr "Mittelwert"
 msgid "Evaluative"
 msgstr "Berechnend"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Partiell"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr "Mittenbetontes Integral"
 
@@ -523,7 +520,7 @@ msgstr "Unbekannt"
 msgid "Very close"
 msgstr "Sehr nah"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Nah"
 
@@ -1035,32 +1032,32 @@ msgid "Sunny"
 msgstr "Sonnig"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Wolkig"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Glühlampenlicht"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Leuchstoffröhre"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Blitz"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Schatten"
@@ -1082,7 +1079,7 @@ msgid "PC set 3"
 msgstr "PC Set 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Tageslicht-Leuchtstoffröhre"
@@ -1095,7 +1092,7 @@ msgstr "Benutzerdefiniert 1"
 msgid "Custom 2"
 msgstr "Benutzerdefiniert 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1160,22 +1157,22 @@ msgid "Rotated by software"
 msgstr "Per Software gedreht"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Links nach rechts"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Rechts nach links"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Unten nach oben"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Oben nach unten"
 
@@ -1185,7 +1182,7 @@ msgstr "2x2 Matrix (im Uhrzeigersinn)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1203,9 +1200,8 @@ msgstr "Niedrigster"
 msgid "Highest"
 msgstr "Höchster"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1260,37 +1256,44 @@ msgstr "Einfarbig"
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i Byte(s) unbekannte Daten"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr "Einstellungen (erster Teil)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Brennweite"
 
@@ -1298,8 +1301,7 @@ msgstr "Brennweite"
 msgid "Settings (Second Part)"
 msgstr "Einstellungen (zweiter Teil)"
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1354,22 +1356,21 @@ msgstr "Qualität"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "Blitzmodus"
 
 # ?
 #: libexif/canon/mnote-canon-tag.c:60 libexif/pentax/mnote-pentax-tag.c:101
 msgid "Drive Mode"
-msgstr "Antriebsmodus"
+msgstr "Serienbild-Modus"
 
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "Fokusmodus"
 
@@ -1388,25 +1389,24 @@ msgstr "Einfacher Aufnahmemodus"
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "Digitaler Zoom"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1416,7 +1416,7 @@ msgstr "Schärfe"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "Belichtungsmessung"
@@ -1430,7 +1430,7 @@ msgid "AF Point"
 msgstr "AF-Punkt"
 
 # evtl "Motivprogramm"
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Belichtungsmodus"
 
@@ -1538,7 +1538,7 @@ msgid "Exposure Compensation"
 msgstr "Belichtungskorrektur"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1578,11 +1578,12 @@ msgstr "Größte fokussierbare Entfernung"
 msgid "Focus Distance Lower"
 msgstr "Kleinste fokussierbare Entfernung"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr "Blendenwert"
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Belichtungszeit"
@@ -1631,35 +1632,35 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr "Größe der Daten zu klein, um EXIF-Daten aufzunehmen."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr "EXIF-Marker nicht gefunden."
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr "EXIF-Kopfdaten nicht gefunden."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr "Unbekannte Kodierung."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr "Unbekannte EXIF-Tags ignorieren"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Unbekannte Tags beim Laden der EXIF-Daten ignorieren."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr "Spezifikation beachten"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
@@ -1667,11 +1668,11 @@ msgstr ""
 "Einträge hinzufügen, korrigieren oder entfernen, um EXIF-Daten zu erhalten, "
 "die der Spezifikation entsprechen."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr "MakerNote nicht ändern"
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1731,23 +1732,23 @@ msgstr ""
 "Das Tag »UserComment« begann nicht mit einem Formattyp. Dieser Fehler wurde "
 "behoben."
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i Byte unbekannte Daten"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i Byte von nicht unterstütztem Datentyp"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 "Das Tag »%s« enthält ein ungültiges Datenformat »%s«, »%s« wurde erwartet."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
@@ -1755,175 +1756,172 @@ msgstr ""
 "Das Tag »%s« enthält eine ungültige Anzahl von Komponenten (%i, %i wurden "
 "erwartet)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr "»Häppchen«-Format"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr "Lineares Format"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Undefiniert"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "Einzelchip-Farbsensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr "Zweichip-Farbsensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr "Dreichip-Farbsensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr "Farbsequenz-Bereichssensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr "Trilinearer Sensor"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr "Farbsequenz-Linearsensor"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Oben links"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Oben rechts"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Unten rechts"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Unten links"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr "Links oben"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr "Rechts oben"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr "Rechts unten"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr "Links unten"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr "Zentriert"
 
-#: libexif/exif-entry.c:680
-#, fuzzy
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr "Co-sited"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr "Schwarz-Weiß negativ"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr "Schwarz-Weiß normal"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Palette"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "Normale Verarbeitung"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "Gesonderte Verarbeitung"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr "Automatische Belichtung"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Manuelle Belichtung"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr "Automatische Belichtungsreihe"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr "Automatischer Weißabgleich"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr "Manueller Weißabgleich"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr "Wenig Verstärkung"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr "Hohe Verstärkung"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr "Wenig Abschwächung"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr "Hohe Abschwächung"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "Geringe Sättigung"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Hohe Sättigung"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "Weich"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1931,178 +1929,178 @@ msgstr "Weich"
 msgid "Hard"
 msgstr "Hart"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr "Mittel"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr "Mittenbetont"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr "Mehrpunkt"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Muster"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "Unkomprimiert"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "LZW-Kompression"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "JPEG-Kompression"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr "Deflate/ZIP-Kompression"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr "PackBits-Kompression"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr "Weißes Glühlampenlicht"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Gutes Wetter"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Bewölkung"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Weiße Tageslicht-Leuchtstoffröhren"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr "Kaltweiße Leuchtstoffröhren"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "Weiße Leuchtstoffröhren"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "Normallicht A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "Normallicht B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "Normallicht C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr "ISO Studio-Glühlampenlicht"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "Zoll"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "Zoll"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Zentimeter"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "Normalprogramm"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr "Zeitautomatik"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "Blende"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr "Blendenautomatik"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr "Verschluss"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr "Kreativprogramm (bevorzugt Schärfentiefe)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr "Kreativ"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr "Kreatives Programm (bevorzugt kurze Belichtungszeit)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "Action"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "Porträt-Modus (für Nahaufnahmen mit unscharfem Hintergrund)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Landschafts-Modus (für Landschaftsaufnahmen mit scharfem Hintergrund)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "Blitz löste nicht aus"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr "Kein Blitz"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr "Blitz löste aus"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2110,76 +2108,76 @@ msgstr "Blitz löste aus"
 msgid "Yes"
 msgstr "Ja"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr "Blitzreflektion nicht erkannt"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr "Ohne Röhrenblitz"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr "Blitzreflektion erkannt"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr "Mit Röhrenblitz"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr "Blitz ausgelöst, erzwungener Blitzmodus"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr "Blitz ausgelöst, erzwungener Blitzmodus, Blitzreflektion nicht erkannt"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr "Blitz ausgelöst, erzwungener Blitzmodus, Blitzreflektion erkannt"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "Blitz nicht ausgelöst, erzwungener Blitzmodus"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr "Blitz nicht ausgelöst, automatischer Modus"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr "Blitz ausgelöst, automatischer Modus"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr "Blitz ausgelöst, automatischer Modus, keine Blitzreflektion erkannt"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr "Blitz ausgelöst, automatischer Modus, Blitzreflektion erkannt"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr "Keine Blitzlichtfunktion"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr "Blitz ausgelöst, Modus Rote-Augen-Effekt"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
 "Blitz ausgelöst, Modus Rote-Augen-Effekt, Blitzreflektion nicht erkannt"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr "Blitz ausgelöst, Modus Rote-Augen-Effekt, Blitzreflektion erkannt"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "Blitz ausgelöst, erzwungener Blitzmodus, Modus Rote-Augen-Effekt"
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
@@ -2187,7 +2185,7 @@ msgstr ""
 "Blitz ausgelöst, erzwungener Blitzmodus, Modus Rote-Augen-Effekt, keine "
 "Blitzreflektion erkannt"
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
@@ -2195,230 +2193,228 @@ msgstr ""
 "Blitz ausgelöst, erzwungener Blitzmodus, Modus Rote-Augen-Effekt, "
 "Blitzreflektion erkannt"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr "Blitz nicht ausgelöst, automatischer Modus, Modus Rote-Augen-Effekt"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "Blitz ausgelöst, automatischer Modus, Modus Rote-Augen-Effekt"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 "Blitz ausgelöst, automatischer Modus, Blitzreflektion nicht erkannt, Modus "
 "Rote-Augen-Effekt"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 "Blitz ausgelöst, automatischer Modus, Blitzreflektion erkannt, Modus Rote-"
 "Augen-Effekt"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr "Nahansicht"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr "Fernansicht"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr "entfernt"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr "Nicht kalibriert"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Ungültige Größe des Eintrags (%i, erwartet %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr "Nicht unterstützte UNICODE-Zeichenkette."
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr "Nicht unterstützte JIS-Zeichenkette"
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 "Das Tag »UserComment« enthält Daten, verstößt aber gegen die Spezifikation."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Byte an Position %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr "Unbekannte Exif-Version"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif-Version %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix-Version 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix-Version 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr "Unbekannte FlashPix-Version"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[Keins]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "(Fotograf)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Editor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (Kleinbild-Äquivalenz: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " Sek."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d Sek.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d Sek.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Interner Fehler (unbekannter Wert %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr "Reserviert"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr "Direkt fotografiert"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "Innerhalb einer Entfernung %i von (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "Innerhalb eines Rechtecks (Breite %i, Höhe %i), um (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Unerwartete Nummer von Komponenten (%li, erwartete 2, 3 oder 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr "Normalnull"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr "Referenz zur Meereshöhe"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr "Unbekannter Wert %i"
@@ -2504,11 +2500,11 @@ msgstr "Beschädigte Daten"
 msgid "The data provided does not follow the specification."
 msgstr "Die gelieferten Daten entsprechen nicht der Spezifikation."
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr "GPS-Tag-Version"
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2521,11 +2517,11 @@ msgstr ""
 "spezifiziert, im Unterschied zum <ExifVersion>-Tag. Wenn die Version 2.0.0.0 "
 "ist, so hat der Tag den Wert 02000000.H)."
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr "Interoperabilitäts-Index"
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2538,11 +2534,11 @@ msgstr ""
 "Interoperability Rules« (ExifR98) für andere Tags, die für ExifR98 benutzt "
 "werden."
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr "Nördlicher oder südlicher Breitengrad"
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -2551,15 +2547,15 @@ msgstr ""
 "ist. Der ASCII-Wert »N« gibt nördliche Breite an, der Wert »S« südliche "
 "Breite."
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr "Interoperabilitäts-Version"
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Breitengrad"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2573,11 +2569,11 @@ msgstr ""
 "Grade und Minuten verwendet werden und z.B. ein Minutenteil auf 2 Stellen "
 "Genauigkeit, dann ist das Format, dd/1, mmmm/100, 0/1."
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr "Östliche oder westliche Länge"
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -2585,11 +2581,11 @@ msgstr ""
 "Gibt an, ob die Länge östliche oder westliche Länge ist. Der ASCII-Buchstabe "
 "»E« steht für östliche Länge und »W« für westliche."
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Längengrad"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2603,41 +2599,42 @@ msgstr ""
 "verwendet werden und z.B. der Minutenteil auf 2 Stellen Genauigkeit, dann "
 "ist das Format, dd/1, mmmm/100, 0/1."
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr "Höhenreferenz"
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
-"Gibt die Referenzhöhe an. Wenn die Referenz der Meeresspiegel ist, und die "
-"Höhe ist über dem Meeresspiegel, dann ist dieser Wert 0. Wenn sie unter dem "
-"Meeresspiegel ist, dann ist hier ein Wert von 1 und die Höhe ist als "
-"absoluter Wert im <GPSAltitudeTag> angegeben. Die verwendete Einheit ist "
-"Meter. Beachten Sie, dass dieses Tag den Typ BYTE hat."
+"Gibt die Referenzhöhe an. Wenn die Referenz der mittlere Meeresspiegel ist "
+"und die Höhe über dem Meeresspiegel liegt, dann ist dieser Wert 0. Wenn sie "
+"unter dem Meeresspiegel ist, dann ist hier der Wert 1 und die Höhe ist als "
+"absoluter Wert im GPSAltitude-Tag angegeben. Die verwendete Einheit ist "
+"Meter. Beachten Sie, dass dieses Tag den Typ BYTE hat im Gegensatz zu "
+"anderen Referenz Tags."
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr "Höhe"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
-"Gibt die Höhe über Null an in <GPSAltitudeRef> an. Höhe ist ein RATIONAL-"
-"Wert. Die Referenzeinheit ist Meter."
+"Gibt die Höhe über Null an bezüglich GPSAltitudeRef an. Höhe ist ein "
+"RATIONAL-Wert. Die Referenzeinheit ist Meter."
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr "GPS-Zeit (Atomuhr)"
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
@@ -2645,11 +2642,11 @@ msgstr ""
 "Zeigt die Zeit als UTC (Universal Time Coordinated). TimeStamp wird in drei "
 "RATIONAL-Werten (Stunden, Minuten, Sekunden) ausgedrückt."
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr "GPS-Satelliten"
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2663,11 +2660,11 @@ msgstr ""
 "nicht festgelegt. Wenn der GPS-Empfänger nicht zu Messungen fähig ist, "
 "sollte dieses Tag auf NULL gesetzt werden."
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr "Status des GPS-Empfängers"
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 "
@@ -2676,11 +2673,11 @@ msgstr ""
 "Zeigt den GPS-Empfängerstatus zur Zeit der Bildaufnahme an. »A« zeigt eine "
 "laufende Messung, »V« heißt vollzogene Messung."
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr "GPS-Messmodus"
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
@@ -2688,11 +2685,11 @@ msgstr ""
 "Zeigt den GPS-Messmodus. »2« zeigt eine laufende zweidimensionale Messung an "
 "und »3« zeigt eine laufende dreidimensionale Messung an."
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr "Messgenauigkeit"
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
@@ -2702,11 +2699,11 @@ msgstr ""
 "wird bei zweidimensionaler Messung geschrieben, ein PDOP Wert bei "
 "dreidimensionaler Messung."
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr "Geschwindigkeitseinheit"
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
@@ -2715,19 +2712,19 @@ msgstr ""
 "wird. »K« für Kilometer pro Stunde, »M« für Meilen pro Stunde, »K« für "
 "Knoten."
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr "Geschwindigkeit des GPS-Empfängers"
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr "Gibt die Geschwindigkeit des GPS-Empfängers an."
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr "Referenz für die Bewegungsrichtung"
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
@@ -2735,11 +2732,11 @@ msgstr ""
 "Gibt die Referenz für die Richtung der Bewegung des GPS-Empfängers an. »T« "
 "gibt die wahre Richtung und »M« die magnetische Richtung an."
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr "Richtung der Bewegung"
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
@@ -2747,11 +2744,11 @@ msgstr ""
 "Gibt die Richtung der Bewegung des GPS-Empfängers an. Dieser Wert geht von "
 "0.0 bis 359.99."
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr "GPS-Bildrichtungsreferenz"
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2759,21 +2756,21 @@ msgstr ""
 "Gibt die Referenz für die Richtung des Bildes bei der Aufnahme an. T gibt "
 "die wahre Richtung und M die magnetische Richtung an."
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr "GPS-Bildrichtung"
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr "Gibt die Richtung der Bildaufnahme im Bereich von 0.0 bis 359.99 an."
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr "Geodätische Survey-Daten verwendet"
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2785,11 +2782,11 @@ msgstr ""
 "»WGS-84«. Wenn ein GPS-Info-Tag aufgezeichnet wird, so wird empfohlen, auch "
 "dieses Tag aufzuzeichnen."
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr "Referenz des Breitengrades des Ziels"
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 "
@@ -2799,11 +2796,11 @@ msgstr ""
 "ist. Der ASCII-Wert »N« gibt die nördliche Breite an, der Wert »S« die "
 "südliche Breite."
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr "Breitengrad des Ziels"
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2818,11 +2815,11 @@ msgstr ""
 "Grade und Minuten benutzt werden und beispielsweise der Minutenteil auf 2 "
 "Stellen Genauigkeit, dann ist das Format dd/1, mmmm/100, 0/1."
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr "Referenz des Längengrad des Zieles"
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
@@ -2830,11 +2827,11 @@ msgstr ""
 "Gibt an, ob die Länge östliche oder westliche Länge ist. Das ASCII-Zeichen "
 "»E« steht für östliche Länge und »W« für westliche."
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr "Längengrad des Zieles"
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2849,11 +2846,11 @@ msgstr ""
 "Grade und Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen "
 "Genauigkeit, dann ist das Format, dd/1, mmmm/100, 0/1."
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr "Referenz für Richtung des Zieles"
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2861,11 +2858,11 @@ msgstr ""
 "Gibt die Referenz für die Richtung des Zielpunktes bei der Aufnahme an. »T« "
 "gibt die wahre Richtung und »M« die magnetische Richtung an."
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr "Richtung des Zieles"
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
@@ -2873,11 +2870,11 @@ msgstr ""
 "Gibt die Richtung der Bildaufnahme auf den Zielpunkt an. Dieser Wert geht "
 "von 0.0 bis 359.99."
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr "Referenz für Entfernung zum Ziel"
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
@@ -2885,19 +2882,19 @@ msgstr ""
 "Gibt die Einheit der Entfernungsangabe zum Zielpunkt an. »K«, »M« und »N« "
 "stehen dabei für Kilometer, Meilen und Seemeilen."
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr "Abstand zum Ziel"
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr "Dieser Tag gibt den Abstand zum Zielpunkt an."
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr "Name der GPS-Verarbeitungsmethode"
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2909,11 +2906,11 @@ msgstr ""
 "der Methode. Weil der Typ nicht ASCII ist, so ist eine NULL-Terminierung "
 "nicht nötig."
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr "Name des GPS-Bereichs"
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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 "
@@ -2924,11 +2921,11 @@ msgstr ""
 "Gebiets. Weil der Typ nicht ASCII ist, ist eine NULL-Terminierung nicht "
 "nötig."
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr "GPS-Zeit"
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
@@ -2938,29 +2935,39 @@ msgstr ""
 "Coordinated) angibt. Das Format ist »YYYY:MM:DD«. Die Länge der Zeichenkette "
 "ist 11 Byte inklusive der abschließenden NULL."
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr "GPS-Differenzkorrektur"
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 "Gibt an, ob Differenzkorrekturen auf den GPS-Empfänger angewandt werden."
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "Neuer Unterdateityp"
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "Genereller Hinweis auf die Art der Daten in dieser Unterdatei."
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Bildbreite"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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."
@@ -2969,11 +2976,11 @@ msgstr ""
 "Zeile. Im JPEG-Datenstrom wird ein JPEG-Marker anstelle dieses Tags "
 "verwendet."
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr "Bildlänge"
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -2981,11 +2988,11 @@ msgstr ""
 "Die Anzahl an Spalten in den Bilddaten. In einem JPEG-Datenstrom wird ein "
 "JPEG-Marker anstelle dieses Tags verwendet."
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr "Bit je Abtastung"
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2996,11 +3003,11 @@ msgstr ""
 "Bit, weshalb der Wert dieses Tags 8 ist. Siehe auch <SamplesPerlPixel>. Im "
 "JPEG-Datenstrom wird ein JPEG-Marker statt diesem Tag benutzt."
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Kompression"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 "
@@ -3011,11 +3018,11 @@ msgstr ""
 "wird weggelassen. Wenn die Vorschaubilder JPEG-Kompression verwenden, hat "
 "dieses Tag den Wert 6."
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr "Fotometrische Interpretation"
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -3023,19 +3030,19 @@ msgstr ""
 "Der Pixelaufbau. Im JPEG-Datenstrom wird ein JPEG-Marker statt dieses Tags "
 "verwendet."
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr "Füllreihenfolge"
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Dokumentenname"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "Bildbeschreibung"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -3047,11 +3054,11 @@ msgstr ""
 "Byte-Zeichencodes können nicht benutzt werden. Wenn ein 2-Byte-Code "
 "notwendig ist, sollte das Exif Private Tag <UserComment> benutzt werden."
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Hersteller"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -3062,11 +3069,11 @@ msgstr ""
 "welches dieses Bild erzeugte. Wenn das Feld leer ist, wird er als unbekannt "
 "behandelt."
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Modell"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 "
@@ -3077,11 +3084,11 @@ msgstr ""
 "Gerätes, das das Bild generiert hat. Wenn das Feld leer ist, wird es als "
 "unbekannt behandelt."
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr "Strip-Versatz"
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -3093,19 +3100,19 @@ msgstr ""
 "KBytes überschreitet. In einem JPEG-Datenstrom ist diese Spezifikation nicht "
 "nötig und wird weggelassen. Siehe auch <RowsPerStrip> und <StripByteCounts>."
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "Orientierung"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "Die Bildausrichtung aus der Sicht von Spalten und Zeilen."
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr "Sample pro Pixel"
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 "
@@ -3115,11 +3122,11 @@ msgstr ""
 "YCbCr-Bilder bezieht, ist der Wert dieses Tags immer 3. Im JPEG-Datenstrom "
 "wird anstatt dieses Tags ein JPEG-Marker benutzt."
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr "Zeilen pro Strip"
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -3131,11 +3138,11 @@ msgstr ""
 "dieses Tag nicht nötig und wird weggelassen. Siehe auch <StripOffsets> und "
 "<StripByteCounts>."
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr "Strip Byte-Anzahl"
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
@@ -3143,11 +3150,11 @@ msgstr ""
 "Die Anzahl der Bytes pro Strip. In einem JPEG-Datenstrom ist dieses Tag "
 "nicht nötig und wird weggelassen."
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr "Auflösung in X-Richtung"
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -3155,11 +3162,11 @@ msgstr ""
 "Die Anzahl Pixel pro <ResolutionUnit> in der <ImageWidth>-Richtung. Wenn "
 "keine bekannt ist, werden 72 [dpi] angenommen."
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr "Auflösung in Y-Richtung"
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -3167,11 +3174,11 @@ msgstr ""
 "Die Anzahl an Pixel pro <ResolutionUnit> in der <ImageLength>-Richtung. "
 "Derselbe Wert wie in <XResolution> wird spezifiziert."
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr "Planar-Konfiguration"
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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. "
@@ -3181,11 +3188,11 @@ msgstr ""
 "einem JPEG-Bild wird ein JPEG-Marker statt diesem Tag benutzt. Wenn dieses "
 "Feld nicht existiert, wird die Vorgabe 1 (»chunky«) von TIFF angenommen."
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr "Maßeinheit der Auflösung"
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -3195,11 +3202,11 @@ msgstr ""
 "Einheit wird für <XResolution> und <YResolution> verwendet. Wenn diese "
 "unbekannt ist, wird die Vorgabe von 2 (Zoll) angenommen."
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr "(Farb)transfer-Funktion"
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 "
@@ -3209,11 +3216,11 @@ msgstr ""
 "Normalerweise ist dieses Tag nicht nötig, da der Farbraum bereits im "
 "Farbraum-Informationstag angegeben wurde (<ColorSpace>)."
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Software"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3226,11 +3233,11 @@ msgstr ""
 "das unten stehende Beispiel angewendet wird. Wenn das Feld leer ist, wird es "
 "als unbekannt angenommen."
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
@@ -3238,11 +3245,11 @@ msgstr ""
 "Das Datum und die Zeit der Erstellung des Bildes. In diesem Standard "
 "(EXIF-2.1) ist es das Datum und die Zeit der letzten Änderung."
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Künstler"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3255,11 +3262,11 @@ msgstr ""
 "die Interoperabilität zu verbessern. Wenn das Feld leer ist, wird der Name "
 "als unbekannt angenommen."
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Weißpunkt"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
@@ -3268,11 +3275,11 @@ msgstr ""
 "Die Färbung des Weißpunktes des Bildes. Normalerweise ist dieser Tag nicht "
 "nötig, da der Farbraum im <ColorSpace> Tag spezifiziert wird."
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr "Primäre Färbung"
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
@@ -3282,21 +3289,21 @@ msgstr ""
 "Tag nicht notwendig, da der Farbraum bereits im Farbraum-Informationstag "
 "<ColorSpace> angegeben wurde."
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 "Definiert von der Firma Adobe, um TIFF-Bäume innerhalb von TIFF-Dateien zu "
 "erlauben."
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr "Transferbereich"
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr "JPEG Interchange Format"
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
@@ -3304,11 +3311,11 @@ msgstr ""
 "Der Abstand zum Startbyte (SOI) der JPEG-Vorschaubilddaten. Dieses Tag wird "
 "nicht für die primären JPEG-Daten benutzt."
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr "JPEG Interchange Format Länge"
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3323,11 +3330,11 @@ msgstr ""
 "einschließlich aller anderen Daten in weniger als 64 KB aufgezeichnet "
 "werden, um in den APP1-JPEG-Marker zu passen."
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr "YCbCr-Koeffizienten"
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3341,11 +3348,11 @@ msgstr ""
 "Farbraum ist im Farbraum-Informations-Tag deklariert, mit dem Vorgabewert, "
 "welche die beste Bild-Interoperabilität unter diesen Bedingungen ergibt."
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr "YCbCr Sub-Sampling"
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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."
@@ -3354,11 +3361,11 @@ msgstr ""
 "Helligkeitskomponenten. In JPEG-Datenströmen wird ein JPEG-Marker anstelle "
 "dieses Tags verwendet."
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr "YCbCr-Positionierung"
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3384,11 +3391,11 @@ msgstr ""
 "TIFF unabhängig vom Wert in diesem Feld verwenden. Vorzugsweise sollen "
 "Leseprogramme sowohl zentrierte und co-sited-Positionierung unterstützen."
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr "Schwarz/Weiß-Referenz"
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3402,19 +3409,19 @@ msgstr ""
 "Informationstag deklariert, mit jenem Wert als Voreinstellung, der die "
 "besten Bildwerte für Interoperabilität garantiert."
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr "XML-Paket"
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr "XMP-Metadaten"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr "CFA-Muster"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 "
@@ -3424,15 +3431,15 @@ msgstr ""
 "Array) des Bildsensors an, wenn ein Einzelchip-Farbsensor benutzt wird. Es "
 "gilt nicht für alle Sensorarten."
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Akkustatus"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "Copyright"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3466,23 +3473,19 @@ msgstr ""
 "dann folgt der Urheberschutz des Herausgebers. Wenn das Feld leer ist, wird "
 "es als unbekannt gewertet."
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Belichtungszeit in Sekunden."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "Blendenwert"
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr "Der Blendenwert."
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr "Ressourcenblock des Bilds"
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 "
@@ -3492,11 +3495,11 @@ msgstr ""
 "die gleiche Struktur wie die in TIFF spezifizierte IFD. Allerdings enthält "
 "es keine Bilddaten wie im Fall von TIFF."
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr "Belichtungsprogramm"
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
@@ -3504,11 +3507,11 @@ msgstr ""
 "Die Programmklasse, welche die Kamera zum Festlegen der Belichtungszeit bei "
 "Aufnahme verwendet."
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr "Spektrale Empfindlichkeit"
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 "
@@ -3518,11 +3521,11 @@ msgstr ""
 "ist eine ASCII-Zeichenkette, die kompatibel mit dem vom ASTM Technical "
 "Committee entwickelten Standard ist."
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr "Zeiger auf GPS-Info-IFD"
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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."
@@ -3530,11 +3533,11 @@ msgstr ""
 "Ein Zeiger auf das GPS-Info-IFD. Die Interoperabilitätsstruktur des GPS-Info-"
 "IFD hat keine Bilddaten, genau wie das Exif-IFD."
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr "ISO-Empfindlichkeitsangaben"
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -3542,11 +3545,11 @@ msgstr ""
 "Gibt ISO-Empfindlichkeit und -Bandbreite der Kamera bzw. des Aufnahmegeräts "
 "an, wie in ISO 12232 spezifiziert."
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr "Optoelektronische Umwandlungsfunktion"
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
@@ -3556,19 +3559,19 @@ msgstr ""
 "spezifiziert ist. <OECF> ist der Zusammenhang zwischen den optischen "
 "Eingabewerten und den Bildwerten."
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr "Zeitzonenverschiebung"
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr "Gibt die Zeitzone der Kamerauhr relativ zu GMT an."
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr "Exif-Version"
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -3576,11 +3579,11 @@ msgstr ""
 "Die Version des Exif-Standards, die unterstützt wird. Wenn dieses Feld nicht "
 "vorhanden ist wird angenommen, dass der Standard nicht beachtet wird."
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr "Datum und Uhrzeit (original)"
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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."
@@ -3588,19 +3591,19 @@ msgstr ""
 "Das Datum und die Zeit, zu der das Bild erzeugt wurde. Für eine "
 "Digitalkamera ist das der Zeitpunkt, an dem das Bild aufgenommen wurde."
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr "Datum und Uhrzeit (digitalisiert)"
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr "Das Datum und die Uhrzeit der Speicherung als digitale Daten."
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr "Komponentenkonfiguration"
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3617,11 +3620,11 @@ msgstr ""
 "komprimierten Daten andere Komponenten als Y, Cb und Cr benutzen, oder um "
 "die Unterstützung anderer Sequenzen zu erlauben."
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr "Komprimierte Bits pro Pixel"
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -3629,11 +3632,11 @@ msgstr ""
 "Zu den komprimierten Daten gehörige Informationen. Der für ein komprimiertes "
 "Bild verwendete Kompressionsmodus wird in Einheitsbit pro Pixel angegeben."
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Verschlusszeit"
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -3641,15 +3644,15 @@ msgstr ""
 "Verschlusszeit. Die Einheit ist die APEX-Einstellung (Additive System of "
 "Photographic Exposure)."
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Die Objektivblende. Die Einheit ist der APEX-Wert."
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -3657,11 +3660,11 @@ msgstr ""
 "Die Helligkeit. Die Einheit ist der APEX-Wert. Normalerweise liegt dieser "
 "Wert zwischen -99.99 und 99.99."
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr "Belichtungsneigung"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -3669,11 +3672,11 @@ msgstr ""
 "Die Belichtungsneigung. Die Einheit ist der APEX-Wert. Normalerweise wird "
 "diese innerhalb des Bereiches -99.99 bis 99.99 spezifiziert."
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr "Maximaler Blendenwert"
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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."
@@ -3682,34 +3685,34 @@ msgstr ""
 "Normalerweise wird er im Bereich von 00.00 bis 99.99 angegeben, ist aber "
 "nicht auf diesen Bereich beschränkt."
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr "Entfernung des Objekts"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr "Die Entfernung zum Objekt (in Metern)."
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr "Die Belichtungsmessung."
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "Lichtquelle"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr "Die Art der Lichtquelle."
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "Dieser Tag wird aufgezeichnet, wenn das Bild mit einem Blitz aufgenommen "
 "wurde."
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -3717,26 +3720,26 @@ msgstr ""
 "Die tatsächliche Brennweite des Objektivs in mm. Es wird nicht auf das 35mm-"
 "Kleinbildäquivalent umgerechnet."
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr "Motivbereich"
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 "Dieser Tag gibt die Position und Größe des Hauptmotivs in der Szene an."
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr "TIFF/EP-Standard-Kennung"
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr "Anmerkungen des Herstellers"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -3744,11 +3747,11 @@ msgstr ""
 "Ein Tag für die Hersteller von Exif-Schreibern, um beliebige Informationen "
 "abzuspeichern. Der Inhalt ist vom Hersteller abhängig."
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "Anmerkung des Nutzers"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3788,63 +3791,63 @@ msgstr ""
 "ist der empfohlene ID-Code ASCII und der folgende Benutzerkommentar-Bereich "
 "ist mit Leerzeichen aufgefüllt (20h)."
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr "Sekundenbruchteil"
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 "Der Tag wird benutzt, um Sekundenbruchteile für den <DateTime>-Tag zu "
 "erfassen."
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr "Sekundenbruchteil  (Original)"
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "Der Tag wird benutzt, um Sekundenbruchteile für den <DateTimeOriginal>-Tag "
 "zu erfassen."
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr "Sekundenbruchteil (digitalisiert)"
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Der Tag wird benutzt, um Sekundenbruchteile für den <DateTimeDigitized>-Tag "
 "zu erfassen."
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr "XP-Titel"
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 "Eine Zeichenkette, die den Titel des Bildes angibt, in UTF-16LE kodiert."
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr "XP-Kommentar"
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 "Eine Zeichenkette, welche einen Kommentar über das Bild enthält, kodiert in "
 "UTF-16LE."
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr "XP-Autor"
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
@@ -3852,11 +3855,11 @@ msgstr ""
 "Eine Zeichenkette, welche den Namen des Bildschöpfers enthält, kodiert in "
 "UTF-16LE."
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr "XP-Stichwörter"
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
@@ -3864,24 +3867,24 @@ msgstr ""
 "Eine Zeichenkette, welche Stichwörter angibt, die das Bild beschreiben, "
 "kodiert in UTF-16LE.y"
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr "XP-Ãœberschrift"
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 "Eine Zeichenkette, welche die Bildüberschrift angibt, kodiert in UTF-16LE."
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "Die FlashPix-Formatversion, die von einer FPXR-Datei unterstützt wird."
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Farbraum"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3896,11 +3899,11 @@ msgstr ""
 "kalibriert aufgezeichnet wurden, können als sRGB betrachtet werden, wenn sie "
 "in FlashPix umgewandelt werden."
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr "X-Dimension des Pixel"
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3913,11 +3916,11 @@ msgstr ""
 "Marker vorhanden sind. Dieser Tag sollte nicht in einer unkomprimierten "
 "Datei existieren."
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr "Y-Dimension des Pixel"
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3934,12 +3937,12 @@ msgstr ""
 "Anhang F. Da vertikale Auffüllung nicht nötig ist, ist die Anzahl an Zeilen "
 "in diesem Tag die gleiche wie die im JPEG-SOF-Marker."
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr "Zugehörige Audio-Datei"
 
 # Ãœbernommen aus der aktuellen de.po von gnome-commander
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3983,11 +3986,11 @@ msgstr ""
 "Zuordnen von Audiodateien verwendet wird, muss der Bezug der Audiodaten zur "
 "Bilddatei auch am Ende der Audiodatei sichtbar sein."
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr "IFD-Zeiger für Interoperabilität"
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -4001,11 +4004,11 @@ msgstr ""
 "die in TIFF-IFD-Struktur, enthält aber keine Bildcharakteristiken wie das "
 "normale TIFF-IFD."
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr "Energie des Blitzes"
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -4013,11 +4016,11 @@ msgstr ""
 "Gibt die Energie des Blitzes zum Zeitpunkt der Aufnahme an, in Beam Candle "
 "Power Seconds (BCPS)."
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr "Räumliche Frequenzantwort"
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 "
@@ -4027,11 +4030,11 @@ msgstr ""
 "bzw. des Aufnahmegeräts auf in der Richtung der Bildbreite, Bildhöhe und "
 "diagonalen Richtung, wie in ISO 12233 spezifiziert."
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr "X-Auflösung der Fokusebene"
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -4039,11 +4042,11 @@ msgstr ""
 "Gibt die Anzahl an Pixeln in der Breite (X-Ebene) pro "
 "<FocalPlaneResolutionUnit> in der Fokusebene an."
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr "Y-Auflösung der Fokusebene"
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -4051,11 +4054,11 @@ msgstr ""
 "Gibt die Anzahl an Pixeln in der Höhe (Y-Ebene) pro "
 "<FocalPlaneResolutionUnit> in der Fokusebene an."
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr "Einheit der Angaben der Fokusebene"
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -4063,11 +4066,11 @@ msgstr ""
 "Gibt die Einheit für die Messung der <FocalPlaneXResolution> und der "
 "<FocalPlaneYResolution> an. Der Wert ist der gleiche wie <ResolutionUnit>."
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr "Ort des Objektes"
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -4080,11 +4083,11 @@ msgstr ""
 "Bildkante, vor der Rotation (siehe <Rotation> Tag). Der erste Wert gibt die "
 "X-, der zweite die Y-Koordinate an."
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr "Belichtungsindex"
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
@@ -4092,19 +4095,19 @@ msgstr ""
 "Gibt den Belichtungsindex an, der in der Kamera oder im Eingabegerät während "
 "der Aufnahme ausgewählt ist."
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr "Abtastmethode"
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr "Gibt den Sensortyp in der Kamera bzw. im Eingabegerät an."
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Dateiquelle"
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -4112,11 +4115,11 @@ msgstr ""
 "Gibt die Quelle des Bildes an. Wenn das Bild durch eine Digitalkamera "
 "aufgenommen wurde, ist der Wert 3."
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr "Szenentyp"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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."
@@ -4125,11 +4128,11 @@ msgstr ""
 "hat, muss diese Zahl immer auf 1 gesetzt werden, um anzugeben, das die Szene "
 "direkt fotografiert wurde."
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr "Angepasstes Rendering"
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 "
@@ -4140,7 +4143,7 @@ msgstr ""
 "wird, sollte der Leser weitere Bearbeitung gering halten oder ganz darauf "
 "verzichten."
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 "
@@ -4150,17 +4153,17 @@ msgstr ""
 "Belichtungsreihenmodus nimmt die Kamera mehrere Bilder derselben Szene mit "
 "verschiedenen Belichtungseinstellungen auf."
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 "Dieser Tag gibt den Weißabgleichsmodus an, der zum Aufnahmezeitpunkt "
 "eingestellt war."
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr "Zahlenverhältnis der digitalen Vergrößerung"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 "
@@ -4170,11 +4173,11 @@ msgstr ""
 "Aufnahme des Bildes an. Wenn der Divisor 0 ist, wurde kein Digitalzoom "
 "eingesetzt."
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr "Brennweite bei 35mm-Film"
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 "
@@ -4182,13 +4185,13 @@ msgid ""
 msgstr ""
 "Dieser Tag gibt die äquivalente Brennweite einer 35mm-Kleinbildkamera an. "
 "Der Wert 0 bedeutet, dass die Brennweite unbekannt ist. Dieser Tag "
-"unterscheidet sich vom <FocalLength>-Tag."
+"unterscheidet sich vom FocalLength-Tag."
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr "Szenenaufnahmemodus"
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
@@ -4198,15 +4201,15 @@ msgstr ""
 "Angeben des Aufnahmemodus verwendet werden. Beachten Sie, dass sich dieser "
 "Typ vom Szenentyp-Tag (<SceneType>) unterscheidet."
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr "Verstärkungsreglung"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "Dieses Tag gibt den Grad der Verstärkung an."
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -4214,7 +4217,7 @@ msgstr ""
 "Dieser Tag gibt die Richtung der Kontrastbearbeitung an, die bei der "
 "Aufnahme des Bildes angewandt wurde."
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -4222,7 +4225,7 @@ msgstr ""
 "Dieser Tag gibt die Richtung der Sättigungsbearbeitung an, die bei der "
 "Aufnahme des Bildes angewandt wurde."
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
@@ -4230,11 +4233,11 @@ msgstr ""
 "Dieser Tag gibt die Richtung der Schärfebearbeitung bei der Aufnahme des "
 "Bildes an."
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr "Beschreibung der Geräteeinstellungen"
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 "
@@ -4244,19 +4247,19 @@ msgstr ""
 "bestimmten Kameramodells. Dieser Tag wird nur zur Angabe der Bedingungen im "
 "Leser benutzt."
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr "Motivabstand"
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr "Dieser Tag gibt den Motivabstand an."
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr "Eindeutige Bildkennung"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 "
@@ -4265,27 +4268,85 @@ msgstr ""
 "Dieser Tag gibt eine eindeutige Bildkennung an. Er wird als ASCII-"
 "Zeichenkette in hexadezimaler Notation aufgezeichnet und ist 128 Bit lang."
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:869
+msgid "Camera Owner Name"
+msgstr "Besitzer der Kamera"
+
+#: libexif/exif-tag.c:870
+msgid ""
+"This tag indicates the name of the camera owner, photographer or image "
+"creator."
+msgstr ""
+"Dieser Tag enthält den Namen des Besitzers der Kamera, des Fotografen oder "
+"sonstigen Bildschöpfers."
+
+#: libexif/exif-tag.c:873
+msgid "Body Serial Number"
+msgstr "Seriennummer der Kamera"
+
+#: libexif/exif-tag.c:874
+msgid "This tag indicates the serial number of the body of the camera"
+msgstr "Dieser Tag gibt die Seriennummer der Kamera an."
+
+#: libexif/exif-tag.c:876
+msgid "Lens Specification"
+msgstr "Spezifikation des Objektivs"
+
+#: libexif/exif-tag.c:877
+msgid ""
+"This tag indicates minimum focal length, maximum focal length, minimum F "
+"number in the minimum focal length, and minimum F number in the maximum "
+"focal length."
+msgstr ""
+"Dieser Tag gibt die minimale Brennweite, die maximale Brennweite, sowie den "
+"minimalen Blendenwert bei minimaler Brennweite und den minimalen Blendenwert "
+"bei maximaler Brennweite an."
+
+#: libexif/exif-tag.c:882
+msgid "Lens Make"
+msgstr "Objektivhersteller"
+
+#: libexif/exif-tag.c:883
+msgid "This tag indicates the lens manufacturer."
+msgstr "Dieser Tag gibt den Hersteller des Objektivs an."
+
+#: libexif/exif-tag.c:885
+msgid "Lens Model"
+msgstr "Objektivmodell"
+
+#: libexif/exif-tag.c:886
+msgid "This tag indicates the lens' model name and model number."
+msgstr "Dieser Tag gibt den Modellnamen und die Modellnummer des Objektivs an."
+
+#: libexif/exif-tag.c:888
+msgid "Lens Serial Number"
+msgstr "Seriennummer des Objektivs"
+
+#: libexif/exif-tag.c:889
+msgid "This tag indicates the serial number of the interchangeable lens."
+msgstr "Dieser Tag gibt die Seriennummer des wechselbaren Objektivs an."
+
+#: libexif/exif-tag.c:892
 msgid "Gamma"
 msgstr "Gamma"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr "Gibt den Wert des Gamma-Koeffizienten an."
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr "PRINT Image Matching"
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr "Verwandt mit Epson PRINT Image Matching Technologie"
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr "Auffüllung"
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4468,17 +4529,11 @@ msgstr "Weit 1 (230%)"
 msgid "Wide2 (400%)"
 msgstr "Weit 2 (400%)"
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr "%2.2f mm"
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr "%i Byte(s) unbekannte Daten"
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr "Version der MakerNote"
@@ -4904,117 +4959,117 @@ msgstr "15 Bilder/s"
 msgid "20 frames/sec"
 msgstr "20 Bilder/s"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "Rotkorrektur %f, Blaukorrektur %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr "Keine manuelle Fokusauswahl"
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f Meter"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr "AF-Position: Mitte"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr "AF-Position: Oben"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr "AF-Position: Unten"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr "AF-Position: Links"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr "AF-Position: Rechts"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr "AF-Position: Oben links"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr "AF-Position: Oben rechts"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr "AF-Position: Unten links"
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr "AF-Position: Unten recgts"
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr "AF-Position: Weit links"
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr "AF-Position: Weit rechts"
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr "Unbekannte AF-Position"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Interner Fehler (unbekannter Wert %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Unbekannter Wert %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr "Unbekannt %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr "2 Sek."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr "Schnell"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr "Manuell: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr "Manuell: Unbekannt"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr "Einfachberührung"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr "Unendlich"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i Byte unbekannte Daten: "
@@ -5058,7 +5113,7 @@ msgstr "Versatz des Vorschaubildordners (IFD) innerhalb der Datei."
 
 #: libexif/olympus/mnote-olympus-tag.c:51
 msgid "Exposurediff ?"
-msgstr "Belichtungsdifferenz ?"
+msgstr "Belichtungsdifferenz"
 
 #: libexif/olympus/mnote-olympus-tag.c:54
 msgid "Image Boundary"
@@ -5116,8 +5171,7 @@ msgid "Contrast Curve"
 msgstr "Kontrastkurve"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr "Farbmodus"
 
@@ -5194,7 +5248,7 @@ msgstr "Schwarzweiß-Modus"
 
 #: libexif/olympus/mnote-olympus-tag.c:111
 msgid "Focal Plane Diagonal"
-msgstr "Diagonale der Schärfeebene "
+msgstr "Diagonale der Schärfeebene"
 
 #: libexif/olympus/mnote-olympus-tag.c:112
 msgid "Lens Distortion Parameters"
@@ -5289,13 +5343,11 @@ msgstr "Schwarzwert"
 msgid "White Balance Setting"
 msgstr "Weißabgleicheinstellung"
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr "Rotabgleich"
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr "Blauabgleich"
 
@@ -5643,11 +5695,21 @@ msgstr "3008x2008 oder 3040x2024"
 msgid "Digital filter?"
 msgstr "Digitaler Filter?"
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Interner Fehler (unbekannter Wert %i %i)"
+msgid "Internal error (unknown value %hu)"
+msgstr "Interner Fehler (unbekannter Wert %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Interner Fehler (unbekannter Wert %hu %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
+#, c-format
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Interner Fehler (unbekannter Wert %hi %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5708,7 +5770,7 @@ msgstr "AF-Punktauswahl"
 
 #: libexif/pentax/mnote-pentax-tag.c:76
 msgid "Auto AF Point"
-msgstr "Automatischer AF-Punkt "
+msgstr "Automatischer AF-Punkt"
 
 #: libexif/pentax/mnote-pentax-tag.c:77
 msgid "Focus Position"
@@ -5772,7 +5834,7 @@ msgstr "Rohbildgröße"
 
 #: libexif/pentax/mnote-pentax-tag.c:105
 msgid "Autofocus Points Used"
-msgstr "Verwendete Fokuspunkte "
+msgstr "Verwendete Fokuspunkte"
 
 #: libexif/pentax/mnote-pentax-tag.c:107
 msgid "Camera Temperature"
@@ -5853,6 +5915,9 @@ msgstr "Feiner"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER_de]"
 
+#~ msgid "FNumber"
+#~ msgstr "Blendenwert"
+
 #~ msgid "Tag UserComment does not comply with standard but contains data."
 #~ msgstr ""
 #~ "Das Tag »UserComment« ist nicht standardkonform, enthält aber Daten."
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
deleted file mode 100644
index fedb6a0..0000000
--- a/po/en@boldquot.header
+++ /dev/null
@@ -1,25 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
-# This catalog furthermore displays the text between the quotation marks in
-# bold face, assuming the VT100/XTerm escape sequences.
-#
diff --git a/po/en@quot.header b/po/en@quot.header
deleted file mode 100644
index a9647fc..0000000
--- a/po/en@quot.header
+++ /dev/null
@@ -1,22 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
diff --git a/po/en_AU.gmo b/po/en_AU.gmo
deleted file mode 100644
index 54c974f..0000000
--- a/po/en_AU.gmo
+++ /dev/null
diff --git a/po/en_AU.po b/po/en_AU.po
index 9fc8a0a..2bb64de 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2011-10-28 17:11+0000\n"
-"Last-Translator: Joel Pickett <jlkpcktt@gmail.com>\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
+"PO-Revision-Date: 2013-12-20 06:05+0000\n"
+"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
-"Language: \n"
+"Language: en_AU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 06:52+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2016-09-01 20:32+0000\n"
+"X-Generator: Launchpad (build 18179)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -40,7 +40,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Invalid number of components (%i, expected %i or %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -51,14 +51,14 @@ msgstr "Macro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -87,15 +87,15 @@ msgstr "Superfine"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -127,8 +127,8 @@ msgstr "Auto"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -148,8 +148,7 @@ msgstr "Slow synchro"
 msgid "Auto, red-eye reduction"
 msgstr "Auto, red-eye reduction"
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr "On, red-eye reduction"
 
@@ -271,9 +270,8 @@ msgstr "Full auto"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -285,7 +283,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -314,7 +312,7 @@ msgid "Sepia"
 msgstr "Sepia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -341,8 +339,7 @@ msgstr "Vivid"
 msgid "Neutral"
 msgstr "Neutral"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "Flash off"
 
@@ -424,7 +421,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "None"
@@ -437,8 +434,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "Other"
 
@@ -488,11 +485,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Default"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "Spot"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Average"
 
@@ -500,11 +497,11 @@ msgstr "Average"
 msgid "Evaluative"
 msgstr "Evaluative"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Partial"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr "Centre-weighted average"
 
@@ -516,7 +513,7 @@ msgstr "Not known"
 msgid "Very close"
 msgstr "Very close"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Close"
 
@@ -653,9 +650,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -674,9 +670,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -927,9 +922,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -1030,32 +1024,32 @@ msgid "Sunny"
 msgstr "Sunny"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Cloudy"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Tungsten"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Fluorescent"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Flash"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Shade"
@@ -1077,7 +1071,7 @@ msgid "PC set 3"
 msgstr "PC set 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Daylight fluorescent"
@@ -1090,7 +1084,7 @@ msgstr "Custom 1"
 msgid "Custom 2"
 msgstr "Custom 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1155,22 +1149,22 @@ msgid "Rotated by software"
 msgstr "Rotated by software"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Left to right"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Right to left"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Bottom to top"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Top to bottom"
 
@@ -1180,7 +1174,7 @@ msgstr "2x2 matrix (clockwise)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1198,9 +1192,8 @@ msgstr "Lowest"
 msgid "Highest"
 msgstr "Highest"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1255,37 +1248,44 @@ msgstr "Monochrome"
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i bytes unknown data"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr "Settings (First Part)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Focal Length"
 
@@ -1293,8 +1293,7 @@ msgstr "Focal Length"
 msgid "Settings (Second Part)"
 msgstr "Settings (Second Part)"
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1349,8 +1348,8 @@ msgstr "Quality"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "Flash Mode"
 
@@ -1361,9 +1360,8 @@ msgstr "Drive Mode"
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "Focus Mode"
 
@@ -1382,25 +1380,24 @@ msgstr "Easy Shooting Mode"
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "Digital Zoom"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Contrast"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Saturation"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1410,7 +1407,7 @@ msgstr "Sharpness"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "Metering Mode"
@@ -1423,7 +1420,7 @@ msgstr "Focus Range"
 msgid "AF Point"
 msgstr "AF Point"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Exposure Mode"
 
@@ -1530,7 +1527,7 @@ msgid "Exposure Compensation"
 msgstr "Exposure Compensation"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1570,11 +1567,12 @@ msgstr "Focus Distance Upper"
 msgid "Focus Distance Lower"
 msgstr "Focus Distance Lower"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "F-Number"
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Exposure Time"
@@ -1623,35 +1621,35 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr "Size of data too small to allow for EXIF data."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr "EXIF marker not found."
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr "EXIF header not found."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr "Unknown encoding."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr "Ignore unknown tags"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Ignore unknown tags when loading EXIF data."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr "Follow specification"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
@@ -1659,11 +1657,11 @@ msgstr ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr "Do not change maker note"
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1722,196 +1720,194 @@ msgstr ""
 "Tag 'UserComment' did not start with a format identifier. This has been "
 "fixed."
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i bytes undefined data"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i bytes unsupported data type"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr "Chunky format"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr "Planar format"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Not defined"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "One-chip colour area sensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr "Two-chip colour area sensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr "Three-chip colour area sensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr "Colour sequential area sensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr "Trilinear sensor"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr "Colour sequential linear sensor"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Top-left"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Top-right"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Bottom-right"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Bottom-left"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr "Left-top"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr "Right-top"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr "Right-bottom"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr "Left-bottom"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr "Centred"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr "Co-sited"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr "Reversed mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr "Normal mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Palette"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "Normal process"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "Custom process"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr "Auto exposure"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Manual exposure"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr "Auto bracket"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr "Auto white balance"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr "Manual white balance"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr "Low gain up"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr "High gain up"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr "Low gain down"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr "High gain down"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "Low saturation"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "High saturation"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "Soft"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1919,178 +1915,178 @@ msgstr "Soft"
 msgid "Hard"
 msgstr "Hard"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Unknown"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr "Avg"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr "Centre-weight"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr "Multi spot"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Pattern"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "LZW compression"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "JPEG compression"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr "Deflate/ZIP compression"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr "PackBits compression"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr "Tungsten incandescent light"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Fine weather"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Cloudy weather"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Day white fluorescent"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr "Cool white fluorescent"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "White fluorescent"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "Standard light A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "Standard light B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "Standard light C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr "ISO studio tungsten"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "Inch"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "in"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Centimetre"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "Normal programme"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr "Aperture priority"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "Aperture"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr "Shutter priority"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr "Shutter"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr "Creative programme (biased towards depth of field)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr "Creative"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr "Creative programme (biased towards fast shutter speed)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "Action"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "Portrait mode (for closeup photos with the background out of focus)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Landscape mode (for landscape photos with the background in focus)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "Flash did not fire"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr "No flash"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr "Flash fired"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2098,75 +2094,75 @@ msgstr "Flash fired"
 msgid "Yes"
 msgstr "Yes"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr "Strobe return light not detected"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr "Without strobe"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr "Strobe return light detected"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr "With strobe"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr "Flash fired, compulsory flash mode"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr "Flash fired, compulsory flash mode, return light not detected"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr "Flash fired, compulsory flash mode, return light detected"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "Flash did not fire, compulsory flash mode"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr "Flash did not fire, auto mode"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr "Flash fired, auto mode"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr "Flash fired, auto mode, return light not detected"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr "Flash fired, auto mode, return light detected"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr "No flash function"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr "Flash fired, red-eye reduction mode"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr "Flash fired, red-eye reduction mode, return light not detected"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr "Flash fired, red-eye reduction mode, return light detected"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "Flash fired, compulsory flash mode, red-eye reduction mode"
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
@@ -2174,7 +2170,7 @@ msgstr ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
@@ -2182,229 +2178,224 @@ msgstr ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr "Flash did not fire, auto mode, red-eye reduction mode"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "Flash fired, auto mode, red-eye reduction mode"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr "Flash fired, auto mode, return light detected, red-eye reduction mode"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr "Close view"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr "Distant view"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr "Distant"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr "Uncalibrated"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Invalid size of entry (%i, expected %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr "Unsupported UNICODE string"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr "Unsupported JIS string"
 
-#: libexif/exif-entry.c:935
-#, fuzzy
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
-msgstr ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
+msgstr "Tag UserComment contains data but is against specification."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Byte at position %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr "Unknown Exif Version"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif Version %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix Version 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix Version 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr "Unknown FlashPix Version"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[None]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "(Photographer)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Editor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35 equivalent: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " sec."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d sec.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d sec.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Internal error (unknown value %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr "Reserved"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr "Directly photographed"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "Within distance %i of (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Unexpected number of components (%li, expected 2, 3, or 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr "Sea level"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr "Sea level reference"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr "Unknown value %i"
@@ -2490,11 +2481,11 @@ msgstr "Corrupt data"
 msgid "The data provided does not follow the specification."
 msgstr "The data provided does not follow the specification."
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr "GPS Tag Version"
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2506,11 +2497,11 @@ msgstr ""
 "tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
 "2.0.0.0, the tag value is 02000000.H)."
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr "Interoperability Index"
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2522,11 +2513,11 @@ msgstr ""
 "(NULL). see the separate volume of Recommended Exif Interoperability Rules "
 "(ExifR98) for other tags used for ExifR98."
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr "North or South Latitude"
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -2534,15 +2525,15 @@ msgstr ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr "Interoperability Version"
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Latitude"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2556,11 +2547,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr "East or West Longitude"
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -2568,11 +2559,11 @@ msgstr ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Longitude"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2586,29 +2577,29 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr "Altitude Reference"
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 "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 metres. Note "
+"an absolute value in the GPSAltitude tag. The reference unit is metres. Note "
 "that this tag is BYTE type, unlike other reference tags."
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr "Altitude"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -2616,11 +2607,11 @@ msgstr ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is metres."
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr "GPS Time (Atomic Clock)"
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
@@ -2628,11 +2619,11 @@ msgstr ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr "GPS Satellites"
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2646,11 +2637,11 @@ msgstr ""
 "specified. If the GPS receiver is incapable of taking measurements, value of "
 "the tag shall be set to NULL."
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr "GPS Receiver Status"
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 "
@@ -2660,11 +2651,11 @@ msgstr ""
 "means measurement is in progress, and 'V' means the measurement is "
 "Interoperability."
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr "GPS Measurement Mode"
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
@@ -2672,11 +2663,11 @@ msgstr ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr "Measurement Precision"
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
@@ -2686,11 +2677,11 @@ msgstr ""
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr "Speed Unit"
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
@@ -2698,19 +2689,19 @@ msgstr ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr "Speed of GPS Receiver"
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr "Indicates the speed of GPS receiver movement."
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr "Reference for direction of movement"
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
@@ -2718,11 +2709,11 @@ msgstr ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr "Direction of Movement"
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
@@ -2730,11 +2721,11 @@ msgstr ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr "GPS Image Direction Reference"
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2742,11 +2733,11 @@ msgstr ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. 'T' denotes true direction and 'M' is magnetic direction."
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr "GPS Image Direction"
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
@@ -2754,11 +2745,11 @@ msgstr ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr "Geodetic Survey Data Used"
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2770,11 +2761,11 @@ msgstr ""
 "If a GPS Info tag is recorded, it is strongly recommended that this tag be "
 "recorded."
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr "Reference For Latitude of Destination"
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 "
@@ -2784,11 +2775,11 @@ msgstr ""
 "latitude. The ASCII value 'N' indicates north latitude, and 'S' is south "
 "latitude."
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr "Latitude of Destination"
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2804,11 +2795,11 @@ msgstr ""
 "and, for example, fractions of minutes are given up to two decimal places, "
 "the format would be dd/1,mmmm/100,0/1."
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr "Reference for Longitude of Destination"
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
@@ -2816,11 +2807,11 @@ msgstr ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr "Longitude of Destination"
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2836,11 +2827,11 @@ msgstr ""
 "and, for example, fractions of minutes are given up to two decimal places, "
 "the format would be ddd/1,mmmm/100,0/1."
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr "Reference for Bearing of Destination"
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2848,11 +2839,11 @@ msgstr ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr "Bearing of Destination"
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
@@ -2860,32 +2851,31 @@ msgstr ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr "Reference for Distance to Destination"
 
-#: libexif/exif-tag.c:194
-#, fuzzy
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 "Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and knots."
+"'K', 'M' and 'N' represent kilometres, miles and nautical miles."
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr "Distance to Destination"
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr "Indicates the distance to the destination point."
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr "Name of GPS Processing Method"
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2897,11 +2887,11 @@ msgstr ""
 "followed by the name of the method. Since the Type is not ASCII, NULL "
 "termination is not necessary."
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr "Name of GPS Area"
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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 "
@@ -2911,11 +2901,11 @@ msgstr ""
 "indicates the character code used, and this is followed by the name of the "
 "GPS area. Since the Type is not ASCII, NULL termination is not necessary."
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr "GPS Date"
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
@@ -2925,29 +2915,39 @@ msgstr ""
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr "GPS Differential Correction"
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 "Indicates whether differential correction is applied to the GPS receiver."
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "New Subfile Type"
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "A general indication of the kind of data contained in this subfile."
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Image Width"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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."
@@ -2955,11 +2955,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr "Image Length"
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -2967,11 +2967,11 @@ msgstr ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr "Bits per Sample"
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2983,11 +2983,11 @@ msgstr ""
 "<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
 "this tag."
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Compression"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 "
@@ -2997,11 +2997,11 @@ msgstr ""
 "compressed, this designation is not necessary and is omitted. When "
 "thumbnails use JPEG compression, this tag value is set to 6."
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr "Photometric Interpretation"
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -3009,19 +3009,19 @@ msgstr ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr "Fill Order"
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Document Name"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "Image Description"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -3033,11 +3033,11 @@ msgstr ""
 "used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
 "is to be used."
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Manufacturer"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -3047,11 +3047,11 @@ msgstr ""
 "DSC, scanner, video digitiser or other equipment that generated the image. "
 "When the field is left blank, it is treated as unknown."
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Model"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 "
@@ -3061,11 +3061,11 @@ msgstr ""
 "number of the DSC, scanner, video digitiser or other equipment that "
 "generated the image. When the field is left blank, it is treated as unknown."
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr "Strip Offsets"
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -3077,19 +3077,19 @@ msgstr ""
 "JPEG compressed data this designation is not needed and is omitted. See also "
 "<RowsPerStrip> and <StripByteCounts>."
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "Orientation"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "The image orientation viewed in terms of rows and columns."
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr "Samples per Pixel"
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 "
@@ -3099,11 +3099,11 @@ msgstr ""
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
 "JPEG marker is used instead of this tag."
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr "Rows per Strip"
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -3115,11 +3115,11 @@ msgstr ""
 "designation is not needed and is omitted. See also <StripOffsets> and "
 "<StripByteCounts>."
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr "Strip Byte Count"
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
@@ -3127,11 +3127,11 @@ msgstr ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr "X-Resolution"
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -3139,11 +3139,11 @@ msgstr ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr "Y-Resolution"
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -3151,11 +3151,11 @@ msgstr ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr "Planar Configuration"
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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. "
@@ -3165,11 +3165,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr "Resolution Unit"
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -3179,11 +3179,11 @@ msgstr ""
 "used for both <XResolution> and <YResolution>. If the image resolution is "
 "unknown, 2 (inches) is designated."
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr "Transfer Function"
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 "
@@ -3193,11 +3193,11 @@ msgstr ""
 "tag is not necessary, since colour space is specified in the colour space "
 "information tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Software"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3209,11 +3209,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
@@ -3221,11 +3221,11 @@ msgstr ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Artist"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3237,11 +3237,11 @@ msgstr ""
 "the information be written as in the example below for ease of "
 "Interoperability. When the field is left blank, it is treated as unknown."
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "White Point"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
@@ -3251,11 +3251,11 @@ msgstr ""
 "necessary, since colour space is specified in the colour space information "
 "tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr "Primary Chromaticities"
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
@@ -3265,19 +3265,19 @@ msgstr ""
 "tag is not necessary, since colour space is specified in the colour space "
 "information tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr "Transfer Range"
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr "JPEG Interchange Format"
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
@@ -3285,11 +3285,11 @@ msgstr ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr "JPEG Interchange Format Length"
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3303,11 +3303,11 @@ msgstr ""
 "be recorded. Compressed thumbnails must be recorded in no more than 64 "
 "Kbytes, including all other data to be recorded in APP1."
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr "YCbCr Coefficients"
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3321,11 +3321,11 @@ msgstr ""
 "colour space information tag, with the default being the value that gives "
 "the optimal image characteristics Interoperability this condition."
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr "YCbCr Sub-Sampling"
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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."
@@ -3333,11 +3333,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr "YCbCr Positioning"
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3363,11 +3363,11 @@ msgstr ""
 "in this field. It is preferable that readers be able to support both centred "
 "and co-sited positioning."
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr "Reference Black/White"
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3381,19 +3381,19 @@ msgstr ""
 "being the value that gives the optimal image characteristics "
 "Interoperability these conditions."
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr "XML Packet"
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr "XMP Metadata"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr "CFA Pattern"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 "
@@ -3403,15 +3403,15 @@ msgstr ""
 "sensor when a one-chip colour area sensor is used. It does not apply to all "
 "sensing methods."
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Battery Level"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "Copyright"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3445,23 +3445,19 @@ msgstr ""
 "a terminating NULL code, then the editor copyright is given (see example 3). "
 "When the field is left blank, it is treated as unknown."
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Exposure time, given in seconds (sec)."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "F-Number"
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr "The F number."
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr "Image Resources Block"
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 "
@@ -3471,11 +3467,11 @@ msgstr ""
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
 "contain image data as in the case of TIFF."
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr "Exposure Program"
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
@@ -3483,11 +3479,11 @@ msgstr ""
 "The class of the programme used by the camera to set exposure when the "
 "picture is taken."
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr "Spectral Sensitivity"
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 "
@@ -3497,11 +3493,11 @@ msgstr ""
 "tag value is an ASCII string compatible with the standard developed by the "
 "ASTM Technical Committee."
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr "GPS Info IFD Pointer"
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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."
@@ -3509,11 +3505,11 @@ msgstr ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr "ISO Speed Ratings"
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -3521,11 +3517,11 @@ msgstr ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr "Opto-Electronic Conversion Function"
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
@@ -3535,19 +3531,19 @@ msgstr ""
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr "Time Zone Offset"
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr "Encodes time zone of camera clock relative to GMT."
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr "Exif Version"
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -3555,11 +3551,11 @@ msgstr ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr "Date and Time (Original)"
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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."
@@ -3567,19 +3563,19 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr "Date and Time (Digitised)"
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr "The date and time when the image was stored as digital data."
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr "Components Configuration"
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3595,11 +3591,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr "Compressed Bits per Pixel"
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -3607,11 +3603,11 @@ msgstr ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Shutter Speed"
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -3619,15 +3615,15 @@ msgstr ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "The lens aperture. The unit is the APEX value."
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Brightness"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -3635,11 +3631,11 @@ msgstr ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr "Exposure Bias"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -3647,11 +3643,11 @@ msgstr ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr "Maximum Aperture Value"
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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."
@@ -3659,33 +3655,33 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr "Subject Distance"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr "The distance to the subject, given in metres."
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr "The metering mode."
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "Light Source"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr "The kind of light source."
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -3693,11 +3689,11 @@ msgstr ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr "Subject Area"
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
@@ -3705,15 +3701,15 @@ msgstr ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr "TIFF/EP Standard ID"
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr "Maker Note"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -3721,11 +3717,11 @@ msgstr ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "User Comment"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3765,57 +3761,57 @@ msgstr ""
 "and that the following user comment part be filled with blank characters [20."
 "H]."
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr "Sub-second Time"
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr "A tag used to record fractions of seconds for the <DateTime> tag."
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr "Sub-second Time (Original)"
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr "Sub-second Time (Digitised)"
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr "XP Title"
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr "A character string giving the title of the image, encoded in UTF-16LE."
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr "XP Comment"
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr "XP Author"
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
@@ -3823,11 +3819,11 @@ msgstr ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr "XP Keywords"
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
@@ -3835,23 +3831,23 @@ msgstr ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr "XP Subject"
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr "A character string giving the image subject, encoded in UTF-16LE."
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "The FlashPix format version supported by a FPXR file."
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Colour Space"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3865,11 +3861,11 @@ msgstr ""
 "is used, Uncalibrated (=FFFF.H) is set. Image data recorded as Uncalibrated "
 "can be treated as sRGB when it is converted to FlashPix."
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr "Pixel X Dimension"
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3881,11 +3877,11 @@ msgstr ""
 "whether or not there is padding data or a restart marker. This tag should "
 "not exist in an uncompressed file."
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr "Pixel Y Dimension"
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3901,11 +3897,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr "Related Sound File"
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3951,11 +3947,11 @@ msgstr ""
 "this tag is used to map audio files, the relation of the audio file to image "
 "data must also be indicated on the audio file end."
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr "Interoperability IFD Pointer"
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3969,11 +3965,11 @@ msgstr ""
 "TIFF defined IFD structure but does not contain the image data "
 "characteristically compared with normal TIFF IFD."
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr "Flash Energy"
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -3981,11 +3977,11 @@ msgstr ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr "Spatial Frequency Response"
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 "
@@ -3995,11 +3991,11 @@ msgstr ""
 "values in the direction of image width, image height, and diagonal "
 "direction, as specified in ISO 12233."
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr "Focal Plane X-Resolution"
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -4007,11 +4003,11 @@ msgstr ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr "Focal Plane Y-Resolution"
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -4019,11 +4015,11 @@ msgstr ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr "Focal Plane Resolution Unit"
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -4031,11 +4027,11 @@ msgstr ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr "Subject Location"
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -4049,11 +4045,11 @@ msgstr ""
 "value indicates the X column number and the second indicates the Y row "
 "number."
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr "Exposure Index"
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
@@ -4061,19 +4057,19 @@ msgstr ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr "Sensing Method"
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr "Indicates the image sensor type on the camera or input device."
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "File Source"
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -4081,11 +4077,11 @@ msgstr ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr "Scene Type"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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."
@@ -4093,11 +4089,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr "Custom Rendered"
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 "
@@ -4107,7 +4103,7 @@ msgstr ""
 "rendering geared to output. When special processing is performed, the reader "
 "is expected to disable or minimise any further processing."
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 "
@@ -4117,15 +4113,15 @@ msgstr ""
 "bracketing mode, the camera shoots a series of frames of the same scene at "
 "different exposure settings."
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr "This tag indicates the white balance mode set when the image was shot."
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr "Digital Zoom Ratio"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 "
@@ -4135,11 +4131,11 @@ msgstr ""
 "numerator of the recorded value is 0, this indicates that digital zoom was "
 "not used."
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr "Focal Length in 35mm Film"
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 "
@@ -4149,11 +4145,11 @@ msgstr ""
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
 "differs from the FocalLength tag."
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr "Scene Capture Type"
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
@@ -4163,15 +4159,15 @@ msgstr ""
 "record the mode in which the image was shot. Note that this differs from the "
 "scene type <SceneType> tag."
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr "Gain Control"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "This tag indicates the degree of overall image gain adjustment."
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -4179,7 +4175,7 @@ msgstr ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -4187,7 +4183,7 @@ msgstr ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
@@ -4195,11 +4191,11 @@ msgstr ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr "Device Setting Description"
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 "
@@ -4209,19 +4205,19 @@ msgstr ""
 "particular camera model. The tag is used only to indicate the picture-taking "
 "conditions in the reader."
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr "Subject Distance Range"
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr "This tag indicates the distance to the subject."
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr "Image Unique ID"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 "
@@ -4231,27 +4227,27 @@ msgstr ""
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
 "fixed length."
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr "Gamma"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr "Indicates the value of coefficient gamma."
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr "PRINT Image Matching"
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr "Related to Epson's PRINT Image Matching technology"
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr "Padding"
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4433,17 +4429,11 @@ msgstr "Wide1 (230%)"
 msgid "Wide2 (400%)"
 msgstr "Wide2 (400%)"
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr "%2.2f mm"
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr "%i bytes unknown data"
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr "Maker Note Version"
@@ -4869,117 +4859,117 @@ msgstr "15 frames/sec"
 msgid "20 frames/sec"
 msgstr "20 frames/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "Red Correction %f, blue Correction %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr "No manual focus selection"
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f metres"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr "AF position: centre"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr "AF position: top"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr "AF position: bottom"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr "AF position: left"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr "AF position: right"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr "AF position: upper-left"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr "AF position: upper-right"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr "AF position: lower-left"
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr "AF position: lower-right"
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr "AF position: far left"
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr "AF position: far right"
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr "Unknown AF position"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Internal error (unknown value %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Unknown value %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr "Unknown %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr "2 sec."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr "Fast"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "Automatic"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr "Manual: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr "Manual: unknown"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr "One-touch"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr "Infinite"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i bytes unknown data: "
@@ -5081,8 +5071,7 @@ msgid "Contrast Curve"
 msgstr "Contrast Curve"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr "Colour Mode"
 
@@ -5254,13 +5243,11 @@ msgstr "Black Level"
 msgid "White Balance Setting"
 msgstr "White Balance Setting"
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr "Red Balance"
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr "Blue Balance"
 
@@ -5608,11 +5595,21 @@ msgstr "3008x2008 or 3040x2024"
 msgid "Digital filter?"
 msgstr "Digital filter?"
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr "Internal error (unknown value %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Internal error (unknown value %hu %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Internal error (unknown value %i %i)"
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Internal error (unknown value %hi %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5815,5 +5812,5 @@ msgstr "Finer"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
-#~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr "Tag UserComment does not comply with standard but contains data."
+#~ msgid "FNumber"
+#~ msgstr "FNumber"
diff --git a/po/en_CA.gmo b/po/en_CA.gmo
deleted file mode 100644
index 34a2c2d..0000000
--- a/po/en_CA.gmo
+++ /dev/null
diff --git a/po/en_CA.po b/po/en_CA.po
index 70e9149..90f07cd 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.17.1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
 "PO-Revision-Date: 2009-09-21 22:44-0700\n"
 "Last-Translator: Dan Fandrich <dan@coneharvesters.com>\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: en_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +39,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -50,14 +50,14 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -86,15 +86,15 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -126,8 +126,8 @@ msgstr ""
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -147,8 +147,7 @@ msgstr ""
 msgid "Auto, red-eye reduction"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr ""
 
@@ -270,9 +269,8 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -284,7 +282,7 @@ msgid "Manual"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -313,7 +311,7 @@ msgid "Sepia"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -340,8 +338,7 @@ msgstr ""
 msgid "Neutral"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr ""
 
@@ -423,7 +420,7 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr ""
@@ -436,8 +433,8 @@ msgstr "2×"
 msgid "4x"
 msgstr "4×"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr ""
 
@@ -487,11 +484,11 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr ""
 
@@ -499,11 +496,11 @@ msgstr ""
 msgid "Evaluative"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr "Centre-weighted average"
 
@@ -515,7 +512,7 @@ msgstr ""
 msgid "Very close"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr ""
 
@@ -1026,32 +1023,32 @@ msgid "Sunny"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr ""
@@ -1073,7 +1070,7 @@ msgid "PC set 3"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr ""
@@ -1086,7 +1083,7 @@ msgstr ""
 msgid "Custom 2"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1151,22 +1148,22 @@ msgid "Rotated by software"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr ""
 
@@ -1176,7 +1173,7 @@ msgstr "2×2 matrix (clockwise)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1194,9 +1191,8 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1251,37 +1247,44 @@ msgstr ""
 msgid ", "
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr ""
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr ""
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr ""
 
@@ -1289,8 +1292,7 @@ msgstr ""
 msgid "Settings (Second Part)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr ""
@@ -1345,8 +1347,8 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr ""
 
@@ -1357,9 +1359,8 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr ""
 
@@ -1378,25 +1379,24 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1406,7 +1406,7 @@ msgstr ""
 msgid "ISO"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr ""
@@ -1419,7 +1419,7 @@ msgstr ""
 msgid "AF Point"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr ""
 
@@ -1526,7 +1526,7 @@ msgid "Exposure Compensation"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1566,11 +1566,12 @@ msgstr ""
 msgid "Focus Distance Lower"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr ""
@@ -1619,45 +1620,45 @@ msgstr ""
 msgid "Intel"
 msgstr ""
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr ""
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr ""
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr ""
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr ""
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr ""
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 msgstr ""
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr ""
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1702,195 +1703,193 @@ msgid ""
 "fixed."
 msgstr ""
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr ""
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr ""
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr ""
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr ""
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "One-chip colour area sensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr "Two-chip colour area sensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr "Three-chip colour area sensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr "Colour sequential area sensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr "Colour sequential linear sensor"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr ""
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr "Centred"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr ""
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr ""
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr ""
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr ""
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr ""
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr ""
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr ""
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr ""
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr ""
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1898,178 +1897,178 @@ msgstr ""
 msgid "Hard"
 msgstr ""
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr ""
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr ""
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr "Centre-weight"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr ""
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr ""
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr ""
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr ""
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr ""
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr ""
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr ""
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr ""
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr ""
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr ""
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr ""
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr ""
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr ""
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr ""
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr ""
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr ""
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr ""
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Centimetre"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr ""
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr ""
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr ""
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr ""
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr ""
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr ""
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr ""
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr ""
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr ""
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr ""
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr ""
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr ""
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr ""
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2077,305 +2076,303 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr ""
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr ""
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr ""
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr ""
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr ""
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr ""
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr ""
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr ""
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr ""
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr ""
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr ""
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr ""
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr ""
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr ""
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr ""
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr ""
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr ""
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr ""
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr ""
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr ""
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m²)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr ""
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr ""
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr ""
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr ""
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr ""
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr ""
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr ""
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr ""
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr ""
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr ""
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr ""
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr ""
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr ""
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr ""
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr ""
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr ""
@@ -2461,11 +2458,11 @@ msgstr ""
 msgid "The data provided does not follow the specification."
 msgstr ""
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr ""
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2473,11 +2470,11 @@ msgid ""
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr ""
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2485,25 +2482,25 @@ msgid ""
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr ""
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2512,21 +2509,21 @@ msgid ""
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2535,29 +2532,29 @@ msgid ""
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 "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 metres. Note "
+"an absolute value in the GPSAltitude tag. The reference unit is metres. Note "
 "that this tag is BYTE type, unlike other reference tags."
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr ""
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -2565,21 +2562,21 @@ msgstr ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is metres."
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr ""
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2588,43 +2585,43 @@ msgid ""
 "the tag shall be set to NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr ""
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr ""
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr ""
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
@@ -2632,59 +2629,59 @@ msgstr ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K' "
 "'M' and 'N' represent kilometres per hour, miles per hour, and knots."
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr ""
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr ""
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr ""
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr ""
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr ""
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2692,22 +2689,22 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 ""
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2717,21 +2714,21 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2741,31 +2738,31 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
@@ -2773,19 +2770,19 @@ msgstr ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometres, miles and nautical miles."
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2793,70 +2790,80 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr ""
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr ""
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr ""
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr ""
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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 ""
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr ""
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr ""
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2864,40 +2871,40 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr ""
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 ""
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr ""
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr ""
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr ""
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr ""
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2905,33 +2912,33 @@ msgid ""
 "is to be used."
 msgstr ""
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr ""
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 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 ""
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr ""
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 ""
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr ""
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2939,30 +2946,30 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr ""
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr ""
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 ""
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr ""
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -2970,63 +2977,63 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr ""
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 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 ""
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr ""
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 "
@@ -3036,11 +3043,11 @@ msgstr ""
 "tag is not necessary, since colour space is specified in the colour space "
 "information tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr ""
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3048,21 +3055,21 @@ msgid ""
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr ""
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 msgstr ""
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr ""
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3070,11 +3077,11 @@ msgid ""
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr ""
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
@@ -3084,11 +3091,11 @@ msgstr ""
 "necessary, since colour space is specified in the colour space information "
 "tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr ""
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
@@ -3098,29 +3105,29 @@ msgstr ""
 "tag is not necessary, since colour space is specified in the colour space "
 "information tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr ""
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr ""
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3129,11 +3136,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr ""
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3147,21 +3154,21 @@ msgstr ""
 "colour space information tag, with the default being the value that gives "
 "the optimal image characteristics Interoperability this condition."
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr ""
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3187,11 +3194,11 @@ msgstr ""
 "in this field. It is preferable that readers be able to support both centred "
 "and co-sited positioning."
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr ""
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3205,19 +3212,19 @@ msgstr ""
 "being the value that gives the optimal image characteristics "
 "Interoperability these conditions."
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr ""
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr ""
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 "
@@ -3227,15 +3234,15 @@ msgstr ""
 "sensor when a one-chip colour area sensor is used. It does not apply to all "
 "sensing methods."
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr ""
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr ""
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3254,122 +3261,118 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr ""
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr ""
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr ""
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr ""
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr ""
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr ""
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr ""
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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 ""
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3379,120 +3382,120 @@ msgid ""
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr ""
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr ""
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 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 ""
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr ""
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr ""
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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 ""
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr ""
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr "The distance to the subject, given in metres."
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr ""
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr ""
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr ""
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 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 ""
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr ""
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr ""
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3514,86 +3517,86 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr ""
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr ""
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr ""
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Colour Space"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3607,11 +3610,11 @@ msgstr ""
 "is used, Uncalibrated (=FFFF.H) is set. Image data recorded as Uncalibrated "
 "can be treated as sRGB when it is converted to FlashPix."
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3619,11 +3622,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3633,11 +3636,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3662,11 +3665,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3675,62 +3678,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr ""
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr ""
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3744,176 +3747,176 @@ msgstr ""
 "value indicates the X column number and the second indicates the Y row "
 "number."
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr ""
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr ""
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr ""
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr ""
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr ""
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr ""
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr ""
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr ""
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4091,17 +4094,11 @@ msgstr ""
 msgid "Wide2 (400%)"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr ""
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr ""
@@ -4527,117 +4524,117 @@ msgstr ""
 msgid "20 frames/sec"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f metres"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr "AF position: centre"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr ""
@@ -4739,8 +4736,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr "Colour Mode"
 
@@ -4912,13 +4908,11 @@ msgstr ""
 msgid "White Balance Setting"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr ""
 
@@ -5266,10 +5260,20 @@ msgstr "3008×2008 or 3040×2024"
 msgid "Digital filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:385
 #, c-format
-msgid "Internal error (unknown value %i %i)"
+msgid "Internal error (unknown value %hi %hi)"
 msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
deleted file mode 100644
index a316eeb..0000000
--- a/po/en_GB.gmo
+++ /dev/null
diff --git a/po/en_GB.po b/po/en_GB.po
index 1604fdf..1f6406b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2012-01-20 22:32+0000\n"
-"Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
+"PO-Revision-Date: 2014-01-03 15:31+0000\n"
+"Last-Translator: Anthony Harrington <untaintableangel@ubuntu.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"Language: \n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 06:53+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2016-09-01 20:32+0000\n"
+"X-Generator: Launchpad (build 18179)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -40,7 +40,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Invalid number of components (%i, expected %i or %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -51,14 +51,14 @@ msgstr "Macro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -87,15 +87,15 @@ msgstr "Superfine"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -127,8 +127,8 @@ msgstr "Auto"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -148,8 +148,7 @@ msgstr "Slow synchro"
 msgid "Auto, red-eye reduction"
 msgstr "Auto, red-eye reduction"
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr "On, red-eye reduction"
 
@@ -271,9 +270,8 @@ msgstr "Full auto"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -285,7 +283,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -314,7 +312,7 @@ msgid "Sepia"
 msgstr "Sepia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -341,8 +339,7 @@ msgstr "Vivid"
 msgid "Neutral"
 msgstr "Neutral"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "Flash off"
 
@@ -424,7 +421,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "None"
@@ -437,8 +434,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "Other"
 
@@ -488,11 +485,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Default"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "Spot"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Average"
 
@@ -500,11 +497,11 @@ msgstr "Average"
 msgid "Evaluative"
 msgstr "Evaluative"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Partial"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr "Centre-weighted average"
 
@@ -516,7 +513,7 @@ msgstr "Not known"
 msgid "Very close"
 msgstr "Very close"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Close"
 
@@ -653,9 +650,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -674,9 +670,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -927,9 +922,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -1030,32 +1024,32 @@ msgid "Sunny"
 msgstr "Sunny"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Cloudy"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Tungsten"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Fluorescent"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Flash"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Shade"
@@ -1077,7 +1071,7 @@ msgid "PC set 3"
 msgstr "PC set 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Daylight fluorescent"
@@ -1090,7 +1084,7 @@ msgstr "Custom 1"
 msgid "Custom 2"
 msgstr "Custom 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1155,22 +1149,22 @@ msgid "Rotated by software"
 msgstr "Rotated by software"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Left to right"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Right to left"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Bottom to top"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Top to bottom"
 
@@ -1180,7 +1174,7 @@ msgstr "2x2 matrix (clockwise)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1198,9 +1192,8 @@ msgstr "Lowest"
 msgid "Highest"
 msgstr "Highest"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1255,37 +1248,44 @@ msgstr "Monochrome"
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i bytes unknown data"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr "Settings (First Part)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Focal Length"
 
@@ -1293,8 +1293,7 @@ msgstr "Focal Length"
 msgid "Settings (Second Part)"
 msgstr "Settings (Second Part)"
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1349,8 +1348,8 @@ msgstr "Quality"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "Flash Mode"
 
@@ -1361,9 +1360,8 @@ msgstr "Drive Mode"
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "Focus Mode"
 
@@ -1382,25 +1380,24 @@ msgstr "Easy Shooting Mode"
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "Digital Zoom"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Contrast"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Saturation"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1410,7 +1407,7 @@ msgstr "Sharpness"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "Metering Mode"
@@ -1423,7 +1420,7 @@ msgstr "Focus Range"
 msgid "AF Point"
 msgstr "AF Point"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Exposure Mode"
 
@@ -1530,7 +1527,7 @@ msgid "Exposure Compensation"
 msgstr "Exposure Compensation"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1570,11 +1567,12 @@ msgstr "Focus Distance Upper"
 msgid "Focus Distance Lower"
 msgstr "Focus Distance Lower"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "F-Number"
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Exposure Time"
@@ -1623,35 +1621,35 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr "Size of data too small to allow for EXIF data."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr "EXIF marker not found."
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr "EXIF header not found."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr "Unknown encoding."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr "Ignore unknown tags"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Ignore unknown tags when loading EXIF data."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr "Follow specification"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
@@ -1659,11 +1657,11 @@ msgstr ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr "Do not change maker note"
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1722,196 +1720,194 @@ msgstr ""
 "Tag 'UserComment' did not start with a format identifier. This has been "
 "fixed."
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i bytes undefined data"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i bytes unsupported data type"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr "Chunky format"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr "Planar format"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Not defined"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "One-chip colour area sensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr "Two-chip colour area sensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr "Three-chip colour area sensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr "Colour sequential area sensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr "Trilinear sensor"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr "Colour sequential linear sensor"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Top-left"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Top-right"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Bottom-right"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Bottom-left"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr "Left-top"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr "Right-top"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr "Right-bottom"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr "Left-bottom"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr "Centred"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr "Co-sited"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr "Reversed mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr "Normal mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Palette"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "Normal process"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "Custom process"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr "Auto exposure"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Manual exposure"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr "Auto bracket"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr "Auto white balance"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr "Manual white balance"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr "Low gain up"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr "High gain up"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr "Low gain down"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr "High gain down"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "Low saturation"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "High saturation"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "Soft"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1919,178 +1915,178 @@ msgstr "Soft"
 msgid "Hard"
 msgstr "Hard"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Unknown"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr "Avg"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr "Centre-weight"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr "Multi spot"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Pattern"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "LZW compression"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "JPEG compression"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr "Deflate/ZIP compression"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr "PackBits compression"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr "Tungsten incandescent light"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Fine weather"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Cloudy weather"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Day white fluorescent"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr "Cool white fluorescent"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "White fluorescent"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "Standard light A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "Standard light B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "Standard light C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr "ISO studio tungsten"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "Inch"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "in"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Centimetre"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "Normal programme"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr "Aperture priority"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "Aperture"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr "Shutter priority"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr "Shutter"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr "Creative programme (biased towards depth of field)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr "Creative"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr "Creative programme (biased towards fast shutter speed)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "Action"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "Portrait mode (for closeup photos with the background out of focus)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Landscape mode (for landscape photos with the background in focus)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "Flash did not fire"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr "No flash"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr "Flash fired"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2098,75 +2094,75 @@ msgstr "Flash fired"
 msgid "Yes"
 msgstr "Yes"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr "Strobe return light not detected"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr "Without strobe"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr "Strobe return light detected"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr "With strobe"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr "Flash fired, compulsory flash mode"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr "Flash fired, compulsory flash mode, return light not detected"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr "Flash fired, compulsory flash mode, return light detected"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "Flash did not fire, compulsory flash mode"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr "Flash did not fire, auto mode"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr "Flash fired, auto mode"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr "Flash fired, auto mode, return light not detected"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr "Flash fired, auto mode, return light detected"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr "No flash function"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr "Flash fired, red-eye reduction mode"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr "Flash fired, red-eye reduction mode, return light not detected"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr "Flash fired, red-eye reduction mode, return light detected"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "Flash fired, compulsory flash mode, red-eye reduction mode"
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
@@ -2174,7 +2170,7 @@ msgstr ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
@@ -2182,229 +2178,224 @@ msgstr ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr "Flash did not fire, auto mode, red-eye reduction mode"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "Flash fired, auto mode, red-eye reduction mode"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr "Flash fired, auto mode, return light detected, red-eye reduction mode"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr "Close view"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr "Distant view"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr "Distant"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr "Uncalibrated"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Invalid size of entry (%i, expected %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr "Unsupported UNICODE string"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr "Unsupported JIS string"
 
-#: libexif/exif-entry.c:935
-#, fuzzy
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
-msgstr ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
+msgstr "Tag UserComment contains data but is against specification."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Byte at position %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr "Unknown Exif Version"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif Version %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix Version 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix Version 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr "Unknown FlashPix Version"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[None]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "(Photographer)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Editor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35 equivalent: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " sec."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d sec.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d sec.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Internal error (unknown value %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr "Reserved"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr "Directly photographed"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "Within distance %i of (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Unexpected number of components (%li, expected 2, 3, or 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr "Sea level"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr "Sea level reference"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr "Unknown value %i"
@@ -2490,11 +2481,11 @@ msgstr "Corrupt data"
 msgid "The data provided does not follow the specification."
 msgstr "The data provided does not follow the specification."
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr "GPS Tag Version"
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2506,11 +2497,11 @@ msgstr ""
 "tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
 "2.0.0.0, the tag value is 02000000.H)."
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr "Interoperability Index"
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2522,11 +2513,11 @@ msgstr ""
 "(NULL). see the separate volume of Recommended Exif Interoperability Rules "
 "(ExifR98) for other tags used for ExifR98."
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr "North or South Latitude"
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -2534,15 +2525,15 @@ msgstr ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr "Interoperability Version"
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Latitude"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2556,11 +2547,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr "East or West Longitude"
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -2568,11 +2559,11 @@ msgstr ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Longitude"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2586,29 +2577,29 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr "Altitude Reference"
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 "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 metres. Note "
+"an absolute value in the GPSAltitude tag. The reference unit is metres. Note "
 "that this tag is BYTE type, unlike other reference tags."
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr "Altitude"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -2616,11 +2607,11 @@ msgstr ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is metres."
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr "GPS Time (Atomic Clock)"
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
@@ -2628,11 +2619,11 @@ msgstr ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr "GPS Satellites"
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2646,11 +2637,11 @@ msgstr ""
 "specified. If the GPS receiver is incapable of taking measurements, value of "
 "the tag shall be set to NULL."
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr "GPS Receiver Status"
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 "
@@ -2660,11 +2651,11 @@ msgstr ""
 "means measurement is in progress, and 'V' means the measurement is "
 "Interoperability."
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr "GPS Measurement Mode"
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
@@ -2672,11 +2663,11 @@ msgstr ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr "Measurement Precision"
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
@@ -2686,11 +2677,11 @@ msgstr ""
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr "Speed Unit"
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
@@ -2698,19 +2689,19 @@ msgstr ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr "Speed of GPS Receiver"
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr "Indicates the speed of GPS receiver movement."
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr "Reference for direction of movement"
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
@@ -2718,11 +2709,11 @@ msgstr ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr "Direction of Movement"
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
@@ -2730,11 +2721,11 @@ msgstr ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr "GPS Image Direction Reference"
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2742,11 +2733,11 @@ msgstr ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. 'T' denotes true direction and 'M' is magnetic direction."
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr "GPS Image Direction"
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
@@ -2754,11 +2745,11 @@ msgstr ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr "Geodetic Survey Data Used"
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2770,11 +2761,11 @@ msgstr ""
 "If a GPS Info tag is recorded, it is strongly recommended that this tag be "
 "recorded."
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr "Reference For Latitude of Destination"
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 "
@@ -2784,11 +2775,11 @@ msgstr ""
 "latitude. The ASCII value 'N' indicates north latitude, and 'S' is south "
 "latitude."
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr "Latitude of Destination"
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2804,11 +2795,11 @@ msgstr ""
 "and, for example, fractions of minutes are given up to two decimal places, "
 "the format would be dd/1,mmmm/100,0/1."
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr "Reference for Longitude of Destination"
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
@@ -2816,11 +2807,11 @@ msgstr ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr "Longitude of Destination"
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2836,11 +2827,11 @@ msgstr ""
 "and, for example, fractions of minutes are given up to two decimal places, "
 "the format would be ddd/1,mmmm/100,0/1."
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr "Reference for Bearing of Destination"
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2848,11 +2839,11 @@ msgstr ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr "Bearing of Destination"
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
@@ -2860,32 +2851,31 @@ msgstr ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr "Reference for Distance to Destination"
 
-#: libexif/exif-tag.c:194
-#, fuzzy
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 "Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and knots."
+"'K', 'M' and 'N' represent kilometres, miles and nautical miles."
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr "Distance to Destination"
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr "Indicates the distance to the destination point."
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr "Name of GPS Processing Method"
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2897,11 +2887,11 @@ msgstr ""
 "followed by the name of the method. Since the Type is not ASCII, NULL "
 "termination is not necessary."
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr "Name of GPS Area"
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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 "
@@ -2911,11 +2901,11 @@ msgstr ""
 "indicates the character code used, and this is followed by the name of the "
 "GPS area. Since the Type is not ASCII, NULL termination is not necessary."
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr "GPS Date"
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
@@ -2925,29 +2915,39 @@ msgstr ""
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr "GPS Differential Correction"
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 "Indicates whether differential correction is applied to the GPS receiver."
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "New Subfile Type"
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "A general indication of the kind of data contained in this subfile."
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Image Width"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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."
@@ -2955,11 +2955,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr "Image Length"
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -2967,11 +2967,11 @@ msgstr ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr "Bits per Sample"
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2983,11 +2983,11 @@ msgstr ""
 "<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
 "this tag."
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Compression"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 "
@@ -2997,11 +2997,11 @@ msgstr ""
 "compressed, this designation is not necessary and is omitted. When "
 "thumbnails use JPEG compression, this tag value is set to 6."
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr "Photometric Interpretation"
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -3009,19 +3009,19 @@ msgstr ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr "Fill Order"
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Document Name"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "Image Description"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -3033,11 +3033,11 @@ msgstr ""
 "used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
 "is to be used."
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Manufacturer"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -3047,11 +3047,11 @@ msgstr ""
 "DSC, scanner, video digitiser or other equipment that generated the image. "
 "When the field is left blank, it is treated as unknown."
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Model"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 "
@@ -3061,11 +3061,11 @@ msgstr ""
 "number of the DSC, scanner, video digitiser or other equipment that "
 "generated the image. When the field is left blank, it is treated as unknown."
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr "Strip Offsets"
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -3077,19 +3077,19 @@ msgstr ""
 "JPEG compressed data this designation is not needed and is omitted. See also "
 "<RowsPerStrip> and <StripByteCounts>."
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "Orientation"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "The image orientation viewed in terms of rows and columns."
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr "Samples per Pixel"
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 "
@@ -3099,11 +3099,11 @@ msgstr ""
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
 "JPEG marker is used instead of this tag."
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr "Rows per Strip"
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -3115,11 +3115,11 @@ msgstr ""
 "designation is not needed and is omitted. See also <StripOffsets> and "
 "<StripByteCounts>."
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr "Strip Byte Count"
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
@@ -3127,11 +3127,11 @@ msgstr ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr "X-Resolution"
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -3139,11 +3139,11 @@ msgstr ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr "Y-Resolution"
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -3151,11 +3151,11 @@ msgstr ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr "Planar Configuration"
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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. "
@@ -3165,11 +3165,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr "Resolution Unit"
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -3179,11 +3179,11 @@ msgstr ""
 "used for both <XResolution> and <YResolution>. If the image resolution is "
 "unknown, 2 (inches) is designated."
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr "Transfer Function"
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 "
@@ -3193,11 +3193,11 @@ msgstr ""
 "tag is not necessary, since colour space is specified in the colour space "
 "information tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Software"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3209,11 +3209,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
@@ -3221,11 +3221,11 @@ msgstr ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Artist"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3237,11 +3237,11 @@ msgstr ""
 "the information be written as in the example below for ease of "
 "Interoperability. When the field is left blank, it is treated as unknown."
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "White Point"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
@@ -3251,11 +3251,11 @@ msgstr ""
 "necessary, since colour space is specified in the colour space information "
 "tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr "Primary Chromaticities"
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
@@ -3265,19 +3265,19 @@ msgstr ""
 "tag is not necessary, since colour space is specified in the colour space "
 "information tag (<ColorSpace>)."
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr "Transfer Range"
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr "JPEG Interchange Format"
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
@@ -3285,11 +3285,11 @@ msgstr ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr "JPEG Interchange Format Length"
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3303,11 +3303,11 @@ msgstr ""
 "be recorded. Compressed thumbnails must be recorded in no more than 64 "
 "Kbytes, including all other data to be recorded in APP1."
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr "YCbCr Coefficients"
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3321,11 +3321,11 @@ msgstr ""
 "colour space information tag, with the default being the value that gives "
 "the optimal image characteristics Interoperability this condition."
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr "YCbCr Sub-Sampling"
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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."
@@ -3333,11 +3333,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr "YCbCr Positioning"
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3363,11 +3363,11 @@ msgstr ""
 "in this field. It is preferable that readers be able to support both centred "
 "and co-sited positioning."
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr "Reference Black/White"
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3381,19 +3381,19 @@ msgstr ""
 "being the value that gives the optimal image characteristics "
 "Interoperability these conditions."
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr "XML Packet"
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr "XMP Metadata"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr "CFA Pattern"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 "
@@ -3403,15 +3403,15 @@ msgstr ""
 "sensor when a one-chip colour area sensor is used. It does not apply to all "
 "sensing methods."
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Battery Level"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "Copyright"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3445,23 +3445,19 @@ msgstr ""
 "a terminating NULL code, then the editor copyright is given (see example 3). "
 "When the field is left blank, it is treated as unknown."
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Exposure time, given in seconds (sec)."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "F-Number"
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr "The F number."
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr "Image Resources Block"
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 "
@@ -3471,11 +3467,11 @@ msgstr ""
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
 "contain image data as in the case of TIFF."
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr "Exposure Program"
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
@@ -3483,11 +3479,11 @@ msgstr ""
 "The class of the programme used by the camera to set exposure when the "
 "picture is taken."
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr "Spectral Sensitivity"
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 "
@@ -3497,11 +3493,11 @@ msgstr ""
 "tag value is an ASCII string compatible with the standard developed by the "
 "ASTM Technical Committee."
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr "GPS Info IFD Pointer"
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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."
@@ -3509,11 +3505,11 @@ msgstr ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr "ISO Speed Ratings"
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -3521,11 +3517,11 @@ msgstr ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr "Opto-Electronic Conversion Function"
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
@@ -3535,19 +3531,19 @@ msgstr ""
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr "Time Zone Offset"
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr "Encodes time zone of camera clock relative to GMT."
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr "Exif Version"
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -3555,11 +3551,11 @@ msgstr ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr "Date and Time (Original)"
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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."
@@ -3567,19 +3563,19 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr "Date and Time (Digitised)"
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr "The date and time when the image was stored as digital data."
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr "Components Configuration"
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3595,11 +3591,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr "Compressed Bits per Pixel"
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -3607,11 +3603,11 @@ msgstr ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Shutter Speed"
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -3619,15 +3615,15 @@ msgstr ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "The lens aperture. The unit is the APEX value."
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Brightness"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -3635,11 +3631,11 @@ msgstr ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr "Exposure Bias"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -3647,11 +3643,11 @@ msgstr ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr "Maximum Aperture Value"
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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."
@@ -3659,33 +3655,33 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr "Subject Distance"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr "The distance to the subject, given in metres."
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr "The metering mode."
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "Light Source"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr "The kind of light source."
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -3693,11 +3689,11 @@ msgstr ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr "Subject Area"
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
@@ -3705,15 +3701,15 @@ msgstr ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr "TIFF/EP Standard ID"
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr "Maker Note"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -3721,11 +3717,11 @@ msgstr ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "User Comment"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3765,57 +3761,57 @@ msgstr ""
 "and that the following user comment part be filled with blank characters [20."
 "H]."
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr "Sub-second Time"
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr "A tag used to record fractions of seconds for the <DateTime> tag."
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr "Sub-second Time (Original)"
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr "Sub-second Time (Digitised)"
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr "XP Title"
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr "A character string giving the title of the image, encoded in UTF-16LE."
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr "XP Comment"
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr "XP Author"
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
@@ -3823,11 +3819,11 @@ msgstr ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr "XP Keywords"
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
@@ -3835,23 +3831,23 @@ msgstr ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr "XP Subject"
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr "A character string giving the image subject, encoded in UTF-16LE."
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "The FlashPix format version supported by a FPXR file."
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Colour Space"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3865,11 +3861,11 @@ msgstr ""
 "is used, Uncalibrated (=FFFF.H) is set. Image data recorded as Uncalibrated "
 "can be treated as sRGB when it is converted to FlashPix."
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr "Pixel X Dimension"
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3881,11 +3877,11 @@ msgstr ""
 "whether or not there is padding data or a restart marker. This tag should "
 "not exist in an uncompressed file."
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr "Pixel Y Dimension"
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3901,11 +3897,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr "Related Sound File"
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3951,11 +3947,11 @@ msgstr ""
 "this tag is used to map audio files, the relation of the audio file to image "
 "data must also be indicated on the audio file end."
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr "Interoperability IFD Pointer"
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3969,11 +3965,11 @@ msgstr ""
 "TIFF defined IFD structure but does not contain the image data "
 "characteristically compared with normal TIFF IFD."
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr "Flash Energy"
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -3981,11 +3977,11 @@ msgstr ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr "Spatial Frequency Response"
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 "
@@ -3995,11 +3991,11 @@ msgstr ""
 "values in the direction of image width, image height, and diagonal "
 "direction, as specified in ISO 12233."
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr "Focal Plane X-Resolution"
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -4007,11 +4003,11 @@ msgstr ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr "Focal Plane Y-Resolution"
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -4019,11 +4015,11 @@ msgstr ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr "Focal Plane Resolution Unit"
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -4031,11 +4027,11 @@ msgstr ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr "Subject Location"
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -4049,11 +4045,11 @@ msgstr ""
 "value indicates the X column number and the second indicates the Y row "
 "number."
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr "Exposure Index"
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
@@ -4061,19 +4057,19 @@ msgstr ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr "Sensing Method"
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr "Indicates the image sensor type on the camera or input device."
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "File Source"
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -4081,11 +4077,11 @@ msgstr ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr "Scene Type"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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."
@@ -4093,11 +4089,11 @@ msgstr ""
 "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."
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr "Custom Rendered"
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 "
@@ -4107,7 +4103,7 @@ msgstr ""
 "rendering geared to output. When special processing is performed, the reader "
 "is expected to disable or minimise any further processing."
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 "
@@ -4117,15 +4113,15 @@ msgstr ""
 "bracketing mode, the camera shoots a series of frames of the same scene at "
 "different exposure settings."
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr "This tag indicates the white balance mode set when the image was shot."
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr "Digital Zoom Ratio"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 "
@@ -4135,11 +4131,11 @@ msgstr ""
 "numerator of the recorded value is 0, this indicates that digital zoom was "
 "not used."
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr "Focal Length in 35mm Film"
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 "
@@ -4149,11 +4145,11 @@ msgstr ""
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
 "differs from the FocalLength tag."
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr "Scene Capture Type"
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
@@ -4163,15 +4159,15 @@ msgstr ""
 "record the mode in which the image was shot. Note that this differs from the "
 "scene type <SceneType> tag."
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr "Gain Control"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "This tag indicates the degree of overall image gain adjustment."
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -4179,7 +4175,7 @@ msgstr ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -4187,7 +4183,7 @@ msgstr ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
@@ -4195,11 +4191,11 @@ msgstr ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr "Device Setting Description"
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 "
@@ -4209,19 +4205,19 @@ msgstr ""
 "particular camera model. The tag is used only to indicate the picture-taking "
 "conditions in the reader."
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr "Subject Distance Range"
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr "This tag indicates the distance to the subject."
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr "Image Unique ID"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 "
@@ -4231,27 +4227,27 @@ msgstr ""
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
 "fixed length."
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr "Gamma"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr "Indicates the value of coefficient gamma."
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr "PRINT Image Matching"
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr "Related to Epson's PRINT Image Matching technology"
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr "Padding"
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4433,17 +4429,11 @@ msgstr "Wide1 (230%)"
 msgid "Wide2 (400%)"
 msgstr "Wide2 (400%)"
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr "%2.2f mm"
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr "%i bytes unknown data"
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr "Maker Note Version"
@@ -4869,117 +4859,117 @@ msgstr "15 frames/sec"
 msgid "20 frames/sec"
 msgstr "20 frames/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "Red Correction %f, blue Correction %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr "No manual focus selection"
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f metres"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr "AF position: centre"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr "AF position: top"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr "AF position: bottom"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr "AF position: left"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr "AF position: right"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr "AF position: upper-left"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr "AF position: upper-right"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr "AF position: lower-left"
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr "AF position: lower-right"
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr "AF position: far left"
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr "AF position: far right"
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr "Unknown AF position"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Internal error (unknown value %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Unknown value %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr "Unknown %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr "2 sec."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr "Fast"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "Automatic"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr "Manual: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr "Manual: unknown"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr "One-touch"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr "Infinite"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i bytes unknown data: "
@@ -5081,8 +5071,7 @@ msgid "Contrast Curve"
 msgstr "Contrast Curve"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr "Colour Mode"
 
@@ -5254,13 +5243,11 @@ msgstr "Black Level"
 msgid "White Balance Setting"
 msgstr "White Balance Setting"
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr "Red Balance"
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr "Blue Balance"
 
@@ -5608,11 +5595,21 @@ msgstr "3008x2008 or 3040x2024"
 msgid "Digital filter?"
 msgstr "Digital filter?"
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr "Internal error (unknown value %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Internal error (unknown value %hu %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Internal error (unknown value %i %i)"
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Internal error (unknown value %hi %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5815,5 +5812,5 @@ msgstr "Finer"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
-#~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr "Tag UserComment does not comply with standard but contains data."
+#~ msgid "FNumber"
+#~ msgstr "FNumber"
diff --git a/po/es.gmo b/po/es.gmo
deleted file mode 100644
index 9fa71fa..0000000
--- a/po/es.gmo
+++ /dev/null
diff --git a/po/es.po b/po/es.po
index 4fedc7b..3900868 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,21 +1,21 @@
-# libexif Spanish Translation.
-# Copyright:
-#   Free Software Foundation, Inc., 2002
-#   Fabian Mandelbaum <fabman@mandrakesoft.com>, 2002
+# Spanish translation for libexif.
 # This file is distributed under the same license as the libexif package.
-#
+# Copyright © 2002-2015 Free Software Foundation, Inc.
+# Fabian Mandelbaum <fabman@mandrakesoft.com>, 2002
+# Antonio Ceballos <aceballos@gmail.com>, 2014, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif\n"
+"Project-Id-Version: libexif 0.6.22-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\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"
+"POT-Creation-Date: 2016-09-02 00:46+0200\n"
+"PO-Revision-Date: 2016-09-27 08:20+0200\n"
+"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
+"Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -67,21 +67,20 @@ msgstr "Normal"
 
 #: libexif/canon/mnote-canon-entry.c:78
 msgid "Economy"
-msgstr ""
+msgstr "Económico"
 
 #: libexif/canon/mnote-canon-entry.c:80
-#, fuzzy
 msgid "Fine"
-msgstr "pulg"
+msgstr "Fino"
 
 #: libexif/canon/mnote-canon-entry.c:81 libexif/fuji/mnote-fuji-entry.c:178
 #: libexif/pentax/mnote-pentax-entry.c:141
 msgid "RAW"
-msgstr ""
+msgstr "Sin modificación"
 
 #: libexif/canon/mnote-canon-entry.c:82
 msgid "Superfine"
-msgstr ""
+msgstr "Superfino"
 
 #: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
@@ -99,7 +98,7 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
-msgstr ""
+msgstr "Apagada"
 
 #: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
 #: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
@@ -119,7 +118,7 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:245
 #: libexif/pentax/mnote-pentax-entry.c:290
 msgid "Auto"
-msgstr ""
+msgstr "Automático"
 
 #: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
 #: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
@@ -132,150 +131,142 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
-msgstr ""
+msgstr "Encendida"
 
 #: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
 #: libexif/olympus/mnote-olympus-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:94
-#, fuzzy
 msgid "Red-eye reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Modo de reducción de ojos rojos."
 
 #: libexif/canon/mnote-canon-entry.c:87
 msgid "Slow synchro"
-msgstr ""
+msgstr "Sincronización lenta"
 
 #: libexif/canon/mnote-canon-entry.c:88
-#, fuzzy
 msgid "Auto, red-eye reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Automático, modo de reducción de ojos rojos."
 
 #: libexif/canon/mnote-canon-entry.c:89
 #: libexif/pentax/mnote-pentax-entry.c:200
-#, fuzzy
 msgid "On, red-eye reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Encendida, modo de reducción de ojos rojos."
 
 #: libexif/canon/mnote-canon-entry.c:90
-#, fuzzy
 msgid "External flash"
-msgstr "Flash"
+msgstr "Flash externo"
 
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
 #: libexif/canon/mnote-canon-entry.c:297
 msgid "Single"
-msgstr ""
+msgstr "Uno"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
 #: libexif/canon/mnote-canon-entry.c:298
 msgid "Continuous"
-msgstr ""
+msgstr "Continuo"
 
 #: libexif/canon/mnote-canon-entry.c:93
 msgid "Movie"
-msgstr ""
+msgstr "Película"
 
 #: libexif/canon/mnote-canon-entry.c:94
 msgid "Continuous, speed priority"
-msgstr ""
+msgstr "Continuo, prioridad en velocidad"
 
 #: libexif/canon/mnote-canon-entry.c:95
 msgid "Continuous, low"
-msgstr ""
+msgstr "Continuo, bajo"
 
 #: libexif/canon/mnote-canon-entry.c:96
 msgid "Continuous, high"
-msgstr ""
+msgstr "Continuo, alto"
 
 #: libexif/canon/mnote-canon-entry.c:97
 msgid "One-shot AF"
-msgstr ""
+msgstr "Autofoco de un solo disparo"
 
 #: libexif/canon/mnote-canon-entry.c:98
 msgid "AI servo AF"
-msgstr ""
+msgstr "AF servo IA"
 
 #: libexif/canon/mnote-canon-entry.c:99
 msgid "AI focus AF"
-msgstr ""
+msgstr "AF foco IA"
 
 #: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103
-#, fuzzy
 msgid "Manual focus"
-msgstr "Exposición manual"
+msgstr "Enfoque manual"
 
 #: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:132
 #: libexif/canon/mnote-canon-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:212
-#, fuzzy
 msgid "Pan focus"
-msgstr "Exposición manual"
+msgstr "Foco fijo"
 
 #: libexif/canon/mnote-canon-entry.c:105
 msgid "JPEG"
-msgstr ""
+msgstr "JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:106
 msgid "CRW+THM"
-msgstr ""
+msgstr "CRW+THM"
 
 #: libexif/canon/mnote-canon-entry.c:107
 msgid "AVI+THM"
-msgstr ""
+msgstr "AVI+THM"
 
 #: libexif/canon/mnote-canon-entry.c:108
 msgid "TIF"
-msgstr ""
+msgstr "TIF"
 
 #: libexif/canon/mnote-canon-entry.c:109
 msgid "TIF+JPEG"
-msgstr ""
+msgstr "TIF+JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:110
 msgid "CR2"
-msgstr ""
+msgstr "CR2"
 
 #: libexif/canon/mnote-canon-entry.c:111
 msgid "CR2+JPEG"
-msgstr ""
+msgstr "CR2+JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:112
-#, fuzzy
 msgid "Large"
-msgstr "promedio"
+msgstr "Grande"
 
 #: libexif/canon/mnote-canon-entry.c:113
 msgid "Medium"
-msgstr ""
+msgstr "Medio"
 
 #: libexif/canon/mnote-canon-entry.c:114
 msgid "Small"
-msgstr ""
+msgstr "Pequeño"
 
 #: libexif/canon/mnote-canon-entry.c:115
 msgid "Medium 1"
-msgstr ""
+msgstr "Medio 1"
 
 #: libexif/canon/mnote-canon-entry.c:116
 msgid "Medium 2"
-msgstr ""
+msgstr "Medio 2"
 
 #: libexif/canon/mnote-canon-entry.c:117
 msgid "Medium 3"
-msgstr ""
+msgstr "Medio 3"
 
 #: libexif/canon/mnote-canon-entry.c:118
 msgid "Postcard"
-msgstr ""
+msgstr "Postal"
 
 #: libexif/canon/mnote-canon-entry.c:119
 msgid "Widescreen"
-msgstr ""
+msgstr "Pantalla ancha"
 
 #: libexif/canon/mnote-canon-entry.c:120
-#, fuzzy
 msgid "Full auto"
-msgstr "acción"
+msgstr "Automático"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
@@ -300,29 +291,26 @@ msgid "Landscape"
 msgstr "Paisaje"
 
 #: libexif/canon/mnote-canon-entry.c:123
-#, fuzzy
 msgid "Fast shutter"
-msgstr "obturador"
+msgstr "Obturador rápido"
 
 #: libexif/canon/mnote-canon-entry.c:124
-#, fuzzy
 msgid "Slow shutter"
-msgstr "obturador"
+msgstr "Obturador lento"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
 #: libexif/olympus/mnote-olympus-entry.c:257
-#, fuzzy
 msgid "Night"
-msgstr "Escena nocturna"
+msgstr "Noche"
 
 #: libexif/canon/mnote-canon-entry.c:126
 msgid "Grayscale"
-msgstr ""
+msgstr "Escala de grises"
 
 #: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
 #: libexif/pentax/mnote-pentax-entry.c:128
 msgid "Sepia"
-msgstr ""
+msgstr "Sepia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
 #: libexif/exif-entry.c:691 libexif/exif-entry.c:773
@@ -334,111 +322,102 @@ msgid "Portrait"
 msgstr "Retrato"
 
 #: libexif/canon/mnote-canon-entry.c:129 libexif/fuji/mnote-fuji-entry.c:122
-#, fuzzy
 msgid "Sports"
-msgstr "Lugar"
+msgstr "Deportes"
 
 #: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
 #: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
 #: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
 msgid "Black & white"
-msgstr ""
+msgstr "Blanco y negro"
 
 #: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
 msgid "Vivid"
-msgstr ""
+msgstr "Vívido"
 
 #: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
 #: libexif/canon/mnote-canon-entry.c:434
-#, fuzzy
 msgid "Neutral"
-msgstr "Normal"
+msgstr "Neutro"
 
 #: libexif/canon/mnote-canon-entry.c:135
 #: libexif/pentax/mnote-pentax-entry.c:93
-#, fuzzy
 msgid "Flash off"
-msgstr "Flash"
+msgstr "Flash apagado"
 
 #: libexif/canon/mnote-canon-entry.c:136
-#, fuzzy
 msgid "Long shutter"
-msgstr "obturador"
+msgstr "Obturador largo"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
 #: libexif/olympus/mnote-olympus-entry.c:174
 msgid "Super macro"
-msgstr ""
+msgstr "Supermacro"
 
 #: libexif/canon/mnote-canon-entry.c:138
 msgid "Foliage"
-msgstr ""
+msgstr "follaje"
 
 #: libexif/canon/mnote-canon-entry.c:139
 msgid "Indoor"
-msgstr ""
+msgstr "Interior"
 
 #: libexif/canon/mnote-canon-entry.c:140 libexif/fuji/mnote-fuji-entry.c:135
 #: libexif/pentax/mnote-pentax-entry.c:175
 msgid "Fireworks"
-msgstr ""
+msgstr "Fuegos artificiales"
 
 #: libexif/canon/mnote-canon-entry.c:141 libexif/fuji/mnote-fuji-entry.c:133
 msgid "Beach"
-msgstr ""
+msgstr "Playa"
 
 #: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
 #: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
-#, fuzzy
 msgid "Underwater"
-msgstr "Tiempo bueno"
+msgstr "Bajo el agua"
 
 #: libexif/canon/mnote-canon-entry.c:143 libexif/fuji/mnote-fuji-entry.c:134
 msgid "Snow"
-msgstr ""
+msgstr "Nieve"
 
 #: libexif/canon/mnote-canon-entry.c:144
 msgid "Kids & pets"
-msgstr ""
+msgstr "Niños y animales domésticos"
 
 #: libexif/canon/mnote-canon-entry.c:145
-#, fuzzy
 msgid "Night snapshot"
-msgstr "Escena nocturna"
+msgstr "Instantánea nocturna"
 
 #: libexif/canon/mnote-canon-entry.c:146
-#, fuzzy
 msgid "Digital macro"
-msgstr "Relación de zoom digital"
+msgstr "Macro digital"
 
 #: libexif/canon/mnote-canon-entry.c:147
 msgid "My colors"
-msgstr ""
+msgstr "Mis colores"
 
 #: libexif/canon/mnote-canon-entry.c:148
 msgid "Still image"
-msgstr ""
+msgstr "Instantánea"
 
 #: libexif/canon/mnote-canon-entry.c:149
-#, fuzzy
 msgid "Color accent"
-msgstr "Espacio de color"
+msgstr "Acento de color"
 
 #: libexif/canon/mnote-canon-entry.c:150
-#, fuzzy
 msgid "Color swap"
-msgstr "Espacio de color"
+msgstr "Intercambio de color"
 
 #: libexif/canon/mnote-canon-entry.c:151
 msgid "Aquarium"
-msgstr ""
+msgstr "Acuario"
 
 #: libexif/canon/mnote-canon-entry.c:152
 msgid "ISO 3200"
-msgstr ""
+msgstr "ISO 3200"
 
 #: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
@@ -447,15 +426,15 @@ msgstr ""
 #: libexif/olympus/mnote-olympus-entry.c:457
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #: libexif/canon/mnote-canon-entry.c:154
 msgid "2x"
-msgstr ""
+msgstr "2x"
 
 #: libexif/canon/mnote-canon-entry.c:155
 msgid "4x"
-msgstr ""
+msgstr "4x"
 
 #: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
 #: libexif/exif-entry.c:752
@@ -467,46 +446,46 @@ msgstr "Otro"
 #: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
 #: libexif/pentax/mnote-pentax-entry.c:117
 msgid "High"
-msgstr ""
+msgstr "Alto"
 
 #: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
 #: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
 #: libexif/pentax/mnote-pentax-entry.c:111
 #: libexif/pentax/mnote-pentax-entry.c:116
 msgid "Low"
-msgstr ""
+msgstr "Bajo"
 
 #: libexif/canon/mnote-canon-entry.c:166
 msgid "Auto high"
-msgstr ""
+msgstr "Alto automático"
 
 #: libexif/canon/mnote-canon-entry.c:168
 msgid "50"
-msgstr ""
+msgstr "50"
 
 #: libexif/canon/mnote-canon-entry.c:169
 #: libexif/pentax/mnote-pentax-entry.c:120
 #: libexif/pentax/mnote-pentax-entry.c:122
 msgid "100"
-msgstr ""
+msgstr "100"
 
 #: libexif/canon/mnote-canon-entry.c:170
 #: libexif/pentax/mnote-pentax-entry.c:121
 #: libexif/pentax/mnote-pentax-entry.c:123
 msgid "200"
-msgstr ""
+msgstr "200"
 
 #: libexif/canon/mnote-canon-entry.c:171
 msgid "400"
-msgstr ""
+msgstr "400"
 
 #: libexif/canon/mnote-canon-entry.c:172
 msgid "800"
-msgstr ""
+msgstr "800"
 
 #: libexif/canon/mnote-canon-entry.c:173
 msgid "Default"
-msgstr ""
+msgstr "Predefinido"
 
 #: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
 msgid "Spot"
@@ -518,562 +497,546 @@ msgstr "Promedio"
 
 #: libexif/canon/mnote-canon-entry.c:176
 msgid "Evaluative"
-msgstr ""
+msgstr "Evaluativo"
 
 #: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
 msgid "Partial"
 msgstr "Parcial"
 
 #: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
-#, fuzzy
 msgid "Center-weighted average"
-msgstr "Promedio Ponderado en el Centro"
+msgstr "Promedio ponderado en el Centro"
 
 #: libexif/canon/mnote-canon-entry.c:181
-#, fuzzy
 msgid "Not known"
-msgstr "Desconocido"
+msgstr "No conocido"
 
 #: libexif/canon/mnote-canon-entry.c:183
-#, fuzzy
 msgid "Very close"
-msgstr "co-situado"
+msgstr "Muy cerca"
 
 #: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
-#, fuzzy
 msgid "Close"
-msgstr "co-situado"
+msgstr "Cerca"
 
 #: libexif/canon/mnote-canon-entry.c:185
 msgid "Middle range"
-msgstr ""
+msgstr "Media distancia"
 
 #: libexif/canon/mnote-canon-entry.c:186
-#, fuzzy
 msgid "Far range"
-msgstr "Rango de transferencia"
+msgstr "Larga distancia"
 
 #: libexif/canon/mnote-canon-entry.c:189
 #: libexif/pentax/mnote-pentax-entry.c:210
 msgid "Infinity"
-msgstr ""
+msgstr "Infinito"
 
 #: libexif/canon/mnote-canon-entry.c:190
-#, fuzzy
 msgid "Manual AF point selection"
-msgstr "Balance de blanco manual"
+msgstr "Selección del punto de autofoco manual"
 
 #: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
 msgid "None (MF)"
-msgstr ""
+msgstr "Ninguno (MF)"
 
 #: libexif/canon/mnote-canon-entry.c:192
 msgid "Auto-selected"
-msgstr ""
+msgstr "Seleccionado automáticamente"
 
 #: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:224
 #: libexif/pentax/mnote-pentax-entry.c:238
-#, fuzzy
 msgid "Right"
-msgstr "Luz de día"
+msgstr "Derecha"
 
 #: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
-#, fuzzy
 msgid "Center"
-msgstr "Centrado"
+msgstr "Centro"
 
 #: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
 #: libexif/pentax/mnote-pentax-entry.c:220
 #: libexif/pentax/mnote-pentax-entry.c:236
 msgid "Left"
-msgstr ""
+msgstr "Izquierda"
 
 #: libexif/canon/mnote-canon-entry.c:196
 msgid "Auto AF point selection"
-msgstr ""
+msgstr "Selección del punto de autofoco automática"
 
 #: libexif/canon/mnote-canon-entry.c:197
 msgid "Easy shooting"
-msgstr ""
+msgstr "Disparo fácil"
 
 #: libexif/canon/mnote-canon-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:163
 msgid "Program"
-msgstr ""
+msgstr "Programa"
 
 #: libexif/canon/mnote-canon-entry.c:199
 msgid "Tv-priority"
-msgstr ""
+msgstr "Prioridad al obturador"
 
 #: libexif/canon/mnote-canon-entry.c:200
-#, fuzzy
 msgid "Av-priority"
-msgstr "Prioridad de apertura"
+msgstr "Prioridad a la apertura"
 
 #: libexif/canon/mnote-canon-entry.c:202
 msgid "A-DEP"
-msgstr ""
+msgstr "Profundidad de campo automática"
 
 #: libexif/canon/mnote-canon-entry.c:203
 msgid "M-DEP"
-msgstr ""
+msgstr "Profundidad de campo manual"
 
 #: libexif/canon/mnote-canon-entry.c:204
 msgid "Canon EF 50mm f/1.8"
-msgstr ""
+msgstr "Canon EF 50mm f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:205
 msgid "Canon EF 28mm f/2.8"
-msgstr ""
+msgstr "Canon EF 28mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:206
 msgid "Sigma UC Zoom 35-135mm f/4-5.6"
-msgstr ""
+msgstr "Sigma UC Zoom 35-135mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:207
 msgid "Tokina AF193-2 19-35mm f/3.5-4.5"
-msgstr ""
+msgstr "Tokina AF193-2 19-35mm f/3.5-4.5"
 
 #: libexif/canon/mnote-canon-entry.c:208
 msgid "Canon EF 100-300mm F5.6L"
-msgstr ""
+msgstr "Canon EF 100-300mm F5.6L"
 
 #: libexif/canon/mnote-canon-entry.c:209
 msgid "Sigma 50mm f/2.8 EX or 28mm f/1.8"
-msgstr ""
+msgstr "Sigma 50mm f/2.8 EX o 28mm f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:210
 msgid "Canon EF 35mm f/2"
-msgstr ""
+msgstr "Canon EF 35mm f/2"
 
 #: libexif/canon/mnote-canon-entry.c:211
 msgid "Canon EF 15mm f/2.8"
-msgstr ""
+msgstr "Canon EF 15mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:212
 msgid "Canon EF 80-200mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 80-200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:213
 msgid "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
-msgstr ""
+msgstr "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
 
 #: libexif/canon/mnote-canon-entry.c:214
 msgid "Cosina 100mm f/3.5 Macro AF"
-msgstr ""
+msgstr "Cosina 100mm f/3.5 Macro AF"
 
 #: libexif/canon/mnote-canon-entry.c:215
 msgid "Tamron AF Aspherical 28-200mm f/3.8-5.6"
-msgstr ""
+msgstr "Tamron AF Aspherical 28-200mm f/3.8-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:216
 msgid "Canon EF 50mm f/1.8 MkII"
-msgstr ""
+msgstr "Canon EF 50mm f/1.8 MkII"
 
 #: libexif/canon/mnote-canon-entry.c:217
 msgid "Tamron SP AF 300mm f/2.8 LD IF"
-msgstr ""
+msgstr "Tamron SP AF 300mm f/2.8 LD IF"
 
 #: libexif/canon/mnote-canon-entry.c:218
 msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
-msgstr ""
+msgstr "Canon EF 24mm f/2.8 o Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 75-300mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:221
 msgid "Canon EF 28-80mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF 28-80mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF 28-105mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 28-105mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
-msgstr ""
+msgstr "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 
 #: libexif/canon/mnote-canon-entry.c:226
 msgid "Canon TS-E 24mm f/3.5L"
-msgstr ""
+msgstr "Canon TS-E 24mm f/3.5L"
 
 #: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon TS-E 45mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 45mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:228
 msgid "Canon TS-E 90mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 90mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 50mm f/1.0L"
-msgstr ""
+msgstr "Canon EF 50mm f/1.0L"
 
 #: libexif/canon/mnote-canon-entry.c:230
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
-msgstr ""
+msgstr "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 
 #: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 600mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 600mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 200mm f/1.8L"
-msgstr ""
+msgstr "Canon EF 200mm f/1.8L"
 
 #: libexif/canon/mnote-canon-entry.c:233
 msgid "Canon EF 300mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 300mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 85mm f/1.2L"
-msgstr ""
+msgstr "Canon EF 85mm f/1.2L"
 
 #: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 400mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 400mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:236
 msgid "Canon EF 500mm f/4.5L"
-msgstr ""
+msgstr "Canon EF 500mm f/4.5L"
 
 #: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 300mm f/2.8L IS"
-msgstr ""
+msgstr "Canon EF 300mm f/2.8L IS"
 
 #: libexif/canon/mnote-canon-entry.c:238
 msgid "Canon EF 500mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 500mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 100mm f/2"
-msgstr ""
+msgstr "Canon EF 100mm f/2"
 
 #: libexif/canon/mnote-canon-entry.c:240
 msgid "Sigma 20mm EX f/1.8"
-msgstr ""
+msgstr "Sigma 20mm EX f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:241
 msgid "Canon EF 200mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:242
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
-msgstr ""
+msgstr "Sigma 10-20mm F4-5.6 o 12-24mm f/4.5-5.6 o 14mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 35-350mm f/3.5-5.6L"
-msgstr ""
+msgstr "Canon EF 35-350mm f/3.5-5.6L"
 
 #: libexif/canon/mnote-canon-entry.c:244
 msgid "Canon EF 85mm f/1.8 USM"
-msgstr ""
+msgstr "Canon EF 85mm f/1.8 USM"
 
 #: libexif/canon/mnote-canon-entry.c:245
 msgid "Canon EF 28-105mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 28-105mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:246
 msgid "Canon EF 20-35mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 20-35mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:247
 msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
-msgstr ""
+msgstr "Canon EF 28-70mm f/2.8L o Sigma 24-70mm EX f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:248
 msgid "Canon EF 70-200mm f/2.8 L"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L"
 
 #: libexif/canon/mnote-canon-entry.c:249
 msgid "Canon EF 70-200mm f/2.8 L + x1.4"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:250
 msgid "Canon EF 70-200mm f/2.8 L + x2"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 28mm f/1.8 USM"
-msgstr ""
+msgstr "Canon EF 28mm f/1.8 USM"
 
 #: libexif/canon/mnote-canon-entry.c:252
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
-msgstr ""
+msgstr "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
 
 #: libexif/canon/mnote-canon-entry.c:253
 msgid "Canon EF 200mm f/2.8L II"
-msgstr ""
+msgstr "Canon EF 200mm f/2.8L II"
 
 #: libexif/canon/mnote-canon-entry.c:254
 msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
-msgstr ""
+msgstr "Canon EF 180mm Macro f/3.5L o Sigma 180mm EX HSM Macro f/3.5"
 
 #: libexif/canon/mnote-canon-entry.c:255
 msgid "Canon EF 135mm f/2L"
-msgstr ""
+msgstr "Canon EF 135mm f/2L"
 
 #: libexif/canon/mnote-canon-entry.c:256
 msgid "Canon EF 24-85mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 24-85mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:257
 msgid "Canon EF 300mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 300mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:258
 msgid "Canon EF 28-135mm f/3.5-5.6 IS"
-msgstr ""
+msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
 
 #: libexif/canon/mnote-canon-entry.c:259
 msgid "Canon EF 35mm f/1.4L"
-msgstr ""
+msgstr "Canon EF 35mm f/1.4L"
 
 #: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 
 #: libexif/canon/mnote-canon-entry.c:262
 msgid "Canon EF 100-400mm f/4.5-5.6L IS"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
 
 #: libexif/canon/mnote-canon-entry.c:263
 msgid "Canon EF 400mm f/2.8L + x2"
-msgstr ""
+msgstr "Canon EF 400mm f/2.8L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:264
 msgid "Canon EF 70-200mm f/4L"
-msgstr ""
+msgstr "Canon EF 70-200mm f/4L"
 
 #: libexif/canon/mnote-canon-entry.c:265
 msgid "Canon EF 100mm f/2.8 Macro"
-msgstr ""
+msgstr "Canon EF 100mm f/2.8 Macro"
 
 #: libexif/canon/mnote-canon-entry.c:266
 msgid "Canon EF 400mm f/4 DO IS"
-msgstr ""
+msgstr "Canon EF 400mm f/4 DO IS"
 
 #: libexif/canon/mnote-canon-entry.c:267
 msgid "Canon EF 75-300mm f/4-5.6 IS"
-msgstr ""
+msgstr "Canon EF 75-300mm f/4-5.6 IS"
 
 #: libexif/canon/mnote-canon-entry.c:268
 msgid "Canon EF 50mm f/1.4"
-msgstr ""
+msgstr "Canon EF 50mm f/1.4"
 
 #: libexif/canon/mnote-canon-entry.c:269
 msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
-msgstr ""
+msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
 #: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF 28-200mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF 28-200mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 90-300mm f/4.5-5.6"
-msgstr ""
+msgstr "Canon EF 90-300mm f/4.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
 #: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 16-35mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 16-35mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:277
 msgid "Canon EF 24-70mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 24-70mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:278
 msgid "Canon EF 17-40mm f/4L"
-msgstr ""
+msgstr "Canon EF 17-40mm f/4L"
 
 #: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF-S60mm F2.8 Macro USM"
-msgstr ""
+msgstr "Canon EF-S60mm F2.8 Macro USM"
 
 #: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 24-105mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 24-105mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:285
 msgid "Canon EF 50mm F1.2L USM"
-msgstr ""
+msgstr "Canon EF 50mm F1.2L USM"
 
 #: libexif/canon/mnote-canon-entry.c:286
 msgid "Canon EF 70-200mm f/4L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
-msgstr ""
+msgstr "TTL"
 
 #: libexif/canon/mnote-canon-entry.c:290
 msgid "A-TTL"
-msgstr ""
+msgstr "A-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:291
 msgid "E-TTL"
-msgstr ""
+msgstr "E-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:292
 msgid "FP sync enabled"
-msgstr ""
+msgstr "Sincronismo FP activado"
 
 #: libexif/canon/mnote-canon-entry.c:293
 msgid "2nd-curtain sync used"
-msgstr ""
+msgstr "Sincronismo de 2a. cortina utilizado"
 
 #: libexif/canon/mnote-canon-entry.c:294
 msgid "FP sync used"
-msgstr ""
+msgstr "Sincronismo FP utilizado"
 
 #: libexif/canon/mnote-canon-entry.c:295
 #: libexif/olympus/mnote-olympus-entry.c:193
 msgid "Internal"
-msgstr ""
+msgstr "Interno"
 
 #: libexif/canon/mnote-canon-entry.c:296
 #: libexif/olympus/mnote-olympus-entry.c:194
 msgid "External"
-msgstr ""
+msgstr "Externo"
 
 #: libexif/canon/mnote-canon-entry.c:299
-#, fuzzy
 msgid "Normal AE"
-msgstr "Normal"
+msgstr "AE normal"
 
 #: libexif/canon/mnote-canon-entry.c:300
-#, fuzzy
 msgid "Exposure compensation"
-msgstr "Tiempo de exposición"
+msgstr "Compensación de la exposición"
 
 #: libexif/canon/mnote-canon-entry.c:301
 msgid "AE lock"
-msgstr ""
+msgstr "Bloqueo de AE"
 
 #: libexif/canon/mnote-canon-entry.c:302
-#, fuzzy
 msgid "AE lock + exposure compensation"
-msgstr "Tiempo de exposición"
+msgstr "Bloqueo de AE + compensación de la exposición"
 
 #: libexif/canon/mnote-canon-entry.c:303
 msgid "No AE"
-msgstr ""
+msgstr "Sin AE"
 
 #: libexif/canon/mnote-canon-entry.c:306
 msgid "On, shot only"
-msgstr ""
+msgstr "Encendido, solo disparo"
 
 #: libexif/canon/mnote-canon-entry.c:310
 msgid "Smooth"
-msgstr ""
+msgstr "Suave"
 
 #: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
 #: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
 #: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
-#, fuzzy
 msgid "Custom"
-msgstr "Proceso personalizado"
+msgstr "Personalizado"
 
 #: libexif/canon/mnote-canon-entry.c:314
 msgid "My color data"
-msgstr ""
+msgstr "Datos de mis colores"
 
 #: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
 #: libexif/pentax/mnote-pentax-entry.c:126
 #: libexif/pentax/mnote-pentax-entry.c:145
 msgid "Full"
-msgstr ""
+msgstr "Lleno"
 
 #: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
 msgid "2/3"
-msgstr ""
+msgstr "2/3"
 
 #: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
 msgid "1/3"
-msgstr ""
+msgstr "1/3"
 
 #: libexif/canon/mnote-canon-entry.c:324
 msgid "Fixed"
-msgstr ""
+msgstr "Fijo"
 
 #: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
 msgid "Zoom"
-msgstr ""
+msgstr "Zoom"
 
 #: libexif/canon/mnote-canon-entry.c:332
-#, fuzzy
 msgid "Sunny"
-msgstr "soleado"
+msgstr "Soleado"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
 #: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
-#, fuzzy
 msgid "Cloudy"
-msgstr "nublado"
+msgstr "Nublado"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
 #: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
-#, fuzzy
 msgid "Tungsten"
-msgstr "tungsteno"
+msgstr "Tungsteno"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
 #: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
@@ -1095,35 +1058,33 @@ msgstr "Sombra"
 
 #: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "Manual temperature (Kelvin)"
-msgstr ""
+msgstr "Temperatura manual (Kelvin)"
 
 #: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
 msgid "PC set 1"
-msgstr ""
+msgstr "PC set 1"
 
 #: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "PC set 2"
-msgstr ""
+msgstr "PC set 2"
 
 #: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "PC set 3"
-msgstr ""
+msgstr "PC set 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
 #: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
-msgstr "Luz de día fluorescente"
+msgstr "Fluorescente de luz diurna"
 
 #: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
-#, fuzzy
 msgid "Custom 1"
-msgstr "Proceso personalizado"
+msgstr "Personalizado 1"
 
 #: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
-#, fuzzy
 msgid "Custom 2"
-msgstr "Proceso personalizado"
+msgstr "Personalizado 2"
 
 #: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
 #: libexif/pentax/mnote-pentax-entry.c:78
@@ -1134,91 +1095,84 @@ msgid "Night scene"
 msgstr "Escena nocturna"
 
 #: libexif/canon/mnote-canon-entry.c:355
-#, fuzzy
 msgid "Center-right"
-msgstr "peso centrado"
+msgstr "Centro-derecha"
 
 #: libexif/canon/mnote-canon-entry.c:357
-#, fuzzy
 msgid "Left-right"
-msgstr "abajo - derecha"
+msgstr "Izquierda-derecha"
 
 #: libexif/canon/mnote-canon-entry.c:358
-#, fuzzy
 msgid "Left-center"
-msgstr "abajo centrado"
+msgstr "Izquierda-centro"
 
 #: libexif/canon/mnote-canon-entry.c:359
 msgid "All"
-msgstr ""
+msgstr "Todo"
 
 #: libexif/canon/mnote-canon-entry.c:361
 msgid "On (shot 1)"
-msgstr ""
+msgstr "Encendido (disparo 1)"
 
 #: libexif/canon/mnote-canon-entry.c:362
 msgid "On (shot 2)"
-msgstr ""
+msgstr "Encendido (disparo 3)"
 
 #: libexif/canon/mnote-canon-entry.c:363
 msgid "On (shot 3)"
-msgstr ""
+msgstr "Encendido (disparo 3)"
 
 #: libexif/canon/mnote-canon-entry.c:365
 msgid "EOS high-end"
-msgstr ""
+msgstr "EOS de lujo"
 
 #: libexif/canon/mnote-canon-entry.c:366
 msgid "Compact"
-msgstr ""
+msgstr "Compacto"
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
-msgstr ""
+msgstr "EOS de medio alcance"
 
 #: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotate 90 CW"
-msgstr ""
+msgstr "Girar 90 en sentido horario"
 
 #: libexif/canon/mnote-canon-entry.c:370
 msgid "Rotate 180"
-msgstr ""
+msgstr "Girar 180"
 
 #: libexif/canon/mnote-canon-entry.c:371
 msgid "Rotate 270 CW"
-msgstr ""
+msgstr "Girar 270 en sentido horario"
 
 #: libexif/canon/mnote-canon-entry.c:372
 msgid "Rotated by software"
-msgstr ""
+msgstr "Girado por software"
 
 #: libexif/canon/mnote-canon-entry.c:384
 #: libexif/olympus/mnote-olympus-entry.c:612
-#, fuzzy
 msgid "Left to right"
-msgstr "abajo - derecha"
+msgstr "De izquierda a derecha"
 
 #: libexif/canon/mnote-canon-entry.c:385
 #: libexif/olympus/mnote-olympus-entry.c:615
-#, fuzzy
 msgid "Right to left"
-msgstr "derecha - arriba"
+msgstr "De derecha a arriba"
 
 #: libexif/canon/mnote-canon-entry.c:386
 #: libexif/olympus/mnote-olympus-entry.c:618
-#, fuzzy
 msgid "Bottom to top"
-msgstr "abajo - izquierda"
+msgstr "De abajo arriba"
 
 #: libexif/canon/mnote-canon-entry.c:387
 #: libexif/olympus/mnote-olympus-entry.c:621
-#, fuzzy
 msgid "Top to bottom"
-msgstr "izquierda - abajo"
+msgstr "De arriba abajo"
 
 #: libexif/canon/mnote-canon-entry.c:388
 msgid "2x2 matrix (clockwise)"
-msgstr ""
+msgstr "Matrix 2x2 (sentido horario)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
@@ -1230,17 +1184,15 @@ msgstr "Estándar"
 
 #: libexif/canon/mnote-canon-entry.c:397
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: libexif/canon/mnote-canon-entry.c:398
-#, fuzzy
 msgid "Lowest"
-msgstr "arriba - izquierda"
+msgstr "El más bajo"
 
 #: libexif/canon/mnote-canon-entry.c:402
-#, fuzzy
 msgid "Highest"
-msgstr "Escena nocturna"
+msgstr "El más alto"
 
 #: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
 #: libexif/fuji/mnote-fuji-entry.c:74
@@ -1248,88 +1200,85 @@ msgstr "Escena nocturna"
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
-msgstr "Luz de día"
+msgstr "Luz diurna"
 
 #: libexif/canon/mnote-canon-entry.c:422
 msgid "Set 1"
-msgstr ""
+msgstr "Configuración 1"
 
 #: libexif/canon/mnote-canon-entry.c:423
 msgid "Set 2"
-msgstr ""
+msgstr "Configuración 2"
 
 #: libexif/canon/mnote-canon-entry.c:424
 msgid "Set 3"
-msgstr ""
+msgstr "Configuración 3"
 
 #: libexif/canon/mnote-canon-entry.c:425
 msgid "User def. 1"
-msgstr ""
+msgstr "Definido por el usuario 1"
 
 #: libexif/canon/mnote-canon-entry.c:426
 msgid "User def. 2"
-msgstr ""
+msgstr "Definido por el usuario 2"
 
 #: libexif/canon/mnote-canon-entry.c:427
 msgid "User def. 3"
-msgstr ""
+msgstr "Definido por el usuario 3"
 
 #: libexif/canon/mnote-canon-entry.c:428
-#, fuzzy
 msgid "External 1"
-msgstr "Flash"
+msgstr "Externo 1"
 
 #: libexif/canon/mnote-canon-entry.c:429
-#, fuzzy
 msgid "External 2"
-msgstr "Flash"
+msgstr "Externo 2"
 
 #: libexif/canon/mnote-canon-entry.c:430
-#, fuzzy
 msgid "External 3"
-msgstr "Flash"
+msgstr "Externo 3"
 
 #: libexif/canon/mnote-canon-entry.c:435
 msgid "Faithful"
-msgstr ""
+msgstr "Fiel"
 
 #: libexif/canon/mnote-canon-entry.c:436
 #: libexif/olympus/mnote-olympus-entry.c:118
 msgid "Monochrome"
-msgstr ""
+msgstr "Monocromático"
 
 #: libexif/canon/mnote-canon-entry.c:494
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
 #, c-format
 msgid "%i (ms)"
-msgstr ""
+msgstr "%i (ms)"
 
 #: libexif/canon/mnote-canon-entry.c:624
 #, c-format
 msgid "%.2f mm"
-msgstr ""
+msgstr "%.2f mm"
 
 #: libexif/canon/mnote-canon-entry.c:648
 #, c-format
 msgid "%.2f EV"
-msgstr ""
+msgstr "%.2f EV"
 
 #: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
 #, c-format
 msgid "1/%i"
-msgstr ""
+msgstr "1/%i"
 
 #: libexif/canon/mnote-canon-entry.c:670
 #, c-format
 msgid "%u mm"
-msgstr ""
+msgstr "%u mm"
 
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
-msgstr ""
+msgstr "Configuración (primera parte)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
 #: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
@@ -1338,7 +1287,7 @@ msgstr "Distancia focal"
 
 #: libexif/canon/mnote-canon-tag.c:37
 msgid "Settings (Second Part)"
-msgstr ""
+msgstr "Configuración (segunda parte)"
 
 #: libexif/canon/mnote-canon-tag.c:38
 #: libexif/olympus/mnote-olympus-entry.c:601
@@ -1347,72 +1296,63 @@ msgid "Panorama"
 msgstr "Panorama"
 
 #: libexif/canon/mnote-canon-tag.c:39
-#, fuzzy
 msgid "Image Type"
-msgstr "Ancho de la imagen"
+msgstr "Tipo de imagen"
 
 #: libexif/canon/mnote-canon-tag.c:40 libexif/olympus/mnote-olympus-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:113
 msgid "Firmware Version"
-msgstr ""
+msgstr "Versión del «firmware»"
 
 #: libexif/canon/mnote-canon-tag.c:41
-#, fuzzy
 msgid "Image Number"
-msgstr "ID único de imagen"
+msgstr "Número de imagen"
 
 #: libexif/canon/mnote-canon-tag.c:42
-#, fuzzy
 msgid "Owner Name"
-msgstr "El número F."
+msgstr "Nombre del propietario"
 
 #: libexif/canon/mnote-canon-tag.c:43
-#, fuzzy
 msgid "Color Information"
-msgstr "Espacio de color"
+msgstr "Información de color"
 
 #: libexif/canon/mnote-canon-tag.c:44 libexif/fuji/mnote-fuji-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:81
 #: libexif/olympus/mnote-olympus-tag.c:146
-#, fuzzy
 msgid "Serial Number"
-msgstr "El número F."
+msgstr "Número de serie"
 
 #: libexif/canon/mnote-canon-tag.c:45
-#, fuzzy
 msgid "Custom Functions"
-msgstr "Proceso personalizado"
+msgstr "Funciones personalizadas"
 
 #: libexif/canon/mnote-canon-tag.c:56 libexif/fuji/mnote-fuji-tag.c:45
-#, fuzzy
 msgid "Macro Mode"
-msgstr "Macro"
+msgstr "Modo macro"
 
 #: libexif/canon/mnote-canon-tag.c:57 libexif/canon/mnote-canon-tag.c:117
 #: libexif/olympus/mnote-olympus-tag.c:175
 #: libexif/pentax/mnote-pentax-tag.c:128
 msgid "Self-timer"
-msgstr ""
+msgstr "Autotemporizador"
 
 #: libexif/canon/mnote-canon-tag.c:58 libexif/fuji/mnote-fuji-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:94
 #: libexif/olympus/mnote-olympus-tag.c:107
 msgid "Quality"
-msgstr ""
+msgstr "Calidad"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
 #: libexif/olympus/mnote-olympus-tag.c:127
 #: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
-#, fuzzy
 msgid "Flash Mode"
-msgstr "Flash"
+msgstr "Modo de flash"
 
 #: libexif/canon/mnote-canon-tag.c:60 libexif/pentax/mnote-pentax-tag.c:101
-#, fuzzy
 msgid "Drive Mode"
-msgstr "Modo de métrica"
+msgstr "Modo de avance"
 
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
@@ -1420,32 +1360,28 @@ msgstr "Modo de métrica"
 #: libexif/olympus/mnote-olympus-tag.c:173
 #: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
 #: libexif/pentax/mnote-pentax-tag.c:130
-#, fuzzy
 msgid "Focus Mode"
-msgstr "Modo de exposición"
+msgstr "Modo de enfoque"
 
 #: libexif/canon/mnote-canon-tag.c:62 libexif/pentax/mnote-pentax-tag.c:127
-#, fuzzy
 msgid "Record Mode"
-msgstr "Macro"
+msgstr "Modo de grabación"
 
 #: libexif/canon/mnote-canon-tag.c:63 libexif/pentax/mnote-pentax-tag.c:71
-#, fuzzy
 msgid "Image Size"
-msgstr "Ancho de la imagen"
+msgstr "Tamaño de la imagen"
 
 #: libexif/canon/mnote-canon-tag.c:64
 msgid "Easy Shooting Mode"
-msgstr ""
+msgstr "Modo de disparo fácil"
 
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
 #: libexif/olympus/mnote-olympus-tag.c:180
 #: libexif/pentax/mnote-pentax-tag.c:89
-#, fuzzy
 msgid "Digital Zoom"
-msgstr "Relación de zoom digital"
+msgstr "Zoom digital"
 
 #: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
@@ -1468,7 +1404,7 @@ msgstr "Nitidez"
 
 #: libexif/canon/mnote-canon-tag.c:69
 msgid "ISO"
-msgstr ""
+msgstr "ISO"
 
 #: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
 #: libexif/pentax/mnote-pentax-tag.c:82
@@ -1476,14 +1412,12 @@ msgid "Metering Mode"
 msgstr "Modo de métrica"
 
 #: libexif/canon/mnote-canon-tag.c:71 libexif/olympus/mnote-olympus-tag.c:133
-#, fuzzy
 msgid "Focus Range"
-msgstr "Modo de exposición"
+msgstr "Rango de enfoque"
 
 #: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
-#, fuzzy
 msgid "AF Point"
-msgstr "Modo de exposición"
+msgstr "Punto AF"
 
 #: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
 msgid "Exposure Mode"
@@ -1491,126 +1425,105 @@ msgstr "Modo de exposición"
 
 #: libexif/canon/mnote-canon-tag.c:74 libexif/olympus/mnote-olympus-tag.c:61
 #: libexif/pentax/mnote-pentax-tag.c:106
-#, fuzzy
 msgid "Lens Type"
-msgstr "Tipo de escena"
+msgstr "Tipo de lente"
 
 #: libexif/canon/mnote-canon-tag.c:75
-#, fuzzy
 msgid "Long Focal Length of Lens"
-msgstr "Distancia focal"
+msgstr "Distancia focal larga de la lente"
 
 #: libexif/canon/mnote-canon-tag.c:76
-#, fuzzy
 msgid "Short Focal Length of Lens"
-msgstr "Distancia focal"
+msgstr "Distancia focal corta de la lente"
 
 #: libexif/canon/mnote-canon-tag.c:77
-#, fuzzy
 msgid "Focal Units per mm"
-msgstr "Distancia focal"
+msgstr "Unidades focales por mm"
 
 #: libexif/canon/mnote-canon-tag.c:78
-#, fuzzy
 msgid "Maximal Aperture"
-msgstr "apertura"
+msgstr "Apertura máxima"
 
 #: libexif/canon/mnote-canon-tag.c:79
-#, fuzzy
 msgid "Minimal Aperture"
-msgstr "apertura"
+msgstr "Apertura mínima"
 
 #: libexif/canon/mnote-canon-tag.c:80
-#, fuzzy
 msgid "Flash Activity"
-msgstr "El flash disparó."
+msgstr "Actividad del flash"
 
 #: libexif/canon/mnote-canon-tag.c:81
-#, fuzzy
 msgid "Flash Details"
-msgstr "Flash"
+msgstr "Detalles del flash"
 
 #: libexif/canon/mnote-canon-tag.c:83
-#, fuzzy
 msgid "AE Setting"
-msgstr "Velocidad ISO"
+msgstr "Configuración AE"
 
 #: libexif/canon/mnote-canon-tag.c:84
-#, fuzzy
 msgid "Image Stabilization"
-msgstr "Descripción de la imagen"
+msgstr "Estabilización de la imagen"
 
 #: libexif/canon/mnote-canon-tag.c:85
-#, fuzzy
 msgid "Display Aperture"
-msgstr "apertura"
+msgstr "Apertura de visualización"
 
 #: libexif/canon/mnote-canon-tag.c:86
-#, fuzzy
 msgid "Zoom Source Width"
-msgstr "Ancho de la imagen"
+msgstr "Zoom de anchura de la fuente"
 
 #: libexif/canon/mnote-canon-tag.c:87
-#, fuzzy
 msgid "Zoom Target Width"
-msgstr "Ancho de la imagen"
+msgstr "Zoom de anchura del motivo"
 
 #: libexif/canon/mnote-canon-tag.c:88
 msgid "Photo Effect"
-msgstr ""
+msgstr "Efecto foto"
 
 #: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
 msgid "Manual Flash Output"
-msgstr ""
+msgstr "Salida de flash manual"
 
 #: libexif/canon/mnote-canon-tag.c:90
-#, fuzzy
 msgid "Color Tone"
-msgstr "Espacio de color"
+msgstr "Tono del color"
 
 #: libexif/canon/mnote-canon-tag.c:91
-#, fuzzy
 msgid "Focal Type"
-msgstr "Distancia focal"
+msgstr "Tipo de foco"
 
 #: libexif/canon/mnote-canon-tag.c:93
-#, fuzzy
 msgid "Focal Plane X Size"
-msgstr "Resolución X del plano focal"
+msgstr "Tamaño en la dirección X del plano focal"
 
 #: libexif/canon/mnote-canon-tag.c:94
-#, fuzzy
 msgid "Focal Plane Y Size"
-msgstr "Resolución X del plano focal"
+msgstr "Tamaño en la dirección Y del plano focal"
 
 #: libexif/canon/mnote-canon-tag.c:95
 msgid "Auto ISO"
-msgstr ""
+msgstr "Sensibilidad ISO automática"
 
 #: libexif/canon/mnote-canon-tag.c:96
-#, fuzzy
 msgid "Shot ISO"
-msgstr "Lugar"
+msgstr "Toma de imagen ISO"
 
 #: libexif/canon/mnote-canon-tag.c:97
 msgid "Measured EV"
-msgstr ""
+msgstr "EV medida"
 
 #: libexif/canon/mnote-canon-tag.c:98
-#, fuzzy
 msgid "Target Aperture"
-msgstr "apertura"
+msgstr "Apertura del motivo"
 
 #: libexif/canon/mnote-canon-tag.c:99
-#, fuzzy
 msgid "Target Exposure Time"
-msgstr "Tiempo de exposición"
+msgstr "Tiempo de exposición del motivo"
 
 #: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
 #: libexif/pentax/mnote-pentax-tag.c:81
-#, fuzzy
 msgid "Exposure Compensation"
-msgstr "Tiempo de exposición"
+msgstr "Compensación de la exposición"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
 #: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
@@ -1618,52 +1531,45 @@ msgstr "Tiempo de exposición"
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
 msgid "White Balance"
-msgstr "Balance de blanco"
+msgstr "Balance de blancos"
 
 #: libexif/canon/mnote-canon-tag.c:102
-#, fuzzy
 msgid "Slow Shutter"
-msgstr "obturador"
+msgstr "Obturador lento"
 
 #: libexif/canon/mnote-canon-tag.c:103
-#, fuzzy
 msgid "Sequence Number"
-msgstr "El número F."
+msgstr "Número de secuencia"
 
 #: libexif/canon/mnote-canon-tag.c:104
-#, fuzzy
 msgid "Flash Guide Number"
-msgstr "El número F."
+msgstr "Número de guía del flash"
 
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
-#, fuzzy
 msgid "Flash Exposure Compensation"
-msgstr "Tiempo de exposición"
+msgstr "Compensación de la exposición del flash"
 
 #: libexif/canon/mnote-canon-tag.c:107
-#, fuzzy
 msgid "AE Bracketing"
-msgstr "acción"
+msgstr "Horquillado («bracketing») de exposición automática"
 
 #: libexif/canon/mnote-canon-tag.c:108
-#, fuzzy
 msgid "AE Bracket Value"
-msgstr "Auto bracket"
+msgstr "Valor del horquillado de exposición automática"
 
 #: libexif/canon/mnote-canon-tag.c:109
-#, fuzzy
 msgid "Focus Distance Upper"
-msgstr "Balance de blanco manual"
+msgstr "Distancia focal mayor"
 
 #: libexif/canon/mnote-canon-tag.c:110
-#, fuzzy
 msgid "Focus Distance Lower"
-msgstr "Balance de blanco manual"
+msgstr "Distancia focal menor"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "El número F."
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:469
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "Número F"
 
 #: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
 #: libexif/pentax/mnote-pentax-tag.c:78
@@ -1671,171 +1577,143 @@ msgid "Exposure Time"
 msgstr "Tiempo de exposición"
 
 #: libexif/canon/mnote-canon-tag.c:113
-#, fuzzy
 msgid "Bulb Duration"
-msgstr "Saturación"
+msgstr "Duración de la bombilla"
 
 #: libexif/canon/mnote-canon-tag.c:114
 msgid "Camera Type"
-msgstr ""
+msgstr "Tipo de cámara"
 
 #: libexif/canon/mnote-canon-tag.c:115
-#, fuzzy
 msgid "Auto Rotate"
-msgstr "Auto bracket"
+msgstr "Rotación automática"
 
 #: libexif/canon/mnote-canon-tag.c:116
-#, fuzzy
 msgid "ND Filter"
-msgstr "Relación de zoom digital"
+msgstr "Filtro ND"
 
 #: libexif/canon/mnote-canon-tag.c:119
-#, fuzzy
 msgid "Panorama Frame"
-msgstr "Panorama"
+msgstr "Marco panorámico"
 
 #: libexif/canon/mnote-canon-tag.c:120
-#, fuzzy
 msgid "Panorama Direction"
-msgstr "Panorama"
+msgstr "Dirección del panorama"
 
 #: libexif/canon/mnote-canon-tag.c:121
-#, fuzzy
 msgid "Tone Curve"
-msgstr "Contraste"
+msgstr "Curva del tono"
 
 #: libexif/canon/mnote-canon-tag.c:122
-#, fuzzy
 msgid "Sharpness Frequency"
-msgstr "Nitidez"
+msgstr "Frecuencia de la nitidez"
 
 #: libexif/canon/mnote-canon-tag.c:124
-#, fuzzy
 msgid "Picture Style"
-msgstr "Modo de exposición"
+msgstr "Estilo de imagen"
 
 #: libexif/exif-byte-order.c:33
 msgid "Motorola"
-msgstr ""
+msgstr "Motorola"
 
 #: libexif/exif-byte-order.c:35
 msgid "Intel"
-msgstr ""
+msgstr "Intel"
 
 #: libexif/exif-data.c:780
 msgid "Size of data too small to allow for EXIF data."
-msgstr ""
+msgstr "Tamaño de los datos demasiado pequeño para permitir datos EXIF."
 
 #: libexif/exif-data.c:841
 msgid "EXIF marker not found."
-msgstr ""
+msgstr "Marca EXIF no encontrada"
 
 #: libexif/exif-data.c:868
 msgid "EXIF header not found."
-msgstr ""
+msgstr "Cabecera EXIF no encontrada"
 
 #: libexif/exif-data.c:893
-#, fuzzy
 msgid "Unknown encoding."
-msgstr "Desconocido"
+msgstr "Codificación desconocida."
 
 #: libexif/exif-data.c:1178
 msgid "Ignore unknown tags"
-msgstr ""
+msgstr "Ignorar etiquetas desconocidas"
 
 #: libexif/exif-data.c:1179
 msgid "Ignore unknown tags when loading EXIF data."
-msgstr ""
+msgstr "Ignorar etiquetas desconocidas cuando se carguen datos EXIF."
 
 #: libexif/exif-data.c:1180
 msgid "Follow specification"
-msgstr ""
+msgstr "Seguir la especificación"
 
 #: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Añadir, corregir y eliminar entradas para conseguir que los datos EXIF cumplan la especificación."
 
 #: libexif/exif-data.c:1183
 msgid "Do not change maker note"
-msgstr ""
+msgstr "No cambiar la información del fabricante"
 
 #: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Cuando se carguen y vuelvan a guardar datos EXIF, guardar intacta la información del fabricante. Hay que ser consciente de que la información del fabricante puede corromperse."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "La etiqueta %s tenía el formato '%s' (contrario a la especificación) y se ha cambiado por el formato '%s'."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "La etiqueta %s tiene el formato '%s' (contrario a la especificación) pero no puede cambiarse por el formato '%s'."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "La etiqueta 'UserComment' tiene el formato no válido '%s'. Se le ha puesto el formato 'indefinido'."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "La etiqueta 'UserComment' se ha expandido a 8 bytes como mínimo para cumplir la especificación."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "La etiqueta 'UserComment' no está vacía pero no comienza con un identificador de formato. Se ha arreglado."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "La etiqueta 'UserComment' no comienza con un identificador de formato. Se ha arreglado."
 
 #: libexif/exif-entry.c:462
-#, fuzzy, c-format
+#, c-format
 msgid "%i bytes undefined data"
-msgstr "%i bytes de datos desconocidos"
+msgstr "%i bytes de datos indefinidos"
 
 #: libexif/exif-entry.c:585
-#, fuzzy, c-format
+#, c-format
 msgid "%i bytes unsupported data type"
-msgstr "%i bytes de datos desconocidos"
+msgstr "%i bytes de un tipo de datos no permitido"
 
 #: libexif/exif-entry.c:642
-#, fuzzy, c-format
+#, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr "Formato no válido '%s', se esperaba '%s'."
+msgstr "La etiqueta '%s' contiene datos de un formato no válido ('%s', se esperaba '%s')."
 
 #: libexif/exif-entry.c:655
-#, fuzzy, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr "Cantidad de componentes no válida (%i, se esperaba %i)."
+#, c-format
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "La etiqueta '%s' contiene un número no válido de componentes (%i, se esperaban %i)."
 
 #: libexif/exif-entry.c:669
-#, fuzzy
 msgid "Chunky format"
-msgstr "formato por trozos"
+msgstr "Formato por trozos"
 
 #: libexif/exif-entry.c:669
-#, fuzzy
 msgid "Planar format"
-msgstr "formato planar"
+msgstr "Formato planar"
 
 #: libexif/exif-entry.c:671 libexif/exif-entry.c:763
 #: test/nls/test-codeset.c:54
@@ -1867,83 +1745,72 @@ msgid "Color sequential linear sensor"
 msgstr "Sensor lineal secuencial de color"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
-#, fuzzy
 msgid "Top-left"
-msgstr "arriba - izquierda"
+msgstr "Arriba-izquierda"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
-#, fuzzy
 msgid "Top-right"
-msgstr "arriba - derecha"
+msgstr "Arriba-derecha"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
-#, fuzzy
 msgid "Bottom-right"
-msgstr "abajo - derecha"
+msgstr "Abajo-derecha"
 
 #: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
-#, fuzzy
 msgid "Bottom-left"
-msgstr "abajo - izquierda"
+msgstr "Abajo-izquierda"
 
 #: libexif/exif-entry.c:677
 msgid "Left-top"
-msgstr ""
+msgstr "Izquierda-arriba"
 
 #: libexif/exif-entry.c:677
-#, fuzzy
 msgid "Right-top"
-msgstr "derecha - arriba"
+msgstr "Derecha-arriba"
 
 #: libexif/exif-entry.c:678
-#, fuzzy
 msgid "Right-bottom"
-msgstr "derecha - abajo"
+msgstr "Derecha-abajo"
 
 #: libexif/exif-entry.c:678
-#, fuzzy
 msgid "Left-bottom"
-msgstr "izquierda - abajo"
+msgstr "Izquierda-abajo"
 
 #: libexif/exif-entry.c:680
-#, fuzzy
 msgid "Centered"
-msgstr "centrado"
+msgstr "Centrado"
 
 #: libexif/exif-entry.c:680
-#, fuzzy
 msgid "Co-sited"
-msgstr "co-situado"
+msgstr "Co-situado"
 
 #: libexif/exif-entry.c:682
 msgid "Reversed mono"
-msgstr ""
+msgstr "Monocromático invertido"
 
 #: libexif/exif-entry.c:682
-#, fuzzy
 msgid "Normal mono"
-msgstr "Normal"
+msgstr "Monocromático normal"
 
 #: libexif/exif-entry.c:682
 msgid "RGB"
-msgstr "RVA"
+msgstr "RGB"
 
 #: libexif/exif-entry.c:682
-#, fuzzy
 msgid "Palette"
-msgstr "Patrón"
+msgstr "Paleta"
 
 #: libexif/exif-entry.c:683
 msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
 
 #: libexif/exif-entry.c:683
 msgid "YCbCr"
-msgstr "YCbCr"
+msgstr "TCvCr"
 
 #: libexif/exif-entry.c:683
 msgid "CieLAB"
-msgstr ""
+msgstr "CieLAB"
 
 #: libexif/exif-entry.c:685
 msgid "Normal process"
@@ -1967,11 +1834,11 @@ msgstr "Auto bracket"
 
 #: libexif/exif-entry.c:689
 msgid "Auto white balance"
-msgstr "Balance de blanco automático"
+msgstr "Balance de blancos automático"
 
 #: libexif/exif-entry.c:689
 msgid "Manual white balance"
-msgstr "Balance de blanco manual"
+msgstr "Balance de blancos manual"
 
 #: libexif/exif-entry.c:694
 msgid "Low gain up"
@@ -2024,17 +1891,14 @@ msgid "Unknown"
 msgstr "Desconocido"
 
 #: libexif/exif-entry.c:716
-#, fuzzy
 msgid "Avg"
-msgstr "promedio"
+msgstr "Promedio"
 
 #: libexif/exif-entry.c:717
-#, fuzzy
 msgid "Center-weight"
-msgstr "peso centrado"
+msgstr "Peso centrado"
 
 #: libexif/exif-entry.c:719
-#, fuzzy
 msgid "Multi spot"
 msgstr "Multi Lugar"
 
@@ -2048,24 +1912,23 @@ msgstr "Descomprimido"
 
 #: libexif/exif-entry.c:726
 msgid "LZW compression"
-msgstr "compresión LZW"
+msgstr "Compresión LZW"
 
 #: libexif/exif-entry.c:727 libexif/exif-entry.c:728
 msgid "JPEG compression"
-msgstr "compresión JPEG"
+msgstr "Compresión JPEG"
 
 #: libexif/exif-entry.c:729
 msgid "Deflate/ZIP compression"
-msgstr "compresión Deflate/ZIP"
+msgstr "Desinfla/compresión ZIP"
 
 #: libexif/exif-entry.c:730
 msgid "PackBits compression"
-msgstr "compresión PackBits"
+msgstr "Compresión PackBits"
 
 #: libexif/exif-entry.c:736
-#, fuzzy
 msgid "Tungsten incandescent light"
-msgstr "Tungsteno (luz incandescente)"
+msgstr "Luz incandescente de tungsteno"
 
 #: libexif/exif-entry.c:738
 msgid "Fine weather"
@@ -2078,7 +1941,7 @@ msgstr "Tiempo nublado"
 #: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
-msgstr "Día blanco fluorescente"
+msgstr "Blanco diurno fluorescente"
 
 #: libexif/exif-entry.c:743
 msgid "Cool white fluorescent"
@@ -2087,7 +1950,7 @@ msgstr "Blanco frío fluorescente"
 #: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
-msgstr "Blanco fluorescente"
+msgstr "Fluorescente blanco"
 
 #: libexif/exif-entry.c:745
 msgid "Standard light A"
@@ -2150,54 +2013,45 @@ msgid "Shutter priority"
 msgstr "Prioridad del obturador"
 
 #: libexif/exif-entry.c:767
-#, fuzzy
 msgid "Shutter"
-msgstr "obturador"
+msgstr "Obturador"
 
 #: libexif/exif-entry.c:768
 msgid "Creative program (biased toward depth of field)"
 msgstr "Programa creativo (orientado a la profundidad del campo)"
 
 #: libexif/exif-entry.c:769
-#, fuzzy
 msgid "Creative"
-msgstr "creativo"
+msgstr "Creativo"
 
 #: libexif/exif-entry.c:770
-#, fuzzy
 msgid "Creative program (biased toward fast shutter speed)"
-msgstr "Programa de acción (orientado a velocidad rápida del obturador)"
+msgstr "Programa creativo (orientado a velocidad rápida del obturador)"
 
 #: libexif/exif-entry.c:771
-#, fuzzy
 msgid "Action"
-msgstr "acción"
+msgstr "Acción"
 
 #: libexif/exif-entry.c:772
-#, fuzzy
 msgid "Portrait mode (for closeup photos with the background out of focus)"
-msgstr "Modo retrato (para fotos de cerca con el fondo fuera de foco"
+msgstr "Modo retrato (para fotos de cerca con el fondo fuera de foco)"
 
 #: libexif/exif-entry.c:774
-#, fuzzy
 msgid "Landscape mode (for landscape photos with the background in focus)"
-msgstr "Modo paisaje (para fotos de paisaje con el fondo en foco"
+msgstr "Modo paisaje (para fotos de paisaje con el fondo en foco)"
 
 #: libexif/exif-entry.c:778 libexif/exif-entry.c:783
 #: libexif/olympus/mnote-olympus-entry.c:100
-#, fuzzy
 msgid "Flash did not fire"
-msgstr "El flash no disparó."
+msgstr "El flash no se disparó"
 
 #: libexif/exif-entry.c:778
-#, fuzzy
 msgid "No flash"
-msgstr "Flash"
+msgstr "Sin flash"
 
 #: libexif/exif-entry.c:779
-#, fuzzy
 msgid "Flash fired"
-msgstr "El flash disparó."
+msgstr "El flash se disparó"
 
 #: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
@@ -2205,144 +2059,103 @@ msgstr "El flash disparó."
 #: libexif/olympus/mnote-olympus-entry.c:221
 #: libexif/olympus/mnote-olympus-entry.c:244
 msgid "Yes"
-msgstr "sí"
+msgstr "Sí"
 
 #: libexif/exif-entry.c:780
-#, fuzzy
 msgid "Strobe return light not detected"
-msgstr "Luz de retorno estrosboscópica no detectada."
+msgstr "Luz de retorno estrosboscópica no detectada"
 
 #: libexif/exif-entry.c:780
-#, fuzzy
 msgid "Without strobe"
-msgstr "sin estrosboscópica"
+msgstr "Sin estrosboscópica"
 
 #: libexif/exif-entry.c:782
-#, fuzzy
 msgid "Strobe return light detected"
-msgstr "Luz de retorno estrosboscópica detectada."
+msgstr "Luz de retorno estrosboscópica detectada"
 
 #: libexif/exif-entry.c:782
-#, fuzzy
 msgid "With strobe"
-msgstr "con estrosboscópica"
+msgstr "Con estrosboscópica"
 
 #: libexif/exif-entry.c:784
-#, fuzzy
 msgid "Flash fired, compulsory flash mode"
-msgstr "El flash no disparó, modo compulsivo del flash."
+msgstr "El flash no se disparó, modo compulsivo del flash"
 
 #: libexif/exif-entry.c:785
-#, fuzzy
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
-"El flash disparó, modo compulsivo del flash, luz de retorno no detectada."
+msgstr "El flash se disparó, modo compulsivo del flash, luz de retorno no detectada"
 
 #: libexif/exif-entry.c:787
-#, fuzzy
 msgid "Flash fired, compulsory flash mode, return light detected"
-msgstr "El flash disparó, modo compulsivo del flash, luz de retorno detectada."
+msgstr "El flash se disparó, modo compulsivo del flash, luz de retorno detectada."
 
 #: libexif/exif-entry.c:789
-#, fuzzy
 msgid "Flash did not fire, compulsory flash mode"
-msgstr "El flash no disparó, modo compulsivo del flash."
+msgstr "El flash no se disparó, modo compulsivo del flash"
 
 #: libexif/exif-entry.c:790
-#, fuzzy
 msgid "Flash did not fire, auto mode"
-msgstr "El flash no disparó, modo automático."
+msgstr "El flash no se disparó, modo automático"
 
 #: libexif/exif-entry.c:791
-#, fuzzy
 msgid "Flash fired, auto mode"
-msgstr "El flash disparó, modo automático."
+msgstr "El flash se disparó, modo automático"
 
 #: libexif/exif-entry.c:792
-#, fuzzy
 msgid "Flash fired, auto mode, return light not detected"
-msgstr "El flash disparó, modo automático, luz de retorno no detectada."
+msgstr "El flash se disparó, modo automático, luz de retorno no detectada"
 
 #: libexif/exif-entry.c:794
-#, fuzzy
 msgid "Flash fired, auto mode, return light detected"
-msgstr "El flash disparó, modo automático, luz de retorno detectada."
+msgstr "El flash se disparó, modo automático, luz de retorno detectada"
 
 #: libexif/exif-entry.c:795
-#, fuzzy
 msgid "No flash function"
-msgstr "Sin función de flash."
+msgstr "Sin función de flash"
 
 #: libexif/exif-entry.c:796
-#, fuzzy
 msgid "Flash fired, red-eye reduction mode"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "El flash se disparó, modo de reducción de ojos rojos"
 
 #: libexif/exif-entry.c:797
-#, fuzzy
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
-"El flash disparó, modo de reducción de ojos rojos, luz de retorno no "
-"detectada."
+msgstr "El flash se disparó, modo de reducción de ojos rojos, luz de retorno no detectada"
 
 #: libexif/exif-entry.c:799
-#, fuzzy
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
-"El flash disparó, modo de reducción de ojos rojos, luz de retorno detectada."
+msgstr "El flash se disparó, modo de reducción de ojos rojos, luz de retorno detectada"
 
 #: libexif/exif-entry.c:801
-#, fuzzy
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
-msgstr ""
-"El flash disparó, modo compulsivo del flash, modo de reducción de ojos rojos."
+msgstr "El flash se disparó, modo compulsivo del flash, modo de reducción de ojos rojos"
 
 #: libexif/exif-entry.c:803
-#, fuzzy
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"El flash disparó, modo compulsivo del flash, modo de reducción de ojos "
-"rojos, luz de retorno no detectada."
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "El flash se disparó, modo compulsivo del flash, modo de reducción de ojos rojos, luz de retorno no detectada"
 
 #: libexif/exif-entry.c:805
-#, fuzzy
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"El flash disparó, modo compulsivo del flash, modo de reducción de ojos "
-"rojos, luz de retorno no detectada."
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "El flash se disparó, modo compulsivo del flash, modo de reducción de ojos rojos, luz de retorno no detectada"
 
 #: libexif/exif-entry.c:807
-#, fuzzy
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
-msgstr "El flash disparó, modo automático, modo de reducción de ojos rojos."
+msgstr "El flash se disparó, modo automático, modo de reducción de ojos rojos"
 
 #: libexif/exif-entry.c:808
-#, fuzzy
 msgid "Flash fired, auto mode, red-eye reduction mode"
-msgstr "El flash disparó, modo automático, modo de reducción de ojos rojos."
+msgstr "El flash se disparó, modo automático, modo de reducción de ojos rojos"
 
 #: libexif/exif-entry.c:809
-#, fuzzy
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"El flash disparó, modo automático, modo de reducción de ojos rojos, luz de "
-"retorno no detectada."
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "El flash se disparó, modo automático, modo de reducción de ojos rojos, luz de retorno no detectada"
 
 #: libexif/exif-entry.c:811
-#, fuzzy
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"El flash disparó, modo automático, modo de reducción de ojos rojos, luz de "
-"retorno detectada."
+msgstr "El flash se disparó, modo automático, modo de reducción de ojos rojos, luz de retorno detectada"
 
 #: libexif/exif-entry.c:815
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #: libexif/exif-entry.c:817
 msgid "Close view"
@@ -2353,17 +2166,16 @@ msgid "Distant view"
 msgstr "Vista distante"
 
 #: libexif/exif-entry.c:818
-#, fuzzy
 msgid "Distant"
-msgstr "Vista distante"
+msgstr "Distante"
 
 #: libexif/exif-entry.c:821
 msgid "sRGB"
-msgstr "sRVA"
+msgstr "sRGB"
 
 #: libexif/exif-entry.c:822
 msgid "Adobe RGB"
-msgstr ""
+msgstr "RGB Adobe"
 
 #: libexif/exif-entry.c:823
 msgid "Uncalibrated"
@@ -2372,29 +2184,28 @@ msgstr "Descalibrado"
 #: libexif/exif-entry.c:878
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
-msgstr "Cantidad de componentes no válida (%i, se esperaba %li x %i)."
+msgstr "Tamaño de entrada no válido (%i, se esperaba %li x %i)."
 
 #: libexif/exif-entry.c:911
 msgid "Unsupported UNICODE string"
-msgstr ""
+msgstr "Cadena UNICODE no permitida"
 
 #: libexif/exif-entry.c:919
 msgid "Unsupported JIS string"
-msgstr ""
+msgstr "Cadena JIS no permitido"
 
 #: libexif/exif-entry.c:935
 msgid "Tag UserComment contains data but is against specification."
-msgstr ""
+msgstr "La etiqueta UserComment contiene datos pero no cumple la especificación."
 
 #: libexif/exif-entry.c:939
 #, c-format
 msgid "Byte at position %i: 0x%02x"
-msgstr ""
+msgstr "Byte en la posición %i: 0x%02x"
 
 #: libexif/exif-entry.c:947
-#, fuzzy
 msgid "Unknown Exif Version"
-msgstr "Versión Exif"
+msgstr "Versión Exif desconocida"
 
 #: libexif/exif-entry.c:951
 #, c-format
@@ -2403,40 +2214,40 @@ msgstr "Versión Exif %d.%d"
 
 #: libexif/exif-entry.c:962
 msgid "FlashPix Version 1.0"
-msgstr ""
+msgstr "Versión FlashPix 1.0"
 
 #: libexif/exif-entry.c:964
 msgid "FlashPix Version 1.01"
-msgstr ""
+msgstr "Versión FlashPix 1.01"
 
 #: libexif/exif-entry.c:966
 msgid "Unknown FlashPix Version"
-msgstr ""
+msgstr "Versión FlashPix desconocida"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1668
+#: libexif/exif-entry.c:1673 libexif/exif-entry.c:1677
+#: libexif/exif-entry.c:1682 libexif/exif-entry.c:1683
 msgid "[None]"
-msgstr ""
+msgstr "(Ninguno)"
 
 #: libexif/exif-entry.c:981
 msgid "(Photographer)"
-msgstr ""
+msgstr "(Fotógrafo)"
 
 #: libexif/exif-entry.c:1000
 msgid "(Editor)"
-msgstr ""
+msgstr "(Editor)"
 
 #: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
 #: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
 #, c-format
 msgid "%.02f EV"
-msgstr ""
+msgstr "%.02f EV"
 
 #: libexif/exif-entry.c:1025
 #, c-format
 msgid " (f/%.01f)"
-msgstr ""
+msgstr " (f/%0.1f)"
 
 #: libexif/exif-entry.c:1059
 #, c-format
@@ -2448,19 +2259,19 @@ msgid " sec."
 msgstr " seg."
 
 #: libexif/exif-entry.c:1107
-#, fuzzy, c-format
+#, c-format
 msgid " (1/%d sec.)"
-msgstr " 1/%d seg.)"
+msgstr " (1/%d seg.)"
 
 #: libexif/exif-entry.c:1109
-#, fuzzy, c-format
+#, c-format
 msgid " (%d sec.)"
-msgstr " %d seg.)"
+msgstr " (%d seg.)"
 
 #: libexif/exif-entry.c:1122
 #, c-format
 msgid " (%.02f cd/m^2)"
-msgstr ""
+msgstr " (%.02f cd/m^2)"
 
 #: libexif/exif-entry.c:1132
 msgid "DSC"
@@ -2474,7 +2285,7 @@ msgstr "DSC"
 #: libexif/pentax/mnote-pentax-entry.c:359
 #, c-format
 msgid "Internal error (unknown value %i)"
-msgstr ""
+msgstr "Error interno (valor desconocido %i)"
 
 #: libexif/exif-entry.c:1142
 msgid "-"
@@ -2505,13 +2316,12 @@ msgid "B"
 msgstr "A"
 
 #: libexif/exif-entry.c:1149
-#, fuzzy
 msgid "Reserved"
-msgstr "reservado"
+msgstr "Reservado"
 
 #: libexif/exif-entry.c:1172
 msgid "Directly photographed"
-msgstr ""
+msgstr "Fotografiado directamente"
 
 #: libexif/exif-entry.c:1185
 msgid "YCbCr4:2:2"
@@ -2537,31 +2347,29 @@ msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Cantidad de componentes inesperada (%li, esperados 2, 3, o 4)."
 
 #: libexif/exif-entry.c:1257
-#, fuzzy
 msgid "Sea level"
-msgstr "Nivel de la batería"
+msgstr "Nivel del mar"
 
 #: libexif/exif-entry.c:1259
 msgid "Sea level reference"
-msgstr ""
+msgstr "Referencia del nivel del mar"
 
 #: libexif/exif-entry.c:1367
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown value %i"
-msgstr "Desconocido"
+msgstr "Valor desconocido %i"
 
 #: libexif/exif-format.c:37
-#, fuzzy
 msgid "Short"
-msgstr "Lugar"
+msgstr "Corto"
 
 #: libexif/exif-format.c:38
 msgid "Rational"
-msgstr ""
+msgstr "Racional"
 
 #: libexif/exif-format.c:39
 msgid "SRational"
-msgstr ""
+msgstr "SRacional"
 
 #: libexif/exif-format.c:40
 msgid "Undefined"
@@ -2569,547 +2377,386 @@ msgstr "Indefinido"
 
 #: libexif/exif-format.c:41
 msgid "ASCII"
-msgstr ""
+msgstr "ASCII"
 
 #: libexif/exif-format.c:42
 msgid "Long"
-msgstr ""
+msgstr "Largo"
 
 #: libexif/exif-format.c:43
-#, fuzzy
 msgid "Byte"
-msgstr "Centímetro"
+msgstr "Byte"
 
 #: libexif/exif-format.c:44
 msgid "SByte"
-msgstr ""
+msgstr "Byte con signo"
 
 #: libexif/exif-format.c:45
 msgid "SShort"
-msgstr ""
+msgstr "Entero pequeño con signo"
 
 #: libexif/exif-format.c:46
 msgid "SLong"
-msgstr ""
+msgstr "Entero grande con signo"
 
 #: libexif/exif-format.c:47
 msgid "Float"
-msgstr ""
+msgstr "Coma flotante de precisión simple"
 
 #: libexif/exif-format.c:48
 msgid "Double"
-msgstr ""
+msgstr "Coma flotante de doble precisión"
 
 #: libexif/exif-loader.c:119
 #, c-format
 msgid "The file '%s' could not be opened."
-msgstr ""
+msgstr "No se ha podido abrir el fichero '%s'."
 
 #: libexif/exif-loader.c:300
 msgid "The data supplied does not seem to contain EXIF data."
-msgstr ""
+msgstr "Los datos suministrados no parecen contener datos EXIF."
 
 #: libexif/exif-log.c:43
 msgid "Debugging information"
-msgstr ""
+msgstr "Información de depuración"
 
 #: libexif/exif-log.c:44
 msgid "Debugging information is available."
-msgstr ""
+msgstr "La información de depuración está disponible."
 
 #: libexif/exif-log.c:45
 msgid "Not enough memory"
-msgstr ""
+msgstr "No hay suficiente memoria"
 
 #: libexif/exif-log.c:46
 msgid "The system cannot provide enough memory."
-msgstr ""
+msgstr "El sistema no puede proporcionar suficiente memoria."
 
 #: libexif/exif-log.c:47
 msgid "Corrupt data"
-msgstr ""
+msgstr "Datos corruptos"
 
 #: libexif/exif-log.c:48
 msgid "The data provided does not follow the specification."
-msgstr ""
+msgstr "Los datos proporcionados no cumplen la especificación."
 
 #: libexif/exif-tag.c:62
 msgid "GPS Tag Version"
-msgstr ""
+msgstr "Versión de la etiqueta GPS"
 
 #: libexif/exif-tag.c:63
-#, fuzzy
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
-"Indica la versión de <GPSInfoIFD>. La versión está dada como 2.0.0.0. Esta "
-"etiqueta es obligatoria cuando está presente la etiqueta <GPSInfo>. (Nota: "
-"La etiqueta <GPSVersion ID> está dada en bytes, a diferencia de la etiqueta "
-"<ExifVersion>. Cuando la versión es 2.0.0.0, el valor de la etiqueta es "
-"02000000.H)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Indica la versión de <GPSInfoIFD>. La versión está dada como 2.0.0.0. Esta etiqueta es obligatoria cuando está presente la etiqueta <GPSInfo>. (Nota: La etiqueta <GPSVersionID> está dada en bytes, a diferencia de la etiqueta <ExifVersion>. Cuando la versión es 2.0.0.0, el valor de la etiqueta es 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
-msgstr ""
+msgstr "�ndice de interoperabilidad"
 
 #: libexif/exif-tag.c:70
-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 "
-"código de terminación (NULL). Vea el volumen separado de Recommended Exif "
-"Interoperatibility Rules (ExifR98) para otras etiquetas usadas en ExifR98."
+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 código de terminación (NULL). Vea el volumen separado de Recommended Exif Interoperatibility Rules (ExifR98) para otras etiquetas usadas en ExifR98."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
-msgstr ""
+msgstr "Latitud Norte o Sur"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude 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."
+msgid "Indicates whether the latitude 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."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
-msgstr ""
+msgstr "Versión de interoperabilidad"
 
 #: libexif/exif-tag.c:83
 msgid "Latitude"
-msgstr ""
+msgstr "Latitud"
 
 #: libexif/exif-tag.c:84
-#, fuzzy
-msgid ""
-"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."
-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."
+msgid "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."
+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."
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
-msgstr ""
+msgstr "Longitud Este u Oeste"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
-"Indica si la longitud es Este u Oeste. El valor ASCII 'E' indica longitud "
-"Este, y 'W' indica longitud Oeste."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Indica si la longitud es Este u Oeste. El valor ASCII 'E' indica longitud Este, y 'W' indica longitud Oeste."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
-msgstr ""
+msgstr "Longitud"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
-"Indica la longitud. La longitud 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."
+msgid "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."
+msgstr "Indica la longitud. La longitud 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."
 
 #: libexif/exif-tag.c:103
 msgid "Altitude Reference"
-msgstr ""
+msgstr "Referencia de altitud"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
+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 is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GPSAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags."
+msgstr "Indica la altitud utilizada como altitud de referencia. Si la referencia es el nivel del mar y la altitud está por encima del mar, se pone 0. Si la altitud está por debajo del nivel del mar, se pone el valor 1 y la altitud se indica como un valor absoluto en la etiqueta GPSAltitude. La unidad de referencia es el metro. Adviértase que esta etiqueta es de tipo BYTE, a diferencia de otras etiquetas de referencia."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
-msgstr ""
+msgstr "Altitud"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Indica la altitud basada en la referencia en GPSAltitudeRef. La altitud se expresa como un valor RACIONAL. La unidad de referencia, en metros."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
-msgstr ""
+msgstr "Tiempo GPS (reloj atómico)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Indica el tiempo como UTC (tiempo universal coordinado). El sello de tiempo se expresa como tres valores RACIONALES que representan las horas, minutos y segundos."
 
 #: libexif/exif-tag.c:118
 msgid "GPS Satellites"
-msgstr ""
+msgstr "Satélites GPS"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
+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, 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 shall be set to NULL."
+msgstr "Indica los satélites GPS utilizados para las medidas. Esta etiqueta puede utilizarse para describir el número de satélites, su número identificador, el ángulo de elevación, el azimut, la relación señal/ruido y más información en notación ASCII. El formato no está especificado. Si el receptor GPS es incapaz de hacer medidas, el valor de la etiqueta se pondrá a NULL."
 
 #: libexif/exif-tag.c:125
 msgid "GPS Receiver Status"
-msgstr ""
+msgstr "Estado del receptor GPS"
 
 #: libexif/exif-tag.c:126
-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 ""
+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 "Indica el estado del receptor GPS cuando se graba la imagen. 'A' significa que la medida está en progreso y 'V' significa que la medida está en Interoperabilidad."
 
 #: libexif/exif-tag.c:129
-#, fuzzy
 msgid "GPS Measurement Mode"
-msgstr "Modo de métrica"
+msgstr "Modo de medida GPS"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Indica el modo de medida GPS. '2' significa medida bidimensional y '3' significa medida tridimensional en progreso."
 
 #: libexif/exif-tag.c:133
 msgid "Measurement Precision"
-msgstr ""
+msgstr "Precisión de la medida"
 
 #: libexif/exif-tag.c:134
-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 ""
+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 "Indica el DOP del GPS (grado de precisión de los datos). Se escribe un valor HDOP durante una medida bidimensional y PDOP durante una medida tridimensional."
 
 #: libexif/exif-tag.c:137
 msgid "Speed Unit"
-msgstr ""
+msgstr "Unidades de la velocidad"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Indica la unidad utilizada para expresar la velocidad de desplazamiento del receptor GPS. 'K' y 'N' representan kilómetros por hora, minutos por hora y nudos."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
-msgstr ""
+msgstr "Velocidad del receptor GPS"
 
 #: libexif/exif-tag.c:142
 msgid "Indicates the speed of GPS receiver movement."
-msgstr ""
+msgstr "Indica la velocidad de desplazamiento del receptor GPS."
 
 #: libexif/exif-tag.c:143
 msgid "Reference for direction of movement"
-msgstr ""
+msgstr "Referencia de la dirección del desplazamiento"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Indica la referencia para dar la dirección del desplazamiento del receptor GPS. 'T' denota dirección real y 'M' es la dirección magnética."
 
 #: libexif/exif-tag.c:147
 msgid "Direction of Movement"
-msgstr ""
+msgstr "Dirección del desplazamiento"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
-msgstr ""
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
+msgstr "Indica la dirección del desplazamiento del receptor GPS. El rango de valores va de 0,00 a 359,99."
 
 #: libexif/exif-tag.c:150
 msgid "GPS Image Direction Reference"
-msgstr ""
+msgstr "Referencia de la dirección GPS de la imagen"
 
 #: libexif/exif-tag.c:151
-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 ""
+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 "Indica la referencia para dar la dirección de la imagen cuando esta es captada. 'T' denota dirección real y 'M' es la dirección magnética."
 
 #: libexif/exif-tag.c:153
-#, fuzzy
 msgid "GPS Image Direction"
-msgstr "Descripción de la imagen"
+msgstr "Dirección GPS de la imagen"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
+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 imagen cuando fue captada. El rango de valores va de 0,00 a 359,99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
-msgstr ""
+msgstr "Datos de sondeo geodésicos utilizados"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Indica los datos de sondeo geodésicos utilizados por el receptor GPS. Si los datos de sondeo se restringen a Japón, el valor de esta etiqueta es 'TOKYO' o 'WGS-84'. Si se graba una etiqueta de información GPS, se recomienda encarecidamente grabar esta etiqueta."
 
 #: libexif/exif-tag.c:161
 msgid "Reference For Latitude of Destination"
-msgstr ""
+msgstr "Referencia de la latitud de destino"
 
 #: libexif/exif-tag.c:162
-#, 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."
+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 del punto de destino es Norte o Sur. El valor ASCII 'N' indica latitud Norte y 'S' indica latitud Sur."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
-msgstr ""
+msgstr "Latitud de destino"
 
 #: libexif/exif-tag.c:166
-#, fuzzy
-msgid ""
-"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."
-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."
+msgid "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."
+msgstr "Indica la latitud del punto de destino. 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."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
-msgstr ""
+msgstr "Referencia de la longitud de destino"
 
 #: libexif/exif-tag.c:174
-#, fuzzy
-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 ""
-"Indica si la longitud es Este u Oeste. El valor ASCII 'E' indica longitud "
-"Este, y 'W' indica longitud Oeste."
+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 "Indica si la longitud del punto de destino es Este u Oeste. El valor ASCII 'E' indica longitud Este, y 'W' indica longitud Oeste."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
-msgstr ""
+msgstr "Longitud de destino"
 
 #: libexif/exif-tag.c:178
-#, fuzzy
-msgid ""
-"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."
-msgstr ""
-"Indica la longitud. La longitud 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."
+msgid "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."
+msgstr "Indica la longitud del punto de destino. La longitud se expresa como tres valores RACIONALES dando los grados, minutos y segundos, respectivamente. Cuando se expresan grados, minutos y segundos, un formato típico sería ggg/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 sería ggg/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
-msgstr ""
+msgstr "Referencia para el rumbo de destino"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Indica la referencia utilizada para dar el rumbo al punto de destino. 'T' denota dirección real y 'M' dirección magnética."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
-msgstr ""
+msgstr "Rumbo de destino"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
-msgstr ""
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
+msgstr "Indica el rumbo al punto de destino. El rango de valores va de 0,00 a 359,99"
 
 #: libexif/exif-tag.c:193
 msgid "Reference for Distance to Destination"
-msgstr ""
+msgstr "Referencia de la distancia al destino"
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr "Indica las unidades utilizadas para expresar la distancia al punto de destino. 'K' 'M' y 'N' representan kilómetros, millas y millas náuticas."
 
 #: libexif/exif-tag.c:197
-#, fuzzy
 msgid "Distance to Destination"
-msgstr "Descripción de ajuste del dispositivo"
+msgstr "Distancia al destino"
 
 #: libexif/exif-tag.c:198
-#, fuzzy
 msgid "Indicates the distance to the destination point."
-msgstr "Esta etiqueta indica la distancia al sujeto."
+msgstr "Indica la distancia al punto de destino."
 
 #: libexif/exif-tag.c:199
-#, fuzzy
 msgid "Name of GPS Processing Method"
-msgstr "Método de sensado"
+msgstr "Nombre del método de procesamiento GPS"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Cadena de caracteres que guarda el nombre del método utilizado para encontrar lugares. El primer byte indica el código de caracteres utilizado, y le sigue el nombre del método. Como el Tipo no es ASCII, no es necesario que termine en NULL."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
-msgstr ""
+msgstr "Nombre del área GPS"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Cadena de caracteres que guarda el nombre del área GPS. El primer byte indica el código de caracteres utilizado, y le sigue el nombre del área GPS. Como el Tipo no es ASCII, no es necesario que termine en NULL."
 
 #: libexif/exif-tag.c:210
 msgid "GPS Date"
-msgstr ""
+msgstr "Fecha GPS"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "Cadena de caracteres que guarda información de fecha y hora referida a UTC (tiempo univesal coordinado). El formato es \"AAAA:MM:DD\". La longitud de la cadena es 11 bytes incluido el NULL."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
-msgstr ""
+msgstr "Corrección diferencial de GPS"
 
 #: libexif/exif-tag.c:216
+msgid "Indicates whether differential correction is applied to the GPS receiver."
+msgstr "Indica si se aplica corrección diferencial al receptor GPS."
+
+#: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
 msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
-msgstr ""
+msgstr "Nuevo tipo de subfichero"
 
 #: libexif/exif-tag.c:220
 msgid "A general indication of the kind of data contained in this subfile."
-msgstr ""
+msgstr "Indicación general sobre la clase de datos que contiene este subfichero."
 
 #: libexif/exif-tag.c:222
 msgid "Image Width"
 msgstr "Ancho de la imagen"
 
 #: libexif/exif-tag.c:223
-#, 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."
+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 "Número de columnas en los datos de la imagen, igual al número de pixels por fila. En datos comprimidos JPEG se utiliza un marcador JPEG en vez de esta etiqueta."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
 msgstr "Longitud de la imagen"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"La cantidad de filas de datos de la imagen. En datos comprimidos JPEG se "
-"utiliza un marcador JPEG en vez de esta etiqueta."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Número de filas en los datos de la imagen. En datos comprimidos JPEG se utiliza un marcador JPEG en vez de esta etiqueta."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
 msgstr "Bits por muestra"
 
 #: libexif/exif-tag.c:232
-#, fuzzy
-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 "
-"<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."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "El número de bits por componente de la imagen. En este estándar cada componente de la imagen es de 8 bits, por lo que el valor de esta etiqueta es 8. Véase también <SamplesPerPixel>. En datos comprimidos JPEG se utliza un marcador JPEG en vez de esta etiqueta."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Compresión"
 
 #: libexif/exif-tag.c:238
-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 "
-"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."
+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 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."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
 msgstr "Interpretación fotométrica"
 
 #: libexif/exif-tag.c:245
-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 "
-"JPEG en vez de esta etiqueta."
+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 JPEG en vez de esta etiqueta."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
@@ -3124,67 +2771,38 @@ msgid "Image Description"
 msgstr "Descripción de la imagen"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"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>."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> 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>."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Fabricante"
 
 #: libexif/exif-tag.c:261
-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 ""
-"El fabricante del equipo. Este es el fabricante 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."
+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 "El fabricante del equipo. Este es el fabricante 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."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Modelo"
 
 #: libexif/exif-tag.c:268
-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 ""
-"El nombre o número de modelo del equipo. Este es el nombre del modelo o "
-"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."
+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 "El nombre o número de modelo del equipo. Este es el nombre del modelo o 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."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
 msgstr "Desplazamiento de tira"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
-"El desplazamiento en bytes de cada tira. Se recomienda que se seleccione de "
-"manera tal que la cantidad de bytes de la tira no exceda 64 Kbytes. Con "
-"datos comprimidos JPEG esto no es necesario y se omite. Vea también "
-"<RowsPerStrip> y <StripByteCounts>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "El desplazamiento en bytes de cada tira. Se recomienda que se seleccione de manera tal que la cantidad de bytes de la tira no exceda 64 Kbytes. Con datos comprimidos JPEG esto no es necesario y se omite. Vea también <RowsPerStrip> y <StripByteCounts>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
 msgstr "Orientación"
 
 #: libexif/exif-tag.c:281
-#, 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."
 
@@ -3193,192 +2811,108 @@ msgid "Samples per Pixel"
 msgstr "Muestras por pixel"
 
 #: libexif/exif-tag.c:285
-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."
+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."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
 msgstr "Filas por tira"
 
 #: libexif/exif-tag.c:291
-#, fuzzy
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<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>."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "El número de filas por tira. Este es el número de filas en la imagen de una tira cuando se divide a la imagen en tiras. En datos comprimidos JPEG esta designación no es necesaria y se omite. Véase también <RowsPerStrip> y <StripByteCounts>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
 msgstr "Cantidad de bytes por tira"
 
 #: libexif/exif-tag.c:298
-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."
+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."
 
 #: libexif/exif-tag.c:301
-#, fuzzy
 msgid "X-Resolution"
-msgstr "Resolución X"
+msgstr "Resolución en X"
 
 #: libexif/exif-tag.c:302
-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>. "
-"Cuando se desconoce la resolución de una imagen, se utilizan 72 [dpi]."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Número de pixels por <ResolutionUnit> en la dirección <ImageWidth>. Cuando se desconoce la resolución de una imagen, se utilizan 72 [dpi]."
 
 #: libexif/exif-tag.c:306
-#, fuzzy
 msgid "Y-Resolution"
-msgstr "Resolución X"
+msgstr "Resolución en Y"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"La cantidad de pixels por <ResolutionUnit> en la dirección <ImageLength>. Se "
-"utiliza el mismo valor que <XResolution>."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Número de pixels por <ResolutionUnit> en la dirección <ImageLength>. Se utiliza el mismo valor que <XResolution>."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
 msgstr "Configuración planar"
 
 #: libexif/exif-tag.c:312
-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 "
-"etiqueta. Si este campo no existe, se asume el predeterminado de TIFF, 1 "
-"(por trozos)."
+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 etiqueta. Si este campo no existe, se asume el predeterminado de TIFF, 1 (por trozos)."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "Unidad de resolución"
 
 #: libexif/exif-tag.c:318
-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 "
-"(pulgadas)."
+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 (pulgadas)."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
 msgstr "Función de transferencia"
 
 #: libexif/exif-tag.c:324
-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 "
-"especifica en la etiqueta de información de espacio de color (<ColorSpace>)."
+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 especifica en la etiqueta de información de espacio de color (<ColorSpace>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Software"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-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."
+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 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."
+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."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"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."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "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."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Artista"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-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 "
-"inter-operabilidad. Cuando el campo se deja en blanco, se trata como "
-"desconocido."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+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 inter-operabilidad. Cuando el campo se deja en blanco, se trata como desconocido."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Punto blanco"
 
 #: libexif/exif-tag.c:348
-#, fuzzy
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
-"La cromaticidad del punto blanco 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>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "La cromaticidad del punto blanco 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>)."
 
 #: libexif/exif-tag.c:353
 msgid "Primary Chromaticities"
 msgstr "Cromaticidades primarias"
 
 #: libexif/exif-tag.c:354
-#, fuzzy
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"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>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space 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>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
+msgstr "Definido por Adobe Corporation para activar árboles TIFF en ficheros TIFF."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
@@ -3389,134 +2923,64 @@ msgid "JPEG Interchange Format"
 msgstr "Formato de intercambio de JPEG"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
-"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."
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "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."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
 msgstr "Longitud del formato de intercambio de JPEG"
 
 #: libexif/exif-tag.c:373
-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 ""
-"La cantidad de bytes de datos comprimidos de diapositiva JPEG. Esto no se "
-"utiliza para los datos primarios JPEG. Las diapositivas JPEG no se dividen "
-"sino que se graban como un flujo de bits contínuo desde SOI hasta EOI. No se "
-"deberían registrar marcadores Appn y COM. Las diapositivas comprimidas "
-"deberían grabarse en no más de 64 Kbytes, incluyendo todos los otros datos a "
-"grabar en APP1."
+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 "La cantidad de bytes de datos comprimidos de diapositiva JPEG. Esto no se utiliza para los datos primarios JPEG. Las diapositivas JPEG no se dividen sino que se graban como un flujo de bits contínuo desde SOI hasta EOI. No se deberían registrar marcadores Appn y COM. Las diapositivas comprimidas deberían grabarse en no más de 64 Kbytes, incluyendo todos los otros datos a grabar en APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
 msgstr "Coeficientes YCbCr"
 
 #: libexif/exif-tag.c:383
-#, fuzzy
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-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."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "Los coeficientes de la matriz para la transformación de RGB a datos de imagen YCbCr. No hay valores predeterminados en TIFF; pero aquí se utiliza el valor dado en \"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."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
 msgstr "Sub-muestreo YCbCr"
 
 #: libexif/exif-tag.c:393
-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 "
-"JPEG en vez de esta etiqueta."
+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 JPEG en vez de esta etiqueta."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
 msgstr "Posicionamiento YCbCr"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-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."
+msgid "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."
+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."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
 msgstr "Referencia Blanco/Negro"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
-"El valor de referencia de los puntos blanco y negro. En TIFF no se dan "
-"predeterminados, pero los valores de abajo se dan como predeterminados aquí. "
-"El espacio de color se declara en una etiqueta de información de espacio de "
-"color, siendo el valor predeterminado aquel que da las características de "
-"inter-operabilidad óptimas para la imagen."
+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 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."
+msgstr "El valor de referencia de los puntos blanco y negro. En TIFF no se dan predeterminados, pero los valores de abajo se dan como predeterminados aquí. El espacio de color se declara en una etiqueta de información de espacio de color, siendo el valor predeterminado aquel que da las características de inter-operabilidad óptimas para la imagen."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
-msgstr ""
+msgstr "Paquete XML"
 
 #: libexif/exif-tag.c:423
 msgid "XMP Metadata"
-msgstr ""
+msgstr "Metadatos XMP"
 
 #: libexif/exif-tag.c:438 libexif/exif-tag.c:784
 msgid "CFA Pattern"
 msgstr "Patrón CFA"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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."
+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."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
@@ -3527,225 +2991,120 @@ msgid "Copyright"
 msgstr "Copyright"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
-"Información del Copyright. En este estándar la etiqueta se utiliza para "
-"indicar tanto el copyright del fotógrafo como el del editor. Es la nota de "
-"copyright de la persona u Organización que reclama derechos sobre la imagen. "
-"En este campo debería escribirse la declaración de copyrtight de inter-"
-"operabilidad, incluyendo la fecha y los derechos; ej: \"Copyright, Juan "
-"Perez, 20xx. Todos los derechos reservados.\" En este estándar el campo "
-"registra tanto al copyright del fotógrafo como el del editor, con cada uno "
-"registrado en una parte separada de la declaración. Cuando hay una "
-"distinción clara entre ambos copyrights, primero debería escribirse el del "
-"fotógrafo seguido por el del editor, separados por NULL (en este caso, "
-"debido a que la declaración también termina con un NULL, hay dos códigos "
-"NULL) (vea el ejemplo 1). Cuando se da sólo el del fotógrafo, está terminado "
-"por un código NULL (vea el ejemplo 2). Cuando se da sólo el del editor, la "
-"parte del copyright del fotógrafo consiste de un espacio seguido de un "
-"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."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Información del Copyright. En este estándar la etiqueta se utiliza para indicar tanto el copyright del fotógrafo como el del editor. Es la nota de copyright de la persona u Organización que reclama derechos sobre la imagen. En este campo debería escribirse la declaración de copyrtight de inter-operabilidad, incluyendo la fecha y los derechos; ej: \"Copyright, Juan Perez, 20xx. Todos los derechos reservados.\" En este estándar el campo registra tanto al copyright del fotógrafo como el del editor, con cada uno registrado en una parte separada de la declaración. Cuando hay una distinción clara entre ambos copyrights, primero debería escribirse el del fotógrafo seguido por el del editor, separados por NULL (en este caso, debido a que la declaración también termina con un NULL, hay dos códigos NULL) (vea el ejemplo 1). Cuando se da sólo el del fotógrafo, está terminado por un código NULL (vea el ejemplo 2). Cuando se da sólo el del editor, la parte del copyright del fotógrafo consiste de un espacio seguido de un 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."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Tiempo de exposición, dado en segundos (seg)."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-#, fuzzy
-msgid "F-Number"
-msgstr "El número F."
-
 #: libexif/exif-tag.c:470
 msgid "The F number."
-msgstr "El número F."
+msgstr "Número F."
 
 #: libexif/exif-tag.c:475
 msgid "Image Resources Block"
-msgstr ""
+msgstr "Bloque de recursos de la imagen"
 
 #: libexif/exif-tag.c:477
-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 ""
-"Un puntero al IFD Exif. Inter-operabilidad, el IFD Exif tiene la misma "
-"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."
+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 "Un puntero al IFD Exif. Inter-operabilidad, el IFD Exif tiene la misma 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."
 
 #: libexif/exif-tag.c:485
-#, fuzzy
 msgid "Exposure Program"
-msgstr "Modo de exposición"
+msgstr "Programa de exposición"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"La clase de programa utilizado por la cámara para ajustar la exposición "
-"cuando se toma la foto."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "La clase de programa utilizado por la cámara para ajustar la exposición cuando se toma la foto."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
 msgstr "Sensibilidad espectral"
 
 #: libexif/exif-tag.c:491
-#, fuzzy
-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 ""
-"Indica la sensibilidad espectral de cada canal de la cámara utilizada. El "
-"valor de la etiqueta es una cadena de caracteres ASCII compatible con el "
-"estándar desarrollado por el ASTM Tecnical committee."
+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 "Indica la sensibilidad espectral de cada canal de la cámara utilizada. El valor de la etiqueta es una cadena de caracteres ASCII compatible con el estándar desarrollado por el ASTM Tecnical Committee."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
-msgstr ""
+msgstr "Puntero a la información IFD del GPS"
 
 #: libexif/exif-tag.c:497
-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 ""
-"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."
+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 "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."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
 msgstr "Velocidad ISO"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
-"Indica la velocidad ISO y la latitud ISO de la cámara o dispositivo de "
-"entrada como se especifica en ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Indica la velocidad ISO y la latitud ISO de la cámara o dispositivo de entrada como se especifica en ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
-msgstr ""
+msgstr "Función de conversión optoelectrónica"
 
 #: libexif/exif-tag.c:508
-#, fuzzy
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-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."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+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."
 
 #: libexif/exif-tag.c:513
 msgid "Time Zone Offset"
-msgstr ""
+msgstr "Diferencia de la zona horaria"
 
 #: libexif/exif-tag.c:514
 msgid "Encodes time zone of camera clock relative to GMT."
-msgstr ""
+msgstr "Codifica la zona horaria del reloj de la cámara con referencia a GMT."
 
 #: libexif/exif-tag.c:515
 msgid "Exif Version"
 msgstr "Versión Exif"
 
 #: libexif/exif-tag.c:516
-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."
+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."
 
 #: libexif/exif-tag.c:520
-#, fuzzy
 msgid "Date and Time (Original)"
 msgstr "Fecha y Hora (original)"
 
 #: libexif/exif-tag.c:521
-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 ""
-"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."
+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 "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."
 
 #: libexif/exif-tag.c:526
-#, fuzzy
 msgid "Date and Time (Digitized)"
 msgstr "Fecha y Hora (digitalizado)"
 
 #: libexif/exif-tag.c:527
-#, 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."
+msgstr "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
 #: libexif/exif-tag.c:530
-#, fuzzy
 msgid "Components Configuration"
-msgstr "Configuración planar"
+msgstr "Configuración de componentes"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
-"Información específica de los datos comprimidos. Los canales de cada "
-"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 "
-"permitir el soporte de otras secuencias."
+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 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."
+msgstr "Información específica de los datos comprimidos. Los canales de cada 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 permitir el soporte de otras secuencias."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
 msgstr "Bits comprimidos por pixel"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
-"Información específica sobre los datos comprimidos. El modo de compresión "
-"utilizado para una imagen comprimida está indicado en unidades de bits por "
-"pixel."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Información específica sobre los datos comprimidos. El modo de compresión utilizado para una imagen comprimida está indicado en unidades de bits por pixel."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
-#, fuzzy
 msgid "Shutter Speed"
 msgstr "Velocidad del obturador"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
-"Velocidad del obturador. La unidad es el ajuste APEX (Sistema aditivo de "
-"exposición fotográfica)."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Velocidad del obturador. La unidad es el ajuste APEX (Sistema aditivo de exposición fotográfica)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
@@ -3756,38 +3115,24 @@ msgid "Brightness"
 msgstr "Brillo"
 
 #: libexif/exif-tag.c:554
-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 ""
-"El valor del brillo. La unidad es el valor APEX. Por lo general, se da en el "
-"rango de -99,99 a 99,99."
+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 "El valor del brillo. La unidad es el valor APEX. Por lo general, se da en el rango de -99,99 a 99,99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
 msgstr "Ajuste de exposición"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
-"El ajuste de exposición. La unidad es el valor APEX. Por lo general, se da "
-"en el rango -99,99 a 99,99."
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "El ajuste de exposición. La unidad es el valor APEX. Por lo general, se da en el rango -99,99 a 99,99."
 
 #: libexif/exif-tag.c:562
-#, fuzzy
 msgid "Maximum Aperture Value"
-msgstr "Apertura"
+msgstr "Valor máximo de apertura"
 
 #: libexif/exif-tag.c:563
-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 ""
-"El valor F más pequeño de la lente. La unidad es el valor APEX. Por lo "
-"general, se da en el rango de 00,00 a 99,99 pero no está limitado a dicho "
-"rango."
+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 "El valor F más pequeño de la lente. La unidad es el valor APEX. Por lo general, se da en el rango de 00,00 a 99,99 pero no está limitado a dicho rango."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
@@ -3810,175 +3155,104 @@ msgid "The kind of light source."
 msgstr "El tipo de fuente de luz."
 
 #: libexif/exif-tag.c:578
-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)."
+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)."
 
 #: libexif/exif-tag.c:582
-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 ""
-"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."
+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 "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."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr "�rea del sujeto"
 
 #: libexif/exif-tag.c:586
-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."
+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."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
-msgstr ""
+msgstr "ID estándar TIFF/EP"
 
 #: libexif/exif-tag.c:591
 msgid "Maker Note"
 msgstr "Nota del fabricante"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Una etiqueta para que los fabricantes o escritores Exif registren cualquier "
-"información deseada. El contenido queda a cargo del fabricante."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Una etiqueta para que los fabricantes o escritores Exif registren cualquier información deseada. El contenido queda a cargo del fabricante."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
 msgstr "Comentario del usuario"
 
 #: libexif/exif-tag.c:596
-#, fuzzy
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
-"Una etiqueta para que los usuarios de Exif escriban palabras clave o "
-"comentarios en la imagen además de los de <ImageDescription>, y sin "
-"limitaciones en la codificación de caracteres de dicha etiqueta. El código "
-"de caracteres utilizado en esta etiqueta se identifica basándose en un "
-"código ID en un área fija de 8 bytes al comienzo del área de datos de la "
-"etiqueta. La porción no utilizada del área se completa con NULL (\"00.h\"). "
-"Los códigos ID se asignan por medio de registro. En la tabla 6 se dan el "
-"método de designación y referencias para cada código de caracter. El valor "
-"de CountN está determinado basado en los 8 bytes en el área de código de "
-"caracter y la cantidad de bytes en la parte del comentario del usuario. Dado "
-"que TYPE no es ASCII, no es necesaria la terminación NULL (ver fig. 9). El "
-"código ID para el área <UserComment> puede ser un código definido como JIS o "
-"ASCII, o puede ser no definido. El nombre no definido es UndefinedText, y el "
-"código ID se completa con 8 bytes de todos \"NULL\" (\"00.H\"). Un lector "
-"Exif que lee la etiqueta <UserComment> debe tener una función para "
-"determinar el código ID. Esta función no se necesita en lectores Exif que no "
-"usan la etiqueta <UserComment> (ver tabla 7). Cuando se deja a un lado el "
-"área <UserComment>, se recomienda que el código ID sea ASCII y que se "
-"complete la parte de comentario de usuario siguiente con caracteres espacio "
-"[20.H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "Una etiqueta para que los usuarios de Exif escriban palabras clave o comentarios en la imagen además de los de <ImageDescription>, y sin limitaciones en la codificación de caracteres de dicha etiqueta. El código de caracteres utilizado en esta etiqueta se identifica basándose en un código ID en un área fija de 8 bytes al comienzo del área de datos de la etiqueta. La porción no utilizada del área se completa con NULL (\"00.h\"). Los códigos ID se asignan por medio de registro. En las especificaciones se dan el método de designación y referencias para cada código de caracter. El valor de CountN está determinado basado en los 8 bytes en el área de código de caracter y la cantidad de bytes en la parte del comentario del usuario. Dado que TYPE no es ASCII, no es necesaria la terminación NULL. El código ID para el área <UserComment> puede ser un código definido como JIS o ASCII, o puede ser no definido. El nombre no definido es UndefinedText, y el código ID se completa con 8 bytes de todos \"NULL\" (\"00.H\"). Un lector Exif que lee la etiqueta <UserComment> debe tener una función para determinar el código ID. Esta función no se necesita en lectores Exif que no usan la etiqueta <UserComment>. Cuando se deja a un lado el área <UserComment>, se recomienda que el código ID sea ASCII y que se complete la parte de comentario de usuario siguiente con caracteres espacio [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
-msgstr ""
+msgstr "Fracción de segundo"
 
 #: libexif/exif-tag.c:620
 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>."
+msgstr "Una etiqueta utilizada para registrar fracciones de segundo para la etiqueta <DateTime>."
 
 #: libexif/exif-tag.c:624
-#, fuzzy
 msgid "Sub-second Time (Original)"
-msgstr "Fecha y Hora (original)"
+msgstr "Fracción de segundo (original)"
 
 #: libexif/exif-tag.c:625
-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>."
+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>."
 
 #: libexif/exif-tag.c:629
-#, fuzzy
 msgid "Sub-second Time (Digitized)"
-msgstr "Fecha y Hora (digitalizado)"
+msgstr "Fracción de segundo (digitalizado)"
 
 #: libexif/exif-tag.c:630
-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>."
+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>."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
-msgstr ""
+msgstr "Título XP"
 
 #: libexif/exif-tag.c:635
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
-msgstr ""
+msgstr "Cadena de caracteres del título de la imagen, codificada en UTF-16LE."
 
 #: libexif/exif-tag.c:639
-#, fuzzy
 msgid "XP Comment"
-msgstr "Comentario del usuario"
+msgstr "Comentario XP"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
-msgstr ""
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
+msgstr "Cadena de caracters que contiene un comentario sobre la imagen, codificado en UTF-16LE."
 
 #: libexif/exif-tag.c:644
 msgid "XP Author"
-msgstr ""
+msgstr "Autor XP"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
-msgstr ""
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
+msgstr "Cadena de caracteres que contiene el nombre del creador de la imagen, codificado en UTF-16LE."
 
 #: libexif/exif-tag.c:649
 msgid "XP Keywords"
-msgstr ""
+msgstr "Palabras clave XP"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "Cadena de caracteres que contiene el nombre del creador de la imagen, codificado en UTF-16LE."
 
 #: libexif/exif-tag.c:654
-#, fuzzy
 msgid "XP Subject"
-msgstr "�rea del sujeto"
+msgstr "Tema XP"
 
 #: libexif/exif-tag.c:655
 msgid "A character string giving the image subject, encoded in UTF-16LE."
-msgstr ""
+msgstr "Cadena de caracteres del de la imagen, codificado en UTF-16LE."
 
 #: libexif/exif-tag.c:659
 msgid "The FlashPix format version supported by a FPXR file."
@@ -3989,233 +3263,96 @@ msgid "Color Space"
 msgstr "Espacio de color"
 
 #: libexif/exif-tag.c:662
-#, fuzzy
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
-"La etiqueta de información de espacio de color (<ColorSpace>) siempre se "
-"registra como el especificador de espacio de color. Normalmente se utiliza "
-"sRGB (=1) para definir el espacio de color basado en las condiciones "
-"ambientales y del monitor de la PC. Si se utiliza un espacio de color "
-"distinto a sRGB, se ajusta en Uncalibrated (=FFFF.H). Los datos de imagen "
-"registrados como no calibrados pueden tratarse como sRGB cuando se convierte "
-"a FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "La etiqueta de información de espacio de color siempre se registra como el especificador de espacio de color. Normalmente se utiliza sRGB (=1) para definir el espacio de color basado en las condiciones ambientales y del monitor de la PC. Si se utiliza un espacio de color distinto a sRGB, se ajusta en Uncalibrated (=FFFF.H). Los datos de imagen registrados como no calibrados pueden tratarse como sRGB cuando se convierte a FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
-msgstr ""
+msgstr "Dimensión X del pixel"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
-"Información específica a los datos comprimidos. Cuando se registra un "
-"archivo comprimido, el ancho válido de la imagen significativa se debe "
-"registrar en esta etiqueta, haya o no datos de colchón o una marca de "
-"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."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Información específica a los datos comprimidos. Cuando se registra un archivo comprimido, el ancho válido de la imagen significativa se debe registrar en esta etiqueta, haya o no datos de colchón o una marca de reinicio. Esta etiqueta no debería existir en un archivo no comprimido."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
-msgstr ""
+msgstr "Dimensión Y del pixel"
 
 #: libexif/exif-tag.c:678
-#, fuzzy
-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, "
-"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."
-msgstr ""
-"Información específica a los datos comprimidos. Cuando se registra un "
-"archivo comprimido, la altura válida de la imagen significativa debería "
-"registrarse en esta etiqueta, haya o no datos de colchón o una marca de "
-"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. Dado que no es necesario "
-"el colchón de datos en la dirección vertical, la cantidad de líneas "
-"registradas en esta etiqueta válida de altura de imagen será, de hecho, la "
-"misma que la registrada en el SOF."
+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, 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."
+msgstr "Información específica a los datos comprimidos. Cuando se registra un archivo comprimido, la altura válida de la imagen significativa debería registrarse en esta etiqueta, haya o no datos de colchón o una marca de reinicio. Esta etiqueta no debería existir en un archivo no comprimido. Dado que no es necesario el colchón de datos en la dirección vertical, la cantidad de líneas registradas en esta etiqueta válida de altura de imagen será, de hecho, la misma que la registrada en el SOF."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
-msgstr ""
+msgstr "Fichero de sonido relacionado"
 
 #: libexif/exif-tag.c:689
-#, fuzzy
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the 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."
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Esta etiqueta se utiliza para registrar el nombre de un fichero de audio relacionado a los datos de imagen. La única información relacional registrada aquí es el nombre y la extensión del fichero 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 y de los convenios para los nombres se dan en las especificaciones. Cuando se usa esta etiqueta, los ficheros 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. La asociación de ficheros de imágenes y de ficheros de audio Exif se realiza de cualquiera de las tres maneras [1], [2] y [3].  Si hay múltiples ficheros asociados a un solo fichero como en [2] o [3], el formato anterior se usa para registrar sólo un nombre de fichero de audio.  Si hay múltiples ficheros de audio, se da el primero grabado. En el caso de [3], por ejemplo, para el fichero de imagen Exif \"DSC00001.JPG\" solo se da \"SND00001.WAV\" como ficherode audio Exif relacionado. Cuando hay tres ficheros de audio Exif, \"SND00001.WAV\", \"SND00002.WAV\" y \"SND00003.WAV\", se indica el nombre de fichero 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 ficheros de audio, también se debe indicar al final del fichero de audio la relación a los datos de la imagen."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
-msgstr ""
+msgstr "Puntero IFD de interoperabilidad"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
-"El IFD de interoperabilidad está compuesto de etiquetas que almacenan la "
-"información para asegurar la interoperabilidad y apuntado por la etiqueta "
-"siguiente ubicada en el IFD Exif. La estructura de interoperabilidad de el "
-"IFD de interoperabilidad es la misma que la estructura IFD definida por "
-"TIFF, pero no contiene los datos de imagen característicos del IFD normal de "
-"TIFF."
+msgid "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."
+msgstr "El IFD de interoperabilidad está compuesto de etiquetas que almacenan la información para asegurar la interoperabilidad y apuntado por la etiqueta siguiente ubicada en el IFD Exif. La estructura de interoperabilidad de el IFD de interoperabilidad es la misma que la estructura IFD definida por TIFF, pero no contiene los datos de imagen característicos del IFD normal de TIFF."
 
 #: libexif/exif-tag.c:729
 msgid "Flash Energy"
 msgstr "Energía del flash"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
-"Indica la energía del flash en el momento que se captura la imagen, medida "
-"en Beam Candle Power Seconds (BCPS)."
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Indica la energía del flash en el momento que se captura la imagen, medida en Beam Candle Power Seconds (BCPS)."
 
 #: libexif/exif-tag.c:734
 msgid "Spatial Frequency Response"
 msgstr "Respuesta en frecuencia espacial"
 
 #: libexif/exif-tag.c:735
-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 ""
-"Este etiqueta registra la tabla de frecuencia espacial de la cámara o "
-"dispositivo de entrada y los valores SFR en las direcciones de ancho, alto y "
-"diagonal de la imagen, como se especifica en ISO 12233."
+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 "Este etiqueta registra la tabla de frecuencia espacial de la cámara o dispositivo de entrada y los valores SFR en las direcciones de ancho, alto y diagonal de la imagen, como se especifica en ISO 12233."
 
 #: libexif/exif-tag.c:741
-#, fuzzy
 msgid "Focal Plane X-Resolution"
 msgstr "Resolución X del plano focal"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Indica la cantidad de pixels en la dirección del ancho (X) de la imagen por "
-"<FocalPlaneResolutionUnit> del plano focal de la cámara."
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indica la cantidad de pixels en la dirección del ancho (X) de la imagen por <FocalPlaneResolutionUnit> del plano focal de la cámara."
 
 #: libexif/exif-tag.c:746
-#, fuzzy
 msgid "Focal Plane Y-Resolution"
-msgstr "Resolución X del plano focal"
+msgstr "Resolución Y del plano focal"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Indica la cantidad de pixels en la dirección del alto (Y) de la imagen por "
-"<FocalPlaneResolutionUnit> del plano focal de la cámara."
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indica la cantidad de pixels en la dirección del alto (Y) de la imagen por <FocalPlaneResolutionUnit> del plano focal de la cámara."
 
 #: libexif/exif-tag.c:751
 msgid "Focal Plane Resolution Unit"
 msgstr "Unidad de resolución del plano focal"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
-"Indica la unidad para medir <FocalPlaneXResolution> e "
-"<FocalPlaneYResolution>. Este valor es el mismo que <ResolutionUnit>."
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Indica la unidad para medir <FocalPlaneXResolution> e <FocalPlaneYResolution>. Este valor es el mismo que <ResolutionUnit>."
 
 #: libexif/exif-tag.c:757
 msgid "Subject Location"
 msgstr "Ubicación del sujeto"
 
 #: libexif/exif-tag.c:758
-#, fuzzy
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
-"Indica la ubicación del sujeto principal de la escena. El valor de esta "
-"etiqueta representa el pixel en el centro del sujeto principal relativo al "
-"borde izquierdo, antes del proceso de rotación como lo indica la etiqueta "
-"<Rotation>. El primer valor indica el número de columna X y el segundo el "
-"número de fila Y."
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Indica la ubicación del sujeto principal de la escena. El valor de esta etiqueta representa el pixel en el centro del sujeto principal relativo al borde izquierdo, antes del proceso de rotación como lo indica la etiqueta <Rotation>. El primer valor indica el número de columna X y el segundo el número de fila Y."
 
 #: libexif/exif-tag.c:765
-#, fuzzy
 msgid "Exposure Index"
 msgstr "�ndice de exposición"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is 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."
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is 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."
 
 #: libexif/exif-tag.c:769
 msgid "Sensing Method"
@@ -4223,109 +3360,63 @@ msgstr "Método de sensado"
 
 #: libexif/exif-tag.c:770
 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."
+msgstr "Indica el tipo de sensor de imagen en la cámara o dispositivo de entrada."
 
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Fuente de archivo"
 
 #: libexif/exif-tag.c:774
-#, fuzzy
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"Indica la fuente de la imagen. Si la imagen se registró en un DSC, el valor "
-"de esta etiqueta siempre debe ser 3, indicando que la imagen se registró en "
-"un DSC."
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Indica la fuente de la imagen. Si la imagen se registró en un DSC, el valor de esta etiqueta siempre debe ser 3, indicando que la imagen se registró en un DSC."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
 msgstr "Tipo de escena"
 
 #: libexif/exif-tag.c:779
-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 ""
-"Indica el tipo de la escena. Si la imagen se registró en un DSC, el valor de "
-"esta etiqueta siempre debe ser 1, indicando que la imagen se registró en un "
-"DSC."
+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 "Indica el tipo de la escena. Si la imagen se registró en un DSC, el valor de esta etiqueta siempre debe ser 1, indicando que la imagen se registró en un DSC."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
 msgstr "Render personalizado"
 
 #: libexif/exif-tag.c:790
-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 ""
-"Esta etiqueta indica el uso de procesamiento especial en los datos de "
-"imagen, tal como el rendering de la salida. Cuando se realiza un "
-"procesamiento especial, se espera que el lector deshabilite o minimice el "
-"procesado siguiente."
+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 "Esta etiqueta indica el uso de procesamiento especial en los datos de imagen, tal como el rendering de la salida. Cuando se realiza un procesamiento especial, se espera que el lector deshabilite o minimice el procesado siguiente."
 
 #: libexif/exif-tag.c:796
-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 ""
-"Esta etiqueta indica el modo de exposición ajustado cuando se tomó la "
-"imagen. En el modo auto-bracketing, la cámara toma una serie de cuadros de "
-"la misma escena con ajustes de exposición diferentes."
+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 "Esta etiqueta indica el modo de exposición ajustado cuando se tomó la imagen. En el modo auto-bracketing, la cámara toma una serie de cuadros de la misma escena con ajustes de exposición diferentes."
 
 #: libexif/exif-tag.c:801
 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."
+msgstr "Esta etiqueta indica el modo de balance de blancos ajustado cuando se tomó la imagen."
 
 #: libexif/exif-tag.c:805
 msgid "Digital Zoom Ratio"
 msgstr "Relación de zoom digital"
 
 #: libexif/exif-tag.c:806
-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 ""
-"Esta etiqueta indica la relación del zoom digital cuando se tomó la imagen. "
-"Si el numerador del valor registrado es 0, esto indica que no se utilizó el "
-"zoom digital."
+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 "Esta etiqueta indica la relación del zoom digital cuando se tomó la imagen. Si el numerador del valor registrado es 0, esto indica que no se utilizó el zoom digital."
 
 #: libexif/exif-tag.c:811
-#, fuzzy
 msgid "Focal Length in 35mm Film"
 msgstr "Distancia focal en película de 35mm"
 
 #: libexif/exif-tag.c:812
-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 ""
-"Esta etiqueta indica la distancia focal equivalente asumiendo una cámara de "
-"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."
+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 "Esta etiqueta indica la distancia focal equivalente asumiendo una cámara de 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."
 
 #: libexif/exif-tag.c:818
 msgid "Scene Capture Type"
 msgstr "Tipo de captura de escena"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
-"Esta etiqueta indica el tipo de escena que se tomó. También se puede "
-"utilizar para registrar el modo en el cual se tomó la imagen. Note que esto "
-"difiere de la etiqueta SceneType."
+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 scene type <SceneType> tag."
+msgstr "Esta etiqueta indica el tipo de escena que se tomó. También se puede utilizar para registrar el modo en el cual se tomó la imagen. Note que esto difiere de la etiqueta <SceneType>."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
@@ -4333,46 +3424,27 @@ msgstr "Control de ganancia"
 
 #: libexif/exif-tag.c:825
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr ""
-"Esta etiqueta indica el grado del ajuste de ganancia general de imagen."
+msgstr "Esta etiqueta indica el grado del ajuste de ganancia general de imagen."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Esta etiqueta indica la dirección del procesamiento de contraste aplicado "
-"por la cámara cuando se tomó la imagen."
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Esta etiqueta indica la dirección del procesamiento de contraste aplicado por la cámara cuando se tomó la imagen."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Esta etiqueta indica la dirección del procesamiento de stauración aplicado "
-"por la cámara cuando se tomó la imagen."
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Esta etiqueta indica la dirección del procesamiento de stauración aplicado por la cámara cuando se tomó la imagen."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Esta etiqueta indica la dirección del procesamiento de nitidez aplicado por "
-"la cámara cuando se tomó la imagen."
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Esta etiqueta indica la dirección del procesamiento de nitidez aplicado por la cámara cuando se tomó la imagen."
 
 #: libexif/exif-tag.c:841
 msgid "Device Setting Description"
 msgstr "Descripción de ajuste del dispositivo"
 
 #: libexif/exif-tag.c:842
-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 ""
-"Esta etiqueta indica información sobre las condiciones de toma de la foto de "
-"un modelo de cámara en particular. La etiqueta sólo se usa para indicar las "
-"condiciones de toma de fotos en el lector."
+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 "Esta etiqueta indica información sobre las condiciones de toma de la foto de un modelo de cámara en particular. La etiqueta sólo se usa para indicar las condiciones de toma de fotos en el lector."
 
 #: libexif/exif-tag.c:848
 msgid "Subject Distance Range"
@@ -4387,231 +3459,207 @@ msgid "Image Unique ID"
 msgstr "ID único de imagen"
 
 #: libexif/exif-tag.c:852
-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 ""
-"Esta etiqueta indica un identificador asignado unívocamente a cada imagen. "
-"Se registra como una cadena de caracteres ASCII equivalente a notación "
-"hexadecimal y de una longitud fija de 128 bits."
+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 "Esta etiqueta indica un identificador asignado unívocamente a cada imagen. Se registra como una cadena de caracteres ASCII equivalente a notación hexadecimal y de una longitud fija de 128 bits."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: libexif/exif-tag.c:858
 msgid "Indicates the value of coefficient gamma."
-msgstr ""
+msgstr "Indica el valor del coeficiente gamma"
 
 #: libexif/exif-tag.c:860
 msgid "PRINT Image Matching"
-msgstr ""
+msgstr "PRINT Image Matching"
 
 #: libexif/exif-tag.c:861
 msgid "Related to Epson's PRINT Image Matching technology"
-msgstr ""
+msgstr "Relacionado con la tecnología PRINT Image Matching de Epson"
 
 #: libexif/exif-tag.c:863
 msgid "Padding"
-msgstr ""
+msgstr "Relleno"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Esta etiqueta reserva espacio que puede recuperarse más adelante cuando se añadan metadatos adicionales. Los nuevos metadatos pueden escribirse reemplazando esta etiqueta por un conjunto de datos más pequeño y utilizando el espacio recuperado para almacenar las etiquetas de metadatos nuevos o ampliados."
 
 #: libexif/fuji/mnote-fuji-entry.c:62
-#, fuzzy
 msgid "Softest"
-msgstr "Suave"
+msgstr "El más suave"
 
 #: libexif/fuji/mnote-fuji-entry.c:66
-#, fuzzy
 msgid "Hardest"
-msgstr "Duro"
+msgstr "El más duro"
 
 #: libexif/fuji/mnote-fuji-entry.c:67 libexif/fuji/mnote-fuji-entry.c:96
 msgid "Medium soft"
-msgstr ""
+msgstr "Moderadamente suave"
 
 #: libexif/fuji/mnote-fuji-entry.c:68 libexif/fuji/mnote-fuji-entry.c:94
 msgid "Medium hard"
-msgstr ""
+msgstr "Moderadamente duro"
 
 #: libexif/fuji/mnote-fuji-entry.c:69 libexif/fuji/mnote-fuji-entry.c:90
 #: libexif/fuji/mnote-fuji-entry.c:98 libexif/fuji/mnote-fuji-entry.c:182
 msgid "Film simulation mode"
-msgstr ""
+msgstr "Modo de simulación de película"
 
 #: libexif/fuji/mnote-fuji-entry.c:79
 msgid "Incandescent"
-msgstr ""
+msgstr "Incandescente"
 
 #: libexif/fuji/mnote-fuji-entry.c:85
 msgid "Medium high"
-msgstr ""
+msgstr "Moderadamente alto"
 
 #: libexif/fuji/mnote-fuji-entry.c:87
 msgid "Medium low"
-msgstr ""
+msgstr "Moderadamente bajo"
 
 #: libexif/fuji/mnote-fuji-entry.c:88 libexif/fuji/mnote-fuji-entry.c:97
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #: libexif/fuji/mnote-fuji-entry.c:124 libexif/pentax/mnote-pentax-entry.c:164
 #: libexif/pentax/mnote-pentax-entry.c:299
-#, fuzzy
 msgid "Program AE"
-msgstr "Programa normal"
+msgstr "Programa AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:125
-#, fuzzy
 msgid "Natural photo"
-msgstr "Saturación"
+msgstr "Fotografía natural"
 
 #: libexif/fuji/mnote-fuji-entry.c:126
-#, fuzzy
 msgid "Vibration reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Reducción de la vibración"
 
 #: libexif/fuji/mnote-fuji-entry.c:127
 msgid "Sunset"
-msgstr ""
+msgstr "Puesta de sol"
 
 #: libexif/fuji/mnote-fuji-entry.c:128 libexif/pentax/mnote-pentax-entry.c:181
 msgid "Museum"
-msgstr ""
+msgstr "Museo"
 
 #: libexif/fuji/mnote-fuji-entry.c:129
-#, fuzzy
 msgid "Party"
-msgstr "Parcial"
+msgstr "Fiesta"
 
 #: libexif/fuji/mnote-fuji-entry.c:130
 msgid "Flower"
-msgstr ""
+msgstr "Flores"
 
 #: libexif/fuji/mnote-fuji-entry.c:131 libexif/pentax/mnote-pentax-entry.c:176
 msgid "Text"
-msgstr ""
+msgstr "Texto"
 
 #: libexif/fuji/mnote-fuji-entry.c:132
-#, fuzzy
 msgid "NP & flash"
-msgstr "Flash"
+msgstr "NP & flash"
 
 #: libexif/fuji/mnote-fuji-entry.c:137
-#, fuzzy
 msgid "Aperture priority AE"
-msgstr "Prioridad de apertura"
+msgstr "Prioridad de apertura AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:138
-#, fuzzy
 msgid "Shutter priority AE"
-msgstr "Prioridad del obturador"
+msgstr "Prioridad del obturador AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:146
-#, fuzzy
 msgid "F-Standard"
-msgstr "Estándar"
+msgstr "Estándar F"
 
 #: libexif/fuji/mnote-fuji-entry.c:147
 msgid "F-Chrome"
-msgstr ""
+msgstr "Color F"
 
 #: libexif/fuji/mnote-fuji-entry.c:148
 msgid "F-B&W"
-msgstr ""
+msgstr "B&N F"
 
 #: libexif/fuji/mnote-fuji-entry.c:151
 msgid "No blur"
-msgstr ""
+msgstr "Sin desenfoque"
 
 #: libexif/fuji/mnote-fuji-entry.c:152
 msgid "Blur warning"
-msgstr ""
+msgstr "Aviso de desenfoque"
 
 #: libexif/fuji/mnote-fuji-entry.c:155
-#, fuzzy
 msgid "Focus good"
-msgstr "Modo de exposición"
+msgstr "enfocado"
 
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
-msgstr ""
+msgstr "desenfocado"
 
 #: libexif/fuji/mnote-fuji-entry.c:159
 msgid "AE good"
-msgstr ""
+msgstr "exposición automática buena"
 
 #: libexif/fuji/mnote-fuji-entry.c:160
 msgid "Over exposed"
-msgstr ""
+msgstr "Sobre expuesto"
 
 #: libexif/fuji/mnote-fuji-entry.c:164
 msgid "Wide"
-msgstr ""
+msgstr "Ancho"
 
 #: libexif/fuji/mnote-fuji-entry.c:167
-#, fuzzy
 msgid "F0/Standard"
-msgstr "Estándar"
+msgstr "F0/Estándar"
 
 #: libexif/fuji/mnote-fuji-entry.c:168
-#, fuzzy
 msgid "F1/Studio portrait"
-msgstr "retrato"
+msgstr "F1/Retrato estudio"
 
 #: libexif/fuji/mnote-fuji-entry.c:169
 msgid "F1a/Professional portrait"
-msgstr ""
+msgstr "F1a/Retrato profesional"
 
 #: libexif/fuji/mnote-fuji-entry.c:170
 msgid "F1b/Professional portrait"
-msgstr ""
+msgstr "F1b/Retrato profesional"
 
 #: libexif/fuji/mnote-fuji-entry.c:171
 msgid "F1c/Professional portrait"
-msgstr ""
+msgstr "F1c/Retrato profesional"
 
 #: libexif/fuji/mnote-fuji-entry.c:172
 msgid "F2/Fujichrome"
-msgstr ""
+msgstr "F2/Fujichrome"
 
 #: libexif/fuji/mnote-fuji-entry.c:173
 msgid "F3/Studio portrait Ex"
-msgstr ""
+msgstr "F3/Retrato estudio Ex"
 
 #: libexif/fuji/mnote-fuji-entry.c:174
 msgid "F4/Velvia"
-msgstr ""
+msgstr "F4/Velvia"
 
 #: libexif/fuji/mnote-fuji-entry.c:177
 msgid "Auto (100-400%)"
-msgstr ""
+msgstr "Auto (100-400%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:179
-#, fuzzy
 msgid "Standard (100%)"
-msgstr "Estándar"
+msgstr "Estándar (100%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:180
 msgid "Wide1 (230%)"
-msgstr ""
+msgstr "Ancho1 (230%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:181
 msgid "Wide2 (400%)"
-msgstr ""
+msgstr "Ancho2 (400%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:263
 #, c-format
 msgid "%2.2f mm"
-msgstr ""
+msgstr "%2.2f mm"
 
 #: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
 #: libexif/pentax/mnote-pentax-entry.c:451
@@ -4620,356 +3668,326 @@ msgid "%i bytes unknown data"
 msgstr "%i bytes de datos desconocidos"
 
 #: libexif/fuji/mnote-fuji-tag.c:36
-#, fuzzy
 msgid "Maker Note Version"
-msgstr "Nota del fabricante"
+msgstr "Versión de la nota del fabricante"
 
 #: libexif/fuji/mnote-fuji-tag.c:37
 msgid "This number is unique and based on the date of manufacture."
-msgstr ""
+msgstr "Este número es único y se establece en la fecha de fabricación."
 
 #: libexif/fuji/mnote-fuji-tag.c:41
-#, fuzzy
 msgid "Chromaticity Saturation"
-msgstr "Saturación"
+msgstr "Saturación de la cromaticidad"
 
 #: libexif/fuji/mnote-fuji-tag.c:44
 msgid "Flash Firing Strength Compensation"
-msgstr ""
+msgstr "Compensación de la fuerza de disparo del flash"
 
 #: libexif/fuji/mnote-fuji-tag.c:46
-#, fuzzy
 msgid "Focusing Mode"
-msgstr "Modo de exposición"
+msgstr "Modo de enfoque"
 
 #: libexif/fuji/mnote-fuji-tag.c:47
-#, fuzzy
 msgid "Focus Point"
-msgstr "Modo de exposición"
+msgstr "Punto de enfoque"
 
 #: libexif/fuji/mnote-fuji-tag.c:48
 msgid "Slow Synchro Mode"
-msgstr ""
+msgstr "Modo de sincronismo lento"
 
 #: libexif/fuji/mnote-fuji-tag.c:49 libexif/pentax/mnote-pentax-tag.c:72
-#, fuzzy
 msgid "Picture Mode"
-msgstr "Modo de exposición"
+msgstr "Modo de cuadro"
 
 #: libexif/fuji/mnote-fuji-tag.c:50
 msgid "Continuous Taking"
-msgstr ""
+msgstr "Toma continua"
 
 #: libexif/fuji/mnote-fuji-tag.c:51
 msgid "Continuous Sequence Number"
-msgstr ""
+msgstr "Número de secuencia continuo"
 
 #: libexif/fuji/mnote-fuji-tag.c:52
 msgid "FinePix Color"
-msgstr ""
+msgstr "Color FinePix"
 
 #: libexif/fuji/mnote-fuji-tag.c:53
 msgid "Blur Check"
-msgstr ""
+msgstr "Comprobación de desenfoque"
 
 #: libexif/fuji/mnote-fuji-tag.c:54
 msgid "Auto Focus Check"
-msgstr ""
+msgstr "Comprobación del enfoque automático"
 
 #: libexif/fuji/mnote-fuji-tag.c:55
-#, fuzzy
 msgid "Auto Exposure Check"
-msgstr "Exposición automática"
+msgstr "Comprobación de la exposición automática"
 
 #: libexif/fuji/mnote-fuji-tag.c:56
 msgid "Dynamic Range"
-msgstr ""
+msgstr "Margen dinámico"
 
 #: libexif/fuji/mnote-fuji-tag.c:57
 msgid "Film Simulation Mode"
-msgstr ""
+msgstr "Modo de simulación de película"
 
 #: libexif/fuji/mnote-fuji-tag.c:58
 msgid "Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Modo de margen dinámico amplio"
 
 #: libexif/fuji/mnote-fuji-tag.c:59
 msgid "Development Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Modo de margen dinámico amplio de desarrollo"
 
 #: libexif/fuji/mnote-fuji-tag.c:60
-#, fuzzy
 msgid "Minimum Focal Length"
-msgstr "Distancia focal"
+msgstr "Distancia focal mínima"
 
 #: libexif/fuji/mnote-fuji-tag.c:61
-#, fuzzy
 msgid "Maximum Focal Length"
-msgstr "Distancia focal"
+msgstr "Distancia focal máxima"
 
 #: libexif/fuji/mnote-fuji-tag.c:62
 msgid "Maximum Aperture at Minimum Focal"
-msgstr ""
+msgstr "Máxima apertura en la distancia focal mínima"
 
 #: libexif/fuji/mnote-fuji-tag.c:63
 msgid "Maximum Aperture at Maximum Focal"
-msgstr ""
+msgstr "Máxima apertura en la distancia focal máxima"
 
 #: libexif/fuji/mnote-fuji-tag.c:65
-#, fuzzy
 msgid "Order Number"
-msgstr "El número F."
+msgstr "Número de orden"
 
 #: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
-#, fuzzy
 msgid "Frame Number"
-msgstr "El número F."
+msgstr "Número de imagen"
 
 #: libexif/olympus/mnote-olympus-entry.c:49
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid format '%s', expected '%s' or '%s'."
-msgstr "Formato no válido '%s', se esperaba '%s'."
+msgstr "Formato no válido '%s', se esperaba '%s' o '%s'."
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF non D lens"
-msgstr ""
+msgstr "Lente AF no D"
 
 #: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D or AF-S lens"
-msgstr ""
+msgstr "Lente AF-D o AF-S"
 
 #: libexif/olympus/mnote-olympus-entry.c:95
 msgid "AF-D G lens"
-msgstr ""
+msgstr "Lente AF-D G"
 
 #: libexif/olympus/mnote-olympus-entry.c:96
 msgid "AF-D VR lens"
-msgstr ""
+msgstr "Lente AF-D VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "AF-D G VR lens"
-msgstr ""
+msgstr "Lente AF-D G VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:101
 msgid "Flash unit unknown"
-msgstr ""
+msgstr "Unidad de flash desconocida"
 
 #: libexif/olympus/mnote-olympus-entry.c:102
 msgid "Flash is external"
-msgstr ""
+msgstr "El flash es externo"
 
 #: libexif/olympus/mnote-olympus-entry.c:103
-#, fuzzy
 msgid "Flash is on camera"
-msgstr "Energía del flash"
+msgstr "El flash está en la cámara"
 
 #: libexif/olympus/mnote-olympus-entry.c:106
 msgid "VGA basic"
-msgstr ""
+msgstr "VGA básica"
 
 #: libexif/olympus/mnote-olympus-entry.c:107
-#, fuzzy
 msgid "VGA normal"
-msgstr "normal"
+msgstr "VGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:108
 msgid "VGA fine"
-msgstr ""
+msgstr "VGA fina"
 
 #: libexif/olympus/mnote-olympus-entry.c:109
 msgid "SXGA basic"
-msgstr ""
+msgstr "SXGA básica"
 
 #: libexif/olympus/mnote-olympus-entry.c:110
-#, fuzzy
 msgid "SXGA normal"
-msgstr "normal"
+msgstr "SXGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:111
 msgid "SXGA fine"
-msgstr ""
+msgstr "SXGA fina"
 
 #: libexif/olympus/mnote-olympus-entry.c:112
 msgid "2 Mpixel basic"
-msgstr ""
+msgstr "2 Mpixel básica"
 
 #: libexif/olympus/mnote-olympus-entry.c:113
 msgid "2 Mpixel normal"
-msgstr ""
+msgstr "2 Mpixel normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:114
 msgid "2 Mpixel fine"
-msgstr ""
+msgstr "2 Mpixel fina"
 
 #: libexif/olympus/mnote-olympus-entry.c:117
-#, fuzzy
 msgid "Color"
-msgstr "Espacio de color"
+msgstr "Color"
 
 #: libexif/olympus/mnote-olympus-entry.c:122
 msgid "Bright+"
-msgstr ""
+msgstr "Brillo+"
 
 #: libexif/olympus/mnote-olympus-entry.c:123
 msgid "Bright-"
-msgstr ""
+msgstr "Brillo-"
 
 #: libexif/olympus/mnote-olympus-entry.c:124
-#, fuzzy
 msgid "Contrast+"
-msgstr "Contraste"
+msgstr "Contraste+"
 
 #: libexif/olympus/mnote-olympus-entry.c:125
-#, fuzzy
 msgid "Contrast-"
-msgstr "Contraste"
+msgstr "Contraste-"
 
 #: libexif/olympus/mnote-olympus-entry.c:128
 msgid "ISO 80"
-msgstr ""
+msgstr "ISO 80"
 
 #: libexif/olympus/mnote-olympus-entry.c:129
 msgid "ISO 160"
-msgstr ""
+msgstr "ISO 160"
 
 #: libexif/olympus/mnote-olympus-entry.c:130
 msgid "ISO 320"
-msgstr ""
+msgstr "ISO 320"
 
 #: libexif/olympus/mnote-olympus-entry.c:131
 #: libexif/olympus/mnote-olympus-entry.c:249
 msgid "ISO 100"
-msgstr ""
+msgstr "ISO 100"
 
 #: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Preset"
-msgstr ""
+msgstr "Predeterminado"
 
 #: libexif/olympus/mnote-olympus-entry.c:137
 msgid "Incandescence"
-msgstr ""
+msgstr "Incandescencia"
 
 #: libexif/olympus/mnote-olympus-entry.c:138
-#, fuzzy
 msgid "Fluorescence"
-msgstr "Fluorescente"
+msgstr "Fluorescencia"
 
 #: libexif/olympus/mnote-olympus-entry.c:140
 msgid "SpeedLight"
-msgstr ""
+msgstr "Speedlight"
 
 #: libexif/olympus/mnote-olympus-entry.c:143
 msgid "No fisheye"
-msgstr ""
+msgstr "Sin ojo de pez"
 
 #: libexif/olympus/mnote-olympus-entry.c:144
 msgid "Fisheye on"
-msgstr ""
+msgstr "Ojo de pez activado"
 
 #: libexif/olympus/mnote-olympus-entry.c:147
-#, fuzzy
 msgid "Normal, SQ"
-msgstr "Normal"
+msgstr "Normal, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:148
-#, fuzzy
 msgid "Normal, HQ"
-msgstr "Normal"
+msgstr "Normal, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:149
-#, fuzzy
 msgid "Normal, SHQ"
-msgstr "Normal"
+msgstr "Normal, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:150
-#, fuzzy
 msgid "Normal, RAW"
-msgstr "Normal"
+msgstr "Normal, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:151
-#, fuzzy
 msgid "Normal, SQ1"
-msgstr "Normal"
+msgstr "Normal, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:152
-#, fuzzy
 msgid "Normal, SQ2"
-msgstr "Normal"
+msgstr "Normal, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:153
-#, fuzzy
 msgid "Normal, super high"
-msgstr "Programa normal"
+msgstr "Normal, superalto"
 
 #: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Normal, standard"
-msgstr ""
+msgstr "Normal, estándar"
 
 #: libexif/olympus/mnote-olympus-entry.c:155
-#, fuzzy
 msgid "Fine, SQ"
-msgstr "pulg"
+msgstr "Fina, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:156
-#, fuzzy
 msgid "Fine, HQ"
-msgstr "pulg"
+msgstr "Fina, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:157
-#, fuzzy
 msgid "Fine, SHQ"
-msgstr "pulg"
+msgstr "Fina, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:158
-#, fuzzy
 msgid "Fine, RAW"
-msgstr "pulg"
+msgstr "Fina, Raw"
 
 #: libexif/olympus/mnote-olympus-entry.c:159
-#, fuzzy
 msgid "Fine, SQ1"
-msgstr "pulg"
+msgstr "Fina, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:160
-#, fuzzy
 msgid "Fine, SQ2"
-msgstr "pulg"
+msgstr "Fina, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Fine, super high"
-msgstr ""
+msgstr "Fina, superalta"
 
 #: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, SQ"
-msgstr ""
+msgstr "Super fina, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, HQ"
-msgstr ""
+msgstr "Super fina, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SHQ"
-msgstr ""
+msgstr "Super fina, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, RAW"
-msgstr ""
+msgstr "Super fina, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, SQ1"
-msgstr ""
+msgstr "Super fina, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:167
 msgid "Super fine, SQ2"
-msgstr ""
+msgstr "Super fina, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:168
 msgid "Super fine, super high"
-msgstr ""
+msgstr "Superfina, superalta"
 
 #: libexif/olympus/mnote-olympus-entry.c:169
 msgid "Super fine, high"
-msgstr ""
+msgstr "Superfina, alta"
 
 #: libexif/olympus/mnote-olympus-entry.c:172
 #: libexif/olympus/mnote-olympus-entry.c:177
@@ -4977,223 +3995,212 @@ msgstr ""
 #: libexif/olympus/mnote-olympus-entry.c:220
 #: libexif/olympus/mnote-olympus-entry.c:243
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: libexif/olympus/mnote-olympus-entry.c:183
 msgid "On (Preset)"
-msgstr ""
+msgstr "Encendido (predeterminado)"
 
 #: libexif/olympus/mnote-olympus-entry.c:188
 msgid "Fill"
-msgstr ""
+msgstr "Relleno"
 
 #: libexif/olympus/mnote-olympus-entry.c:195
-#, fuzzy
 msgid "Internal + external"
-msgstr "Flash"
+msgstr "Interno y externo"
 
 #: libexif/olympus/mnote-olympus-entry.c:224
-#, fuzzy
 msgid "Interlaced"
-msgstr "centrado"
+msgstr "Entrelazado"
 
 #: libexif/olympus/mnote-olympus-entry.c:225
 msgid "Progressive"
-msgstr ""
+msgstr "Progresivo"
 
 #: libexif/olympus/mnote-olympus-entry.c:231
 #: libexif/pentax/mnote-pentax-entry.c:85
 #: libexif/pentax/mnote-pentax-entry.c:139
 msgid "Best"
-msgstr ""
+msgstr "El mejor"
 
 #: libexif/olympus/mnote-olympus-entry.c:232
-#, fuzzy
 msgid "Adjust exposure"
-msgstr "Exposición automática"
+msgstr "Ajusta la exposición"
 
 #: libexif/olympus/mnote-olympus-entry.c:235
-#, fuzzy
 msgid "Spot focus"
-msgstr "Exposición manual"
+msgstr "Enfoque puntual"
 
 #: libexif/olympus/mnote-olympus-entry.c:236
-#, fuzzy
 msgid "Normal focus"
-msgstr "Proceso normal"
+msgstr "Enfoque normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:239
 msgid "Record while down"
-msgstr ""
+msgstr "Graba mientras se pulsa"
 
 #: libexif/olympus/mnote-olympus-entry.c:240
 msgid "Press start, press stop"
-msgstr ""
+msgstr "Pulse start, pulse stop"
 
 #: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 50"
-msgstr ""
+msgstr "ISO 50"
 
 #: libexif/olympus/mnote-olympus-entry.c:250
 msgid "ISO 200"
-msgstr ""
+msgstr "ISO 200"
 
 #: libexif/olympus/mnote-olympus-entry.c:251
 msgid "ISO 400"
-msgstr ""
+msgstr "ISO 400"
 
 #: libexif/olympus/mnote-olympus-entry.c:255
 #: libexif/pentax/mnote-pentax-entry.c:168
-#, fuzzy
 msgid "Sport"
-msgstr "Lugar"
+msgstr "Deporte"
 
 #: libexif/olympus/mnote-olympus-entry.c:256
 msgid "TV"
-msgstr ""
+msgstr "TV"
 
 #: libexif/olympus/mnote-olympus-entry.c:258
 msgid "User 1"
-msgstr ""
+msgstr "Usuario 1"
 
 #: libexif/olympus/mnote-olympus-entry.c:259
 msgid "User 2"
-msgstr ""
+msgstr "Usuario 2"
 
 #: libexif/olympus/mnote-olympus-entry.c:260
 msgid "Lamp"
-msgstr ""
+msgstr "Lámpara"
 
 #: libexif/olympus/mnote-olympus-entry.c:263
 msgid "5 frames/sec"
-msgstr ""
+msgstr "5 tramas/s"
 
 #: libexif/olympus/mnote-olympus-entry.c:264
 msgid "10 frames/sec"
-msgstr ""
+msgstr "10 tramas/s"
 
 #: libexif/olympus/mnote-olympus-entry.c:265
 msgid "15 frames/sec"
-msgstr ""
+msgstr "15 tramas/s"
 
 #: libexif/olympus/mnote-olympus-entry.c:266
 msgid "20 frames/sec"
-msgstr ""
+msgstr "20 tramas/s"
 
 #: libexif/olympus/mnote-olympus-entry.c:381
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
-msgstr ""
+msgstr "Corrección del rojo %f, corrección del azul %f"
 
 #: libexif/olympus/mnote-olympus-entry.c:388
-#, fuzzy
 msgid "No manual focus selection"
-msgstr "Balance de blanco manual"
+msgstr "Sin selección de foco manual"
 
 #: libexif/olympus/mnote-olympus-entry.c:391
 #, c-format
 msgid "%2.2f meters"
-msgstr ""
+msgstr "%2.2f metros"
 
 #: libexif/olympus/mnote-olympus-entry.c:417
 msgid "AF position: center"
-msgstr ""
+msgstr "Posición de autofoco: centro"
 
 #: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: top"
-msgstr ""
+msgstr "Posición de autofoco: arriba"
 
 #: libexif/olympus/mnote-olympus-entry.c:419
-#, fuzzy
 msgid "AF position: bottom"
-msgstr "izquierda - abajo"
+msgstr "Posición de autofoco: abajo"
 
 #: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: left"
-msgstr ""
+msgstr "Posición de autofoco: izquierda"
 
 #: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: right"
-msgstr ""
+msgstr "Posición de autofoco: derecha"
 
 #: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: upper-left"
-msgstr ""
+msgstr "Posición de autofoco: arriba-izquierda"
 
 #: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-right"
-msgstr ""
+msgstr "Posición de autofoco: izquierda-derecha"
 
 #: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: lower-left"
-msgstr ""
+msgstr "Posición de autofoco: abajo-izquierda"
 
 #: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-right"
-msgstr ""
+msgstr "Posición de autofoco: abajo-derecha"
 
 #: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: far left"
-msgstr ""
+msgstr "Posición de autofoco: lejos izquierda"
 
 #: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far right"
-msgstr ""
+msgstr "Posición de autofoco: lejos derecha"
 
 #: libexif/olympus/mnote-olympus-entry.c:428
-#, fuzzy
 msgid "Unknown AF position"
-msgstr "Versión Exif"
+msgstr "Posición de autofoco desconocida"
 
 #: libexif/olympus/mnote-olympus-entry.c:439
 #: libexif/olympus/mnote-olympus-entry.c:509
 #, c-format
 msgid "Internal error (unknown value %hi)"
-msgstr ""
+msgstr "Error interno (valor desconocido %hi)"
 
 #: libexif/olympus/mnote-olympus-entry.c:447
 #: libexif/olympus/mnote-olympus-entry.c:517
 #, c-format
 msgid "Unknown value %hi"
-msgstr ""
+msgstr "Valor desconocido %hi"
 
 #: libexif/olympus/mnote-olympus-entry.c:542
 #: libexif/olympus/mnote-olympus-entry.c:562
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown %hu"
-msgstr "Desconocido"
+msgstr "Desconocido %hu"
 
 #: libexif/olympus/mnote-olympus-entry.c:559
-#, fuzzy
 msgid "2 sec."
-msgstr " seg."
+msgstr "2 seg."
 
 #: libexif/olympus/mnote-olympus-entry.c:598
 msgid "Fast"
-msgstr ""
+msgstr "Rápido"
 
 #: libexif/olympus/mnote-olympus-entry.c:702
 msgid "Automatic"
-msgstr ""
+msgstr "Automático"
 
 #: libexif/olympus/mnote-olympus-entry.c:732
-#, fuzzy, c-format
+#, c-format
 msgid "Manual: %liK"
-msgstr "Manual"
+msgstr "Manual: %liK"
 
 #: libexif/olympus/mnote-olympus-entry.c:735
-#, fuzzy
 msgid "Manual: unknown"
-msgstr "desconocido"
+msgstr "Manual: desconocido"
 
 #: libexif/olympus/mnote-olympus-entry.c:741
 msgid "One-touch"
-msgstr ""
+msgstr "Un toque"
 
 #: libexif/olympus/mnote-olympus-entry.c:797
 #: libexif/olympus/mnote-olympus-entry.c:807
 msgid "Infinite"
-msgstr ""
+msgstr "Infinito"
 
 #: libexif/olympus/mnote-olympus-entry.c:815
 #, c-format
@@ -5202,1275 +4209,838 @@ msgstr "%i bytes de datos desconocidos: "
 
 #: libexif/olympus/mnote-olympus-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:53
-#, fuzzy
 msgid "ISO Setting"
-msgstr "Velocidad ISO"
+msgstr "Configuración ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:39
-#, fuzzy
 msgid "Color Mode (?)"
-msgstr "Espacio de color"
+msgstr "Modo color (?)"
 
 #: libexif/olympus/mnote-olympus-tag.c:42
-#, fuzzy
 msgid "Image Sharpening"
-msgstr "Longitud de la imagen"
+msgstr "Nitidez de la imagen"
 
 #: libexif/olympus/mnote-olympus-tag.c:44
-#, fuzzy
 msgid "Flash Setting"
-msgstr "Contraste"
+msgstr "Configuración del flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-#, fuzzy
 msgid "White Balance Fine Adjustment"
-msgstr "Balance de blanco"
+msgstr "Ajuste fino del balance de blancos"
 
 #: libexif/olympus/mnote-olympus-tag.c:47
-#, fuzzy
 msgid "White Balance RB"
-msgstr "Balance de blanco"
+msgstr "Balance de blancos RB"
 
 #: libexif/olympus/mnote-olympus-tag.c:49
-#, fuzzy
 msgid "ISO Selection"
-msgstr "Velocidad ISO"
+msgstr "Selección ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Preview Image IFD"
-msgstr ""
+msgstr "Previsualizar imagen IFO"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Offset of the preview image directory (IFD) inside the file."
-msgstr ""
+msgstr "Punto de comienzo del directorio de previsualización de imágenes (IFD) dentro del fichero."
 
 #: libexif/olympus/mnote-olympus-tag.c:51
-#, fuzzy
 msgid "Exposurediff ?"
-msgstr "Modo de exposición"
+msgstr "¿Diferencia de exposición?"
 
 #: libexif/olympus/mnote-olympus-tag.c:54
 msgid "Image Boundary"
-msgstr ""
+msgstr "Contorno de la imagen"
 
 #: libexif/olympus/mnote-olympus-tag.c:56
-#, fuzzy
 msgid "Flash Exposure Bracket Value"
-msgstr "Modo de exposición"
+msgstr "Valor del horquillado de exposición del flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:57
-#, fuzzy
 msgid "Exposure Bracket Value"
-msgstr "Auto bracket"
+msgstr "Valor del horquillado de exposición"
 
 #: libexif/olympus/mnote-olympus-tag.c:58
 #: libexif/olympus/mnote-olympus-tag.c:96
 msgid "Image Adjustment"
-msgstr ""
+msgstr "Ajuste de la imagen"
 
 #: libexif/olympus/mnote-olympus-tag.c:59
-#, fuzzy
 msgid "Tone Compensation"
-msgstr "Tiempo de exposición"
+msgstr "Compensación del tono"
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
-msgstr ""
+msgstr "Adaptador"
 
 #: libexif/olympus/mnote-olympus-tag.c:62
 msgid "Lens"
-msgstr ""
+msgstr "Lente"
 
 #: libexif/olympus/mnote-olympus-tag.c:63
 #: libexif/olympus/mnote-olympus-tag.c:135
 #: libexif/olympus/mnote-olympus-tag.c:185
-#, fuzzy
 msgid "Manual Focus Distance"
-msgstr "Balance de blanco manual"
+msgstr "Distancia focal manual"
 
 #: libexif/olympus/mnote-olympus-tag.c:65
-#, fuzzy
 msgid "Flash Used"
-msgstr "El flash disparó."
+msgstr "Flash usado"
 
 #: libexif/olympus/mnote-olympus-tag.c:66
-#, fuzzy
 msgid "AF Focus Position"
-msgstr "Modo de exposición"
+msgstr "Posicionamiento foco AF"
 
 #: libexif/olympus/mnote-olympus-tag.c:67
 msgid "Bracketing"
-msgstr ""
+msgstr "Horquillado"
 
 #: libexif/olympus/mnote-olympus-tag.c:69
-#, fuzzy
 msgid "Lens F Stops"
-msgstr "Tipo de escena"
+msgstr "Bloqueo de la apertura (F) del diafragma"
 
 #: libexif/olympus/mnote-olympus-tag.c:70
-#, fuzzy
 msgid "Contrast Curve"
-msgstr "Contraste"
+msgstr "Curva de contraste"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
 #: libexif/olympus/mnote-olympus-tag.c:95
 #: libexif/pentax/mnote-pentax-tag.c:134
-#, fuzzy
 msgid "Color Mode"
-msgstr "Espacio de color"
+msgstr "Modo color"
 
 #: libexif/olympus/mnote-olympus-tag.c:72
-#, fuzzy
 msgid "Light Type"
-msgstr "Fuente de luz"
+msgstr "Tipo de luz"
 
 #: libexif/olympus/mnote-olympus-tag.c:74
 msgid "Hue Adjustment"
-msgstr ""
+msgstr "Ajuste de tonalidades"
 
 #: libexif/olympus/mnote-olympus-tag.c:76
 #: libexif/olympus/mnote-olympus-tag.c:163
 #: libexif/pentax/mnote-pentax-tag.c:108
-#, fuzzy
 msgid "Noise Reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Reducción de ruido"
 
 #: libexif/olympus/mnote-olympus-tag.c:79
 msgid "Sensor Pixel Size"
-msgstr ""
+msgstr "Tamaño de pixel del sensor"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
-#, fuzzy
 msgid "Image Data Size"
-msgstr "Ancho de la imagen"
+msgstr "Tamaño de los datos de la imagen"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
 msgid "Size of compressed image data in bytes."
-msgstr ""
+msgstr "Tamaño en bytes de los datos de la imagen comprimida"
 
 #: libexif/olympus/mnote-olympus-tag.c:84
 msgid "Total Number of Pictures Taken"
-msgstr ""
+msgstr "Número total de fotografías realizadas"
 
 #: libexif/olympus/mnote-olympus-tag.c:86
 msgid "Optimize Image"
-msgstr ""
+msgstr "Optimizar imagen"
 
 #: libexif/olympus/mnote-olympus-tag.c:88
-#, fuzzy
 msgid "Vari Program"
-msgstr "Programa normal"
+msgstr "Programa Vari"
 
 #: libexif/olympus/mnote-olympus-tag.c:89
 msgid "Capture Editor Data"
-msgstr ""
+msgstr "Datos del editor de captura"
 
 #: libexif/olympus/mnote-olympus-tag.c:90
 msgid "Capture Editor Version"
-msgstr ""
+msgstr "Versión del editor de captura"
 
 #: libexif/olympus/mnote-olympus-tag.c:97
 #: libexif/olympus/mnote-olympus-tag.c:183
-#, fuzzy
 msgid "CCD Sensitivity"
-msgstr "Sensibilidad espectral"
+msgstr "Sensibilidad CCD"
 
 #: libexif/olympus/mnote-olympus-tag.c:99
-#, fuzzy
 msgid "Focus"
-msgstr "Modo de exposición"
+msgstr "Foco"
 
 #: libexif/olympus/mnote-olympus-tag.c:102
-#, fuzzy
 msgid "Converter"
-msgstr "Centímetro"
+msgstr "Convertidor"
 
 #: libexif/olympus/mnote-olympus-tag.c:105
 msgid "Thumbnail Image"
-msgstr ""
+msgstr "Imagen en miniatura"
 
 #: libexif/olympus/mnote-olympus-tag.c:106
 msgid "Speed/Sequence/Panorama Direction"
-msgstr ""
+msgstr "Velocidad/Secuencia/Dirección de panorama"
 
 #: libexif/olympus/mnote-olympus-tag.c:109
-#, fuzzy
 msgid "Black & White Mode"
-msgstr "Modelo"
+msgstr "Modo blanco y negro"
 
 #: libexif/olympus/mnote-olympus-tag.c:111
-#, fuzzy
 msgid "Focal Plane Diagonal"
-msgstr "Resolución X del plano focal"
+msgstr "Diagonal del plano focal"
 
 #: libexif/olympus/mnote-olympus-tag.c:112
 msgid "Lens Distortion Parameters"
-msgstr ""
+msgstr "Parámetros de distorsión de la lente"
 
 #: libexif/olympus/mnote-olympus-tag.c:114
 msgid "Info"
-msgstr ""
+msgstr "Información"
 
 #: libexif/olympus/mnote-olympus-tag.c:115
 msgid "Camera ID"
-msgstr ""
+msgstr "ID de la cámara"
 
 #: libexif/olympus/mnote-olympus-tag.c:116
 msgid "Precapture Frames"
-msgstr ""
+msgstr "Imágenes previas a la toma"
 
 #: libexif/olympus/mnote-olympus-tag.c:117
-#, fuzzy
 msgid "White Board"
-msgstr "Balance de blanco"
+msgstr "Tablero blanco"
 
 #: libexif/olympus/mnote-olympus-tag.c:118
-#, fuzzy
 msgid "One Touch White Balance"
-msgstr "Balance de blanco"
+msgstr "Balance de blancos con un solo disparo"
 
 #: libexif/olympus/mnote-olympus-tag.c:119
-#, fuzzy
 msgid "White Balance Bracket"
-msgstr "Balance de blanco"
+msgstr "Horquillado del balance de blancos"
 
 #: libexif/olympus/mnote-olympus-tag.c:120
 #: libexif/pentax/mnote-pentax-tag.c:123
-#, fuzzy
 msgid "White Balance Bias"
-msgstr "Balance de blanco"
+msgstr "Tendencia del balance de blancos"
 
 #: libexif/olympus/mnote-olympus-tag.c:121
 msgid "Data Dump"
-msgstr ""
+msgstr "Volcado de datos"
 
 #: libexif/olympus/mnote-olympus-tag.c:124
 msgid "ISO Value"
-msgstr ""
+msgstr "Valor ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:125
-#, fuzzy
 msgid "Aperture Value"
-msgstr "Apertura"
+msgstr "Valor de apertura"
 
 #: libexif/olympus/mnote-olympus-tag.c:126
-#, fuzzy
 msgid "Brightness Value"
-msgstr "Brillo"
+msgstr "Valor del brillo"
 
 #: libexif/olympus/mnote-olympus-tag.c:128
-#, fuzzy
 msgid "Flash Device"
-msgstr "El flash disparó."
+msgstr "Dispositivo flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:130
 msgid "Sensor Temperature"
-msgstr ""
+msgstr "Temperatura del sensor"
 
 #: libexif/olympus/mnote-olympus-tag.c:131
 msgid "Lens Temperature"
-msgstr ""
+msgstr "Temperatura de la lente"
 
 #: libexif/olympus/mnote-olympus-tag.c:132
 msgid "Light Condition"
-msgstr ""
+msgstr "Condiciones de luminosidad"
 
 #: libexif/olympus/mnote-olympus-tag.c:136
 msgid "Zoom Step Count"
-msgstr ""
+msgstr "Número de pasos de zoom"
 
 #: libexif/olympus/mnote-olympus-tag.c:137
 msgid "Focus Step Count"
-msgstr ""
+msgstr "Número de pasos del foco"
 
 #: libexif/olympus/mnote-olympus-tag.c:138
-#, fuzzy
 msgid "Sharpness Setting"
-msgstr "Nitidez"
+msgstr "Ajuste de la nitidez"
 
 #: libexif/olympus/mnote-olympus-tag.c:139
 msgid "Flash Charge Level"
-msgstr ""
+msgstr "Nivel de carga del flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:140
-#, fuzzy
 msgid "Color Matrix"
-msgstr "Espacio de color"
+msgstr "Matriz de colores"
 
 #: libexif/olympus/mnote-olympus-tag.c:141
-#, fuzzy
 msgid "Black Level"
-msgstr "Nivel de la batería"
+msgstr "Nivel de negro"
 
 #: libexif/olympus/mnote-olympus-tag.c:142
-#, fuzzy
 msgid "White Balance Setting"
-msgstr "Balance de blanco"
+msgstr "Ajuste del balance de blancos"
 
 #: libexif/olympus/mnote-olympus-tag.c:143
 #: libexif/pentax/mnote-pentax-tag.c:87
-#, fuzzy
 msgid "Red Balance"
-msgstr "Balance de blanco"
+msgstr "Balance de rojos"
 
 #: libexif/olympus/mnote-olympus-tag.c:144
 #: libexif/pentax/mnote-pentax-tag.c:86
-#, fuzzy
 msgid "Blue Balance"
-msgstr "Balance de blanco"
+msgstr "Balance de azules"
 
 #: libexif/olympus/mnote-olympus-tag.c:145
 msgid "Color Matrix Number"
-msgstr ""
+msgstr "Número de la matriz de colores"
 
 #: libexif/olympus/mnote-olympus-tag.c:147
-#, fuzzy
 msgid "Flash Exposure Comp"
-msgstr "Modo de exposición"
+msgstr "Compensación de la exposición con flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:148
-#, fuzzy
 msgid "Internal Flash Table"
-msgstr "Flash"
+msgstr "Tabla del flash interno"
 
 #: libexif/olympus/mnote-olympus-tag.c:149
-#, fuzzy
 msgid "External Flash G Value"
-msgstr "Flash"
+msgstr "Valor G del flash externo"
 
 #: libexif/olympus/mnote-olympus-tag.c:150
-#, fuzzy
 msgid "External Flash Bounce"
-msgstr "Flash"
+msgstr "Reflejo del flash externo"
 
 #: libexif/olympus/mnote-olympus-tag.c:151
-#, fuzzy
 msgid "External Flash Zoom"
-msgstr "Flash"
+msgstr "Zoom del flash externo"
 
 #: libexif/olympus/mnote-olympus-tag.c:152
-#, fuzzy
 msgid "External Flash Mode"
-msgstr "Flash"
+msgstr "Modo de flash externo"
 
 #: libexif/olympus/mnote-olympus-tag.c:153
-#, fuzzy
 msgid "Contrast Setting"
-msgstr "Contraste"
+msgstr "Ajuste del contraste"
 
 #: libexif/olympus/mnote-olympus-tag.c:154
-#, fuzzy
 msgid "Sharpness Factor"
-msgstr "Nitidez"
+msgstr "Factor de nitidez"
 
 #: libexif/olympus/mnote-olympus-tag.c:155
-#, fuzzy
 msgid "Color Control"
-msgstr "Espacio de color"
+msgstr "Control del color"
 
 #: libexif/olympus/mnote-olympus-tag.c:156
-#, fuzzy
 msgid "Olympus Image Width"
-msgstr "Ancho de la imagen"
+msgstr "Ancho de la imagen Olympus"
 
 #: libexif/olympus/mnote-olympus-tag.c:157
 msgid "Olympus Image Height"
-msgstr ""
+msgstr "Altura de la imagen Olympus"
 
 #: libexif/olympus/mnote-olympus-tag.c:158
-#, fuzzy
 msgid "Scene Detect"
-msgstr "Tipo de escena"
+msgstr "Detección de escena"
 
 #: libexif/olympus/mnote-olympus-tag.c:159
-#, fuzzy
 msgid "Compression Ratio"
-msgstr "Compresión"
+msgstr "Relación de compresión"
 
 #: libexif/olympus/mnote-olympus-tag.c:160
 msgid "Preview Image Valid"
-msgstr ""
+msgstr "Imagen de vista previa válida"
 
 #: libexif/olympus/mnote-olympus-tag.c:161
 msgid "AF Result"
-msgstr ""
+msgstr "Resultado de autofoco"
 
 #: libexif/olympus/mnote-olympus-tag.c:162
 msgid "CCD Scan Mode"
-msgstr ""
+msgstr "Modo de exploración CCD"
 
 #: libexif/olympus/mnote-olympus-tag.c:164
 msgid "Infinity Lens Step"
-msgstr ""
+msgstr "Ajuste de la lente al infinito"
 
 #: libexif/olympus/mnote-olympus-tag.c:165
-#, fuzzy
 msgid "Near Lens Step"
-msgstr "Tipo de escena"
+msgstr "Ajuste de la lente a primer plano"
 
 #: libexif/olympus/mnote-olympus-tag.c:166
-#, fuzzy
 msgid "Light Value Center"
-msgstr "abajo centrado"
+msgstr "Valor de luz en el centro"
 
 #: libexif/olympus/mnote-olympus-tag.c:167
 msgid "Light Value Periphery"
-msgstr ""
+msgstr "Valor de luz en la periferia"
 
 #: libexif/olympus/mnote-olympus-tag.c:170
 msgid "Sequential Shot"
-msgstr ""
+msgstr "Disparo secuencial"
 
 #: libexif/olympus/mnote-olympus-tag.c:171
-#, fuzzy
 msgid "Wide Range"
-msgstr "Balance de blanco"
+msgstr "Rango amplio"
 
 #: libexif/olympus/mnote-olympus-tag.c:172
-#, fuzzy
 msgid "Color Adjustment Mode"
-msgstr "Espacio de color"
+msgstr "Modo de ajuste del color"
 
 #: libexif/olympus/mnote-olympus-tag.c:174
-#, fuzzy
 msgid "Quick Shot"
-msgstr "Multi Lugar"
+msgstr "Disparo rápido"
 
 #: libexif/olympus/mnote-olympus-tag.c:176
 msgid "Voice Memo"
-msgstr ""
+msgstr "Memoria de audio"
 
 #: libexif/olympus/mnote-olympus-tag.c:177
 msgid "Record Shutter Release"
-msgstr ""
+msgstr "Registro del disparo del obturador"
 
 #: libexif/olympus/mnote-olympus-tag.c:178
 msgid "Flicker Reduce"
-msgstr ""
+msgstr "Reducción del parpadeo"
 
 #: libexif/olympus/mnote-olympus-tag.c:179
-#, fuzzy
 msgid "Optical Zoom"
-msgstr "Relación de zoom digital"
+msgstr "Zoom óptico"
 
 #: libexif/olympus/mnote-olympus-tag.c:181
-#, fuzzy
 msgid "Light Source Special"
-msgstr "Fuente de luz"
+msgstr "Fuente de luz especial"
 
 #: libexif/olympus/mnote-olympus-tag.c:182
-#, fuzzy
 msgid "Resaved"
-msgstr "reservado"
+msgstr "Protegida"
 
 #: libexif/olympus/mnote-olympus-tag.c:184
-#, fuzzy
 msgid "Scene Select"
-msgstr "Tipo de escena"
+msgstr "Selección de escena"
 
 #: libexif/olympus/mnote-olympus-tag.c:186
 msgid "Sequence Shot Interval"
-msgstr ""
+msgstr "Intervalo de disparo de secuencia"
 
 #: libexif/olympus/mnote-olympus-tag.c:189
-#, fuzzy
 msgid "Epson Image Width"
-msgstr "Ancho de la imagen"
+msgstr "Ancho de la imagen Epson"
 
 #: libexif/olympus/mnote-olympus-tag.c:190
-#, fuzzy
 msgid "Epson Image Height"
-msgstr "Longitud de la imagen"
+msgstr "Altura de la imagen Epson"
 
 #: libexif/olympus/mnote-olympus-tag.c:191
-#, fuzzy
 msgid "Epson Software Version"
-msgstr "Nota del fabricante"
+msgstr "Versión del software Epson"
 
 #: libexif/pentax/mnote-pentax-entry.c:80
 #: libexif/pentax/mnote-pentax-entry.c:134
-#, fuzzy
 msgid "Multi-exposure"
-msgstr "Exposición manual"
+msgstr "Exposición múltiple"
 
+# Calidad buena
 #: libexif/pentax/mnote-pentax-entry.c:83
 #: libexif/pentax/mnote-pentax-entry.c:137
 msgid "Good"
-msgstr ""
+msgstr "Buena"
 
 #: libexif/pentax/mnote-pentax-entry.c:84
 #: libexif/pentax/mnote-pentax-entry.c:138
-#, fuzzy
 msgid "Better"
-msgstr "Centímetro"
+msgstr "Mejor"
 
 #: libexif/pentax/mnote-pentax-entry.c:92
-#, fuzzy
 msgid "Flash on"
-msgstr "Flash"
+msgstr "Flash encendido"
 
 #: libexif/pentax/mnote-pentax-entry.c:140
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #: libexif/pentax/mnote-pentax-entry.c:150
 msgid "2560x1920 or 2304x1728"
-msgstr ""
+msgstr "2560x1920 o 2304x1728"
 
 #: libexif/pentax/mnote-pentax-entry.c:156
 msgid "2304x1728 or 2592x1944"
-msgstr ""
+msgstr "2304x1728 o 2592x1944"
 
 #: libexif/pentax/mnote-pentax-entry.c:158
 msgid "2816x2212 or 2816x2112"
-msgstr ""
+msgstr "2816x2212 o 2816x2112"
 
 #: libexif/pentax/mnote-pentax-entry.c:171
 msgid "Surf & snow"
-msgstr ""
+msgstr "Surf y nieve"
 
 #: libexif/pentax/mnote-pentax-entry.c:172
-#, fuzzy
 msgid "Sunset or candlelight"
-msgstr "Luz de día"
+msgstr "Puesta de sol o luz de vela"
 
 #: libexif/pentax/mnote-pentax-entry.c:173
 msgid "Autumn"
-msgstr ""
+msgstr "Otoño"
 
 #: libexif/pentax/mnote-pentax-entry.c:178
-#, fuzzy
 msgid "Self portrait"
-msgstr "Retrato"
+msgstr "Autorretrato"
 
 #: libexif/pentax/mnote-pentax-entry.c:179
-#, fuzzy
 msgid "Illustrations"
-msgstr "Saturación"
+msgstr "Ilustraciones"
 
 #: libexif/pentax/mnote-pentax-entry.c:180
-#, fuzzy
 msgid "Digital filter"
-msgstr "Relación de zoom digital"
+msgstr "Filtro digital"
 
 #: libexif/pentax/mnote-pentax-entry.c:182
 msgid "Food"
-msgstr ""
+msgstr "Comida"
 
 #: libexif/pentax/mnote-pentax-entry.c:183
-#, fuzzy
 msgid "Green mode"
-msgstr "Modo de métrica"
+msgstr "Modo verde"
 
 #: libexif/pentax/mnote-pentax-entry.c:184
-#, fuzzy
 msgid "Light pet"
-msgstr "Fuente de luz"
+msgstr "Animal de compañía claro"
 
 #: libexif/pentax/mnote-pentax-entry.c:185
 msgid "Dark pet"
-msgstr ""
+msgstr "Animal de compañía oscuro"
 
 #: libexif/pentax/mnote-pentax-entry.c:186
 msgid "Medium pet"
-msgstr ""
+msgstr "Animal de compañía medio"
 
 #: libexif/pentax/mnote-pentax-entry.c:188
 #: libexif/pentax/mnote-pentax-entry.c:296
-#, fuzzy
 msgid "Candlelight"
-msgstr "Luz de día"
+msgstr "Luz de vela"
 
 #: libexif/pentax/mnote-pentax-entry.c:189
-#, fuzzy
 msgid "Natural skin tone"
-msgstr "Saturación"
+msgstr "Tono de piel natural"
 
 #: libexif/pentax/mnote-pentax-entry.c:190
 msgid "Synchro sound record"
-msgstr ""
+msgstr "Grabación de sonido sincro."
 
 #: libexif/pentax/mnote-pentax-entry.c:191
 msgid "Frame composite"
-msgstr ""
+msgstr "Composición de imagen"
 
 #: libexif/pentax/mnote-pentax-entry.c:194
-#, fuzzy
 msgid "Auto, did not fire"
-msgstr "El flash no disparó."
+msgstr "Automático, no se disparó"
 
 #: libexif/pentax/mnote-pentax-entry.c:196
-#, fuzzy
 msgid "Auto, did not fire, red-eye reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Automático, no se disparó, reducción de ojos rojos."
 
 #: libexif/pentax/mnote-pentax-entry.c:197
-#, fuzzy
 msgid "Auto, fired"
-msgstr "Auto bracket"
+msgstr "Automático, se disparó"
 
 #: libexif/pentax/mnote-pentax-entry.c:199
-#, fuzzy
 msgid "Auto, fired, red-eye reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Automático, se disparó, reducción de ojos rojos."
 
 #: libexif/pentax/mnote-pentax-entry.c:201
 msgid "On, wireless"
-msgstr ""
+msgstr "Encendido, conexión inhalámbrica"
 
 #: libexif/pentax/mnote-pentax-entry.c:202
-#, fuzzy
 msgid "On, soft"
-msgstr "Suave"
+msgstr "Encendido, suave"
 
 #: libexif/pentax/mnote-pentax-entry.c:203
 msgid "On, slow-sync"
-msgstr ""
+msgstr "Encendido, sincronismo lento"
 
 #: libexif/pentax/mnote-pentax-entry.c:204
-#, fuzzy
 msgid "On, slow-sync, red-eye reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Encendido, sincronismo lento, reducción de ojos rojos."
 
 #: libexif/pentax/mnote-pentax-entry.c:205
 msgid "On, trailing-curtain sync"
-msgstr ""
+msgstr "Encendido, sincronización de la cortina"
 
 #: libexif/pentax/mnote-pentax-entry.c:213
 msgid "AF-S"
-msgstr ""
+msgstr "AF-S"
 
 #: libexif/pentax/mnote-pentax-entry.c:214
 msgid "AF-C"
-msgstr ""
+msgstr "AF-C"
 
 #: libexif/pentax/mnote-pentax-entry.c:217
-#, fuzzy
 msgid "Upper-left"
-msgstr "arriba - izquierda"
+msgstr "Arriba-izquierda"
 
 #: libexif/pentax/mnote-pentax-entry.c:218
 msgid "Top"
-msgstr ""
+msgstr "Arriba"
 
 #: libexif/pentax/mnote-pentax-entry.c:219
-#, fuzzy
 msgid "Upper-right"
-msgstr "arriba - derecha"
+msgstr "Arriba-derecha"
 
 #: libexif/pentax/mnote-pentax-entry.c:221
 msgid "Mid-left"
-msgstr ""
+msgstr "Centro-izquierda"
 
 #: libexif/pentax/mnote-pentax-entry.c:223
-#, fuzzy
 msgid "Mid-right"
-msgstr "Copyright"
+msgstr "Centro-derecha"
 
 #: libexif/pentax/mnote-pentax-entry.c:225
-#, fuzzy
 msgid "Lower-left"
-msgstr "arriba - izquierda"
+msgstr "Abajo-izquierda"
 
 #: libexif/pentax/mnote-pentax-entry.c:226
-#, fuzzy
 msgid "Bottom"
-msgstr "abajo - izquierda"
+msgstr "Abajo"
 
 #: libexif/pentax/mnote-pentax-entry.c:227
-#, fuzzy
 msgid "Lower-right"
-msgstr "arriba - derecha"
+msgstr "Abajo-derecha"
 
 #: libexif/pentax/mnote-pentax-entry.c:228
-#, fuzzy
 msgid "Fixed center"
-msgstr "Tiempo bueno"
+msgstr "Fijo centrado"
 
 #: libexif/pentax/mnote-pentax-entry.c:232
-#, fuzzy
 msgid "Multiple"
-msgstr "Multi Lugar"
+msgstr "Múltiple"
 
 #: libexif/pentax/mnote-pentax-entry.c:234
-#, fuzzy
 msgid "Top-center"
-msgstr "centrado"
+msgstr "Arriba-centrado"
 
 #: libexif/pentax/mnote-pentax-entry.c:240
-#, fuzzy
 msgid "Bottom-center"
-msgstr "centrado"
+msgstr "Abajo-centrado"
 
 #: libexif/pentax/mnote-pentax-entry.c:257
 msgid "User selected"
-msgstr ""
+msgstr "Seleccionado por el usuario"
 
 #: libexif/pentax/mnote-pentax-entry.c:282
 msgid "3008x2008 or 3040x2024"
-msgstr ""
+msgstr "3008x2008 o 3040x2024"
 
 #: libexif/pentax/mnote-pentax-entry.c:293
-#, fuzzy
 msgid "Digital filter?"
-msgstr "Relación de zoom digital"
+msgstr "¿Filtro digital?"
 
 #: libexif/pentax/mnote-pentax-entry.c:374
 #: libexif/pentax/mnote-pentax-entry.c:383
 #, c-format
 msgid "Internal error (unknown value %i %i)"
-msgstr ""
+msgstr "Error interno (valor desconocido %i %i)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
-#, fuzzy
 msgid "Capture Mode"
-msgstr "Modo de exposición"
+msgstr "Modo de captura"
 
 #: libexif/pentax/mnote-pentax-tag.c:36 libexif/pentax/mnote-pentax-tag.c:70
 #: libexif/pentax/mnote-pentax-tag.c:129
 msgid "Quality Level"
-msgstr ""
+msgstr "Nivel de calidad"
 
 #: libexif/pentax/mnote-pentax-tag.c:54
-#, fuzzy
 msgid "ISO Speed"
 msgstr "Velocidad ISO"
 
 #: libexif/pentax/mnote-pentax-tag.c:56
-#, fuzzy
 msgid "Colors"
-msgstr "Espacio de color"
+msgstr "Colores"
 
 #: libexif/pentax/mnote-pentax-tag.c:59
 msgid "PrintIM Settings"
-msgstr ""
+msgstr "Ajustes de la impresión directa"
 
 #: libexif/pentax/mnote-pentax-tag.c:60 libexif/pentax/mnote-pentax-tag.c:131
 msgid "Time Zone"
-msgstr ""
+msgstr "Zona horaria"
 
 #: libexif/pentax/mnote-pentax-tag.c:61
-#, fuzzy
 msgid "Daylight Savings"
-msgstr "Luz de día"
+msgstr "Ahorro por luz diurna"
 
 #: libexif/pentax/mnote-pentax-tag.c:64
 msgid "Preview Size"
-msgstr ""
+msgstr "Tamaño de la vista preliminar"
 
 #: libexif/pentax/mnote-pentax-tag.c:65
-#, fuzzy
 msgid "Preview Length"
-msgstr "Longitud de la imagen"
+msgstr "Longitud de la la vista preliminar"
 
 #: libexif/pentax/mnote-pentax-tag.c:66 libexif/pentax/mnote-pentax-tag.c:122
 msgid "Preview Start"
-msgstr ""
+msgstr "Comienzo de la vista preliminar"
 
 #: libexif/pentax/mnote-pentax-tag.c:67
 msgid "Model Identification"
-msgstr ""
+msgstr "Identificación del modelo"
 
 #: libexif/pentax/mnote-pentax-tag.c:68
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #: libexif/pentax/mnote-pentax-tag.c:69
 msgid "Time"
-msgstr ""
+msgstr "Hora"
 
 #: libexif/pentax/mnote-pentax-tag.c:75
-#, fuzzy
 msgid "AF Point Selected"
-msgstr "Balance de blanco manual"
+msgstr "Punto de autofoco seleccionado"
 
 #: libexif/pentax/mnote-pentax-tag.c:76
 msgid "Auto AF Point"
-msgstr ""
+msgstr "Punto de autofoco automático"
 
 #: libexif/pentax/mnote-pentax-tag.c:77
-#, fuzzy
 msgid "Focus Position"
-msgstr "Modo de exposición"
+msgstr "Posición del foco"
 
 #: libexif/pentax/mnote-pentax-tag.c:80
-#, fuzzy
 msgid "ISO Number"
-msgstr "El número F."
+msgstr "Número ISO"
 
 #: libexif/pentax/mnote-pentax-tag.c:83
-#, fuzzy
 msgid "Auto Bracketing"
-msgstr "Auto bracket"
+msgstr "Horquillado automático"
 
 #: libexif/pentax/mnote-pentax-tag.c:85
-#, fuzzy
 msgid "White Balance Mode"
-msgstr "Balance de blanco"
+msgstr "Modo de balance de blancos"
 
 #: libexif/pentax/mnote-pentax-tag.c:93
 msgid "World Time Location"
-msgstr ""
+msgstr "Localización de la hora mundial"
 
 #: libexif/pentax/mnote-pentax-tag.c:94
 msgid "Hometown City"
-msgstr ""
+msgstr "Ciudad de procedencia"
 
 #: libexif/pentax/mnote-pentax-tag.c:95
 msgid "Destination City"
-msgstr ""
+msgstr "Ciudad de destino"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Hometown DST"
-msgstr ""
+msgstr "Horario de verano del lugar natal"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
-#, fuzzy
 msgid "Home Daylight Savings Time"
-msgstr "Luz de día"
+msgstr "Horario de verano del hogar"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
 msgid "Destination DST"
-msgstr ""
+msgstr "Horario de verano del destino"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
-#, fuzzy
 msgid "Destination Daylight Savings Time"
-msgstr "Luz de día"
+msgstr "Horario de verano del destino"
 
 #: libexif/pentax/mnote-pentax-tag.c:99
-#, fuzzy
 msgid "Image Processing"
-msgstr "Longitud de la imagen"
+msgstr "Procesamiento de la imagen"
 
 #: libexif/pentax/mnote-pentax-tag.c:100
-#, fuzzy
 msgid "Picture Mode (2)"
-msgstr "Modo de exposición"
+msgstr "Modo cuadro (2)"
 
 #: libexif/pentax/mnote-pentax-tag.c:103
 msgid "Image Area Offset"
-msgstr ""
+msgstr "Desplazamiento del área de la imagen"
 
 #: libexif/pentax/mnote-pentax-tag.c:104
-#, fuzzy
 msgid "Raw Image Size"
-msgstr "Ancho de la imagen"
+msgstr "Tamaño de la imagen si procesar"
 
 #: libexif/pentax/mnote-pentax-tag.c:105
-#, fuzzy
 msgid "Autofocus Points Used"
-msgstr "Modo de exposición"
+msgstr "Puntos de autoenfoque utilizados"
 
 #: libexif/pentax/mnote-pentax-tag.c:107
-#, fuzzy
 msgid "Camera Temperature"
-msgstr "apertura"
+msgstr "Temperatura de la cámara"
 
 #: libexif/pentax/mnote-pentax-tag.c:110
-#, fuzzy
 msgid "Image Tone"
-msgstr "ID único de imagen"
+msgstr "Tono de la imagen"
 
 #: libexif/pentax/mnote-pentax-tag.c:111
-#, fuzzy
 msgid "Shake Reduction Info"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Información de antivibración"
 
 #: libexif/pentax/mnote-pentax-tag.c:112
-#, fuzzy
 msgid "Black Point"
-msgstr "Modo de exposición"
+msgstr "Punto negro"
 
 #: libexif/pentax/mnote-pentax-tag.c:114
 msgid "AE Info"
-msgstr ""
+msgstr "Información AE"
 
 #: libexif/pentax/mnote-pentax-tag.c:115
 msgid "Lens Info"
-msgstr ""
+msgstr "Información sobre la lente"
 
 #: libexif/pentax/mnote-pentax-tag.c:116
-#, fuzzy
 msgid "Flash Info"
-msgstr "Flash"
+msgstr "FInformación sobre sobre el flash"
 
 #: libexif/pentax/mnote-pentax-tag.c:117
 msgid "Camera Info"
-msgstr ""
+msgstr "Información sobre la cámara"
 
 #: libexif/pentax/mnote-pentax-tag.c:118
-#, fuzzy
 msgid "Battery Info"
-msgstr "Nivel de la batería"
+msgstr "Información sobre la batería"
 
 #: libexif/pentax/mnote-pentax-tag.c:119
 msgid "Hometown City Code"
-msgstr ""
+msgstr "Código de la ciudad de procedencia"
 
 #: libexif/pentax/mnote-pentax-tag.c:120
 msgid "Destination City Code"
-msgstr ""
+msgstr "Código de la ciudad de destino"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
-#, fuzzy
 msgid "Object Distance"
-msgstr "Distancia del sujeto"
+msgstr "Distancia al objeto"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
-#, fuzzy
 msgid "Distance of photographed object in millimeters."
-msgstr "La distancia al sujeto, dada en metros."
+msgstr "Distancia al objeto fotografiado, dada en milímetros."
 
 #: libexif/pentax/mnote-pentax-tag.c:126
-#, fuzzy
 msgid "Flash Distance"
-msgstr "El flash disparó."
+msgstr "Distancia del flash"
 
 #: libexif/pentax/mnote-pentax-tag.c:132
-#, fuzzy
 msgid "Bestshot Mode"
-msgstr "Flash"
+msgstr "Modo de disparo óptimo"
 
 #: libexif/pentax/mnote-pentax-tag.c:133
-#, fuzzy
 msgid "CCS ISO Sensitivity"
-msgstr "Sensibilidad espectral"
+msgstr "Sensibilidad ISO CCS"
 
 #: libexif/pentax/mnote-pentax-tag.c:135
 msgid "Enhancement"
-msgstr ""
+msgstr "Mejora"
 
 #: libexif/pentax/mnote-pentax-tag.c:136
-#, fuzzy
 msgid "Finer"
-msgstr "pulg"
+msgstr "Más fino"
 
 # This is a very special string. It is used for test purposes, and
 # we only test the de locale as a proof-of-concept example. There is
 # no need for anybody to translate it.
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
-msgstr ""
-
-#, fuzzy
-#~ msgid "On + Red-eye reduction"
-#~ msgstr "El flash disparó, modo de reducción de ojos rojos."
-
-#, fuzzy
-#~ msgid "Center + Right"
-#~ msgstr "peso centrado"
-
-#, fuzzy
-#~ msgid "Left + Right"
-#~ msgstr "abajo - derecha"
-
-#, fuzzy
-#~ msgid "Daylight Fluorescent"
-#~ msgstr "Luz de día fluorescente"
-
-#~ msgid "1/%d"
-#~ msgstr "1/%d"
-
-#, fuzzy
-#~ msgid "Focal length"
-#~ msgstr "Distancia focal"
-
-#, fuzzy
-#~ msgid "Flash mode"
-#~ msgstr "Flash"
-
-#, fuzzy
-#~ msgid "Focus mode"
-#~ msgstr "Modo de exposición"
-
-#, fuzzy
-#~ msgid "Image size"
-#~ msgstr "Ancho de la imagen"
-
-#, fuzzy
-#~ msgid "Digital zoom"
-#~ msgstr "Relación de zoom digital"
-
-#, fuzzy
-#~ msgid "Metering mode"
-#~ msgstr "Modo de métrica"
-
-#, fuzzy
-#~ msgid "Focus range"
-#~ msgstr "Modo de exposición"
-
-#, fuzzy
-#~ msgid "Focal plane y size"
-#~ msgstr "Resolución Y del plano focal"
-
-#, fuzzy
-#~ msgid "White balance"
-#~ msgstr "Balance de blanco"
-
-#~ msgid "Exposure time"
-#~ msgstr "Tiempo de exposición"
-
-#~ msgid "top - left"
-#~ msgstr "arriba - izquierda"
-
-#~ msgid "top - right"
-#~ msgstr "arriba - derecha"
-
-#~ msgid "bottom - right"
-#~ msgstr "abajo - derecha"
-
-#~ msgid "bottom - left"
-#~ msgstr "abajo - izquierda"
-
-#~ msgid "left - top"
-#~ msgstr "izquierda - arriba"
-
-#~ msgid "Center-Weighted Average"
-#~ msgstr "Promedio Ponderado en el Centro"
-
-#~ msgid "Flash did not fire."
-#~ msgstr "El flash no disparó."
-
-#, fuzzy
-#~ msgid "flash"
-#~ msgstr "Flash"
-
-#~ msgid "y-Resolution"
-#~ msgstr "Resolución Y"
-
-#~ msgid "Shutter speed"
-#~ msgstr "Velocidad del obturador"
-
-#~ msgid "Focal Plane y-Resolution"
-#~ msgstr "Resolución Y del plano focal"
-
-#, fuzzy
-#~ msgid "Daylight-color fluorescent"
-#~ msgstr "Luz de día fluorescente"
-
-#, fuzzy
-#~ msgid "DayWhite-color fluorescent"
-#~ msgstr "Día blanco fluorescente"
-
-#, fuzzy
-#~ msgid "Super Macro"
-#~ msgstr "Macro"
-
-#~ msgid "unknown"
-#~ msgstr "desconocido"
-
-#~ msgid "panorama"
-#~ msgstr "panorama"
-
-#, fuzzy
-#~ msgid "left to right"
-#~ msgstr "abajo - derecha"
-
-#, fuzzy
-#~ msgid "right to left"
-#~ msgstr "derecha - arriba"
-
-#, fuzzy
-#~ msgid "bottom to top"
-#~ msgstr "abajo - izquierda"
-
-#, fuzzy
-#~ msgid "top to bottom"
-#~ msgstr "izquierda - abajo"
-
-#, fuzzy
-#~ msgid "Whitebalance"
-#~ msgstr "Balance de blanco"
-
-#, fuzzy
-#~ msgid "Noisereduction"
-#~ msgstr "El flash disparó, modo de reducción de ojos rojos."
-
-#, fuzzy
-#~ msgid "Night-scene"
-#~ msgstr "Escena nocturna"
-
-#, fuzzy
-#~ msgid "Night Scene"
-#~ msgstr "Escena nocturna"
-
-#, fuzzy
-#~ msgid "Pan Focus"
-#~ msgstr "Exposición manual"
-
-#, fuzzy
-#~ msgid "Daywhite Fluorescent"
-#~ msgstr "Día blanco fluorescente"
-
-#, fuzzy
-#~ msgid "White Fluorescent"
-#~ msgstr "Blanco fluorescente"
-
-#, fuzzy
-#~ msgid "PictureMode"
-#~ msgstr "Modo de exposición"
-
-#, fuzzy
-#~ msgid "Manual Focus"
-#~ msgstr "Exposición manual"
-
-#, fuzzy
-#~ msgid ""
-#~ "Flash fired, compulsory flash mode, 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."
-
-#, fuzzy
-#~ msgid "Flash not fired"
-#~ msgstr "El flash no disparó."
-
-#, fuzzy
-#~ msgid "red eyes reduction"
-#~ msgstr "El flash disparó, modo de reducción de ojos rojos."
-
-#, fuzzy
-#~ msgid "on + red eyes reduction"
-#~ msgstr "El flash disparó, modo de reducción de ojos rojos."
-
-#, fuzzy
-#~ msgid " / Contrast : "
-#~ msgstr "Contraste"
-
-#, fuzzy
-#~ msgid " / Saturation : "
-#~ msgstr "Saturación"
-
-#, fuzzy
-#~ msgid " / Sharpness : "
-#~ msgstr "Nitidez"
-
-#, fuzzy
-#~ msgid " / Metering mode : "
-#~ msgstr "Modo de métrica"
-
-#, fuzzy
-#~ msgid " / Exposure mode : "
-#~ msgstr "Modo de exposición"
-
-#, fuzzy
-#~ msgid " / Focus mode2 : "
-#~ msgstr "Modo de exposición"
-
-#, fuzzy
-#~ msgid "White balance : "
-#~ msgstr "Balance de blanco"
-
-#, fuzzy
-#~ msgid "Flourescent"
-#~ msgstr "Fluorescente"
-
-#, fuzzy
-#~ msgid " / Flash bias : %.2f EV"
-#~ msgstr "Flash"
-
-#, fuzzy
-#~ msgid " / Subject Distance (mm) : %u"
-#~ msgstr "Distancia del sujeto"
-
-#~ msgid "center-weight"
-#~ msgstr "peso centrado"
-
-#~ msgid "spot"
-#~ msgstr "lugar"
-
-#~ msgid "multi-spot"
-#~ msgstr "multi-lugar"
-
-#~ msgid "matrix"
-#~ msgstr "matriz"
-
-#~ msgid "partial"
-#~ msgstr "parcial"
-
-#~ msgid "other"
-#~ msgstr "otro"
-
-#~ msgid "sunny"
-#~ msgstr "soleado"
-
-#~ msgid "fluorescent"
-#~ msgstr "fluorescente"
-
-#~ msgid "tungsten"
-#~ msgstr "tungsteno"
-
-#~ msgid "manual"
-#~ msgstr "manual"
-
-#~ msgid "landscape"
-#~ msgstr "paisaje"
-
-#~ msgid "yes"
-#~ msgstr "sí"
-
-#, fuzzy
-#~ msgid "Unknown 2"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 3"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 4"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 5"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 6"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 8"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 9"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 14"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 15"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 16"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 17"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 18"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 19"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 21"
-#~ msgstr "Desconocido"
-
-#, fuzzy
-#~ msgid "Unknown 24"
-#~ msgstr "Desconocido"
+msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
-#, fuzzy
-#~ msgid "Unknown 25"
-#~ msgstr "Desconocido"
+#~ msgid "FNumber"
+#~ msgstr "Número F"
diff --git a/po/fr.gmo b/po/fr.gmo
deleted file mode 100644
index d92004a..0000000
--- a/po/fr.gmo
+++ /dev/null
diff --git a/po/fr.po b/po/fr.po
index fcd5729..6f61585 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,28 +1,29 @@
-# LIBEXIF PO FILE
-# Copyright: 
-#   Free Software Foundation, Inc., 2002
-#   Arnaud Launay <asl@launay.org>, 2002
+# Messages français pour Libexif.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libexif package.
-#
+# Arnaud Launay <asl@launay.org>, 2002.
+# Frédéric Marchal <fmarchal@perso.be>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif\n"
+"Project-Id-Version: libexif-0.6.22-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2005-03-12 05:42+0100\n"
-"Last-Translator: Arnaud Launay <asl@launay.org>\n"
-"Language-Team: Français <traduc@traduc.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2016-09-02 00:46+0200\n"
+"PO-Revision-Date: 2016-09-02 09:51+0200\n"
+"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
+"Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
 #: libexif/pentax/mnote-pentax-entry.c:39
 #, c-format
 msgid "Invalid format '%s', expected '%s'."
-msgstr "Format invalide '%s', attendait '%s'."
+msgstr "Format invalide « %s », attendait « %s »."
 
 #: libexif/canon/mnote-canon-entry.c:52 libexif/fuji/mnote-fuji-entry.c:47
 #: libexif/olympus/mnote-olympus-entry.c:62
@@ -67,21 +68,20 @@ msgstr "Normal"
 
 #: libexif/canon/mnote-canon-entry.c:78
 msgid "Economy"
-msgstr ""
+msgstr "Économie"
 
 #: libexif/canon/mnote-canon-entry.c:80
-#, fuzzy
 msgid "Fine"
-msgstr "pouces"
+msgstr "Fin"
 
 #: libexif/canon/mnote-canon-entry.c:81 libexif/fuji/mnote-fuji-entry.c:178
 #: libexif/pentax/mnote-pentax-entry.c:141
 msgid "RAW"
-msgstr ""
+msgstr "BRUT"
 
 #: libexif/canon/mnote-canon-entry.c:82
 msgid "Superfine"
-msgstr ""
+msgstr "Super fin"
 
 #: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
@@ -99,7 +99,7 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
-msgstr ""
+msgstr "Désactivé"
 
 #: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
 #: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
@@ -119,7 +119,7 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:245
 #: libexif/pentax/mnote-pentax-entry.c:290
 msgid "Auto"
-msgstr ""
+msgstr "Auto"
 
 #: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
 #: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
@@ -132,150 +132,142 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
-msgstr ""
+msgstr "Activé"
 
 #: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
 #: libexif/olympus/mnote-olympus-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:94
-#, fuzzy
 msgid "Red-eye reduction"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Mode anti-yeux rouges"
 
 #: libexif/canon/mnote-canon-entry.c:87
 msgid "Slow synchro"
-msgstr ""
+msgstr "Synchro lente"
 
 #: libexif/canon/mnote-canon-entry.c:88
-#, fuzzy
 msgid "Auto, red-eye reduction"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Auto, mode anti-yeux rouges"
 
 #: libexif/canon/mnote-canon-entry.c:89
 #: libexif/pentax/mnote-pentax-entry.c:200
-#, fuzzy
 msgid "On, red-eye reduction"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Activé, mode anti-yeux rouges"
 
 #: libexif/canon/mnote-canon-entry.c:90
-#, fuzzy
 msgid "External flash"
-msgstr "Flash"
+msgstr "Flash externe"
 
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
 #: libexif/canon/mnote-canon-entry.c:297
 msgid "Single"
-msgstr ""
+msgstr "Unique"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
 #: libexif/canon/mnote-canon-entry.c:298
 msgid "Continuous"
-msgstr ""
+msgstr "Continue"
 
 #: libexif/canon/mnote-canon-entry.c:93
 msgid "Movie"
-msgstr ""
+msgstr "Film"
 
 #: libexif/canon/mnote-canon-entry.c:94
 msgid "Continuous, speed priority"
-msgstr ""
+msgstr "Continue, priorité vitesse obturation"
 
 #: libexif/canon/mnote-canon-entry.c:95
 msgid "Continuous, low"
-msgstr ""
+msgstr "Continue, basse"
 
 #: libexif/canon/mnote-canon-entry.c:96
 msgid "Continuous, high"
-msgstr ""
+msgstr "Continue, haute"
 
 #: libexif/canon/mnote-canon-entry.c:97
 msgid "One-shot AF"
-msgstr ""
+msgstr "Autofocus One-Shot"
 
 #: libexif/canon/mnote-canon-entry.c:98
 msgid "AI servo AF"
-msgstr ""
+msgstr "Autofocus AI servo"
 
 #: libexif/canon/mnote-canon-entry.c:99
 msgid "AI focus AF"
-msgstr ""
+msgstr "Mise au point AiAF"
 
 #: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103
-#, fuzzy
 msgid "Manual focus"
-msgstr "Exposition manuel"
+msgstr "Mise au point manuelle"
 
 #: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:132
 #: libexif/canon/mnote-canon-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:212
-#, fuzzy
 msgid "Pan focus"
-msgstr "Exposition manuel"
+msgstr "Mise au point panoramique"
 
 #: libexif/canon/mnote-canon-entry.c:105
 msgid "JPEG"
-msgstr ""
+msgstr "JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:106
 msgid "CRW+THM"
-msgstr ""
+msgstr "CRW+THM"
 
 #: libexif/canon/mnote-canon-entry.c:107
 msgid "AVI+THM"
-msgstr ""
+msgstr "AVI+THM"
 
 #: libexif/canon/mnote-canon-entry.c:108
 msgid "TIF"
-msgstr ""
+msgstr "TIF"
 
 #: libexif/canon/mnote-canon-entry.c:109
 msgid "TIF+JPEG"
-msgstr ""
+msgstr "TIF+JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:110
 msgid "CR2"
-msgstr ""
+msgstr "CR2"
 
 #: libexif/canon/mnote-canon-entry.c:111
 msgid "CR2+JPEG"
-msgstr ""
+msgstr "CR2+JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:112
-#, fuzzy
 msgid "Large"
-msgstr "moyenne"
+msgstr "Grande"
 
 #: libexif/canon/mnote-canon-entry.c:113
 msgid "Medium"
-msgstr ""
+msgstr "Moyenne"
 
 #: libexif/canon/mnote-canon-entry.c:114
 msgid "Small"
-msgstr ""
+msgstr "Petite"
 
 #: libexif/canon/mnote-canon-entry.c:115
 msgid "Medium 1"
-msgstr ""
+msgstr "Moyenne 1"
 
 #: libexif/canon/mnote-canon-entry.c:116
 msgid "Medium 2"
-msgstr ""
+msgstr "Moyenne 2"
 
 #: libexif/canon/mnote-canon-entry.c:117
 msgid "Medium 3"
-msgstr ""
+msgstr "Moyenne 3"
 
 #: libexif/canon/mnote-canon-entry.c:118
 msgid "Postcard"
-msgstr ""
+msgstr "Carte Postale"
 
 #: libexif/canon/mnote-canon-entry.c:119
 msgid "Widescreen"
-msgstr ""
+msgstr "Écran large"
 
 #: libexif/canon/mnote-canon-entry.c:120
-#, fuzzy
 msgid "Full auto"
-msgstr "action"
+msgstr "Entièrement automatique"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
@@ -300,29 +292,26 @@ msgid "Landscape"
 msgstr "Paysage"
 
 #: libexif/canon/mnote-canon-entry.c:123
-#, fuzzy
 msgid "Fast shutter"
-msgstr "obturation"
+msgstr "Obturation rapide"
 
 #: libexif/canon/mnote-canon-entry.c:124
-#, fuzzy
 msgid "Slow shutter"
-msgstr "obturation"
+msgstr "Obturation lente"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
 #: libexif/olympus/mnote-olympus-entry.c:257
-#, fuzzy
 msgid "Night"
 msgstr "Scène de nuit"
 
 #: libexif/canon/mnote-canon-entry.c:126
 msgid "Grayscale"
-msgstr ""
+msgstr "Nuances de gris"
 
 #: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
 #: libexif/pentax/mnote-pentax-entry.c:128
 msgid "Sepia"
-msgstr ""
+msgstr "Sépia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
 #: libexif/exif-entry.c:691 libexif/exif-entry.c:773
@@ -334,111 +323,102 @@ msgid "Portrait"
 msgstr "Portrait"
 
 #: libexif/canon/mnote-canon-entry.c:129 libexif/fuji/mnote-fuji-entry.c:122
-#, fuzzy
 msgid "Sports"
-msgstr "Spot"
+msgstr "Sports"
 
 #: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
 #: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
 #: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
 msgid "Black & white"
-msgstr ""
+msgstr "Noir & Blanc"
 
 #: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
 msgid "Vivid"
-msgstr ""
+msgstr "Vif"
 
 #: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
 #: libexif/canon/mnote-canon-entry.c:434
-#, fuzzy
 msgid "Neutral"
-msgstr "Normal"
+msgstr "Neutre"
 
 #: libexif/canon/mnote-canon-entry.c:135
 #: libexif/pentax/mnote-pentax-entry.c:93
-#, fuzzy
 msgid "Flash off"
-msgstr "Flash"
+msgstr "Flash désactivé"
 
 #: libexif/canon/mnote-canon-entry.c:136
-#, fuzzy
 msgid "Long shutter"
-msgstr "obturation"
+msgstr "Obturation longue"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
 #: libexif/olympus/mnote-olympus-entry.c:174
 msgid "Super macro"
-msgstr ""
+msgstr "Super macro"
 
 #: libexif/canon/mnote-canon-entry.c:138
 msgid "Foliage"
-msgstr ""
+msgstr "Feuillage"
 
 #: libexif/canon/mnote-canon-entry.c:139
 msgid "Indoor"
-msgstr ""
+msgstr "Intérieur"
 
 #: libexif/canon/mnote-canon-entry.c:140 libexif/fuji/mnote-fuji-entry.c:135
 #: libexif/pentax/mnote-pentax-entry.c:175
 msgid "Fireworks"
-msgstr ""
+msgstr "Feux d'artifices"
 
 #: libexif/canon/mnote-canon-entry.c:141 libexif/fuji/mnote-fuji-entry.c:133
 msgid "Beach"
-msgstr ""
+msgstr "Plage"
 
 #: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
 #: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
-#, fuzzy
 msgid "Underwater"
-msgstr "Temps clair"
+msgstr "Sous-marine"
 
 #: libexif/canon/mnote-canon-entry.c:143 libexif/fuji/mnote-fuji-entry.c:134
 msgid "Snow"
-msgstr ""
+msgstr "Neige"
 
 #: libexif/canon/mnote-canon-entry.c:144
 msgid "Kids & pets"
-msgstr ""
+msgstr "Enfants et animaux"
 
 #: libexif/canon/mnote-canon-entry.c:145
-#, fuzzy
 msgid "Night snapshot"
 msgstr "Scène de nuit"
 
 #: libexif/canon/mnote-canon-entry.c:146
-#, fuzzy
 msgid "Digital macro"
-msgstr "Valeur du zoom numérique"
+msgstr "Macro numérique"
 
 #: libexif/canon/mnote-canon-entry.c:147
 msgid "My colors"
-msgstr ""
+msgstr "Mes couleurs"
 
 #: libexif/canon/mnote-canon-entry.c:148
 msgid "Still image"
-msgstr ""
+msgstr "Image fixe"
 
 #: libexif/canon/mnote-canon-entry.c:149
-#, fuzzy
 msgid "Color accent"
-msgstr "Espace des couleurs"
+msgstr "Couleur accentuée"
 
 #: libexif/canon/mnote-canon-entry.c:150
-#, fuzzy
 msgid "Color swap"
-msgstr "Espace des couleurs"
+msgstr "Permutation de couleur"
 
 #: libexif/canon/mnote-canon-entry.c:151
 msgid "Aquarium"
-msgstr ""
+msgstr "Aquarium"
 
 #: libexif/canon/mnote-canon-entry.c:152
 msgid "ISO 3200"
-msgstr ""
+msgstr "ISO 3200"
 
 #: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
@@ -447,15 +427,15 @@ msgstr ""
 #: libexif/olympus/mnote-olympus-entry.c:457
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
-msgstr ""
+msgstr "Aucune"
 
 #: libexif/canon/mnote-canon-entry.c:154
 msgid "2x"
-msgstr ""
+msgstr "2x"
 
 #: libexif/canon/mnote-canon-entry.c:155
 msgid "4x"
-msgstr ""
+msgstr "4x"
 
 #: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
 #: libexif/exif-entry.c:752
@@ -467,46 +447,46 @@ msgstr "Autre"
 #: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
 #: libexif/pentax/mnote-pentax-entry.c:117
 msgid "High"
-msgstr ""
+msgstr "Haut"
 
 #: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
 #: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
 #: libexif/pentax/mnote-pentax-entry.c:111
 #: libexif/pentax/mnote-pentax-entry.c:116
 msgid "Low"
-msgstr ""
+msgstr "Faible"
 
 #: libexif/canon/mnote-canon-entry.c:166
 msgid "Auto high"
-msgstr ""
+msgstr "Automatique haut"
 
 #: libexif/canon/mnote-canon-entry.c:168
 msgid "50"
-msgstr ""
+msgstr "50"
 
 #: libexif/canon/mnote-canon-entry.c:169
 #: libexif/pentax/mnote-pentax-entry.c:120
 #: libexif/pentax/mnote-pentax-entry.c:122
 msgid "100"
-msgstr ""
+msgstr "100"
 
 #: libexif/canon/mnote-canon-entry.c:170
 #: libexif/pentax/mnote-pentax-entry.c:121
 #: libexif/pentax/mnote-pentax-entry.c:123
 msgid "200"
-msgstr ""
+msgstr "200"
 
 #: libexif/canon/mnote-canon-entry.c:171
 msgid "400"
-msgstr ""
+msgstr "400"
 
 #: libexif/canon/mnote-canon-entry.c:172
 msgid "800"
-msgstr ""
+msgstr "800"
 
 #: libexif/canon/mnote-canon-entry.c:173
 msgid "Default"
-msgstr ""
+msgstr "Par défaut"
 
 #: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
 msgid "Spot"
@@ -518,563 +498,546 @@ msgstr "Moyenne"
 
 #: libexif/canon/mnote-canon-entry.c:176
 msgid "Evaluative"
-msgstr ""
+msgstr "Évaluatif"
 
 #: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
 msgid "Partial"
-msgstr "Partiel"
+msgstr "Partielle"
 
 #: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
-#, fuzzy
 msgid "Center-weighted average"
-msgstr "Mesure pondérée centrale"
+msgstr "Pondéré au centre"
 
 #: libexif/canon/mnote-canon-entry.c:181
-#, fuzzy
 msgid "Not known"
-msgstr "Inconnu"
+msgstr "Inconnue"
 
 #: libexif/canon/mnote-canon-entry.c:183
 msgid "Very close"
-msgstr ""
+msgstr "Très près"
 
 #: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
-#, fuzzy
 msgid "Close"
-msgstr "Vue de près"
+msgstr "De près"
 
 #: libexif/canon/mnote-canon-entry.c:185
 msgid "Middle range"
-msgstr ""
+msgstr "Moyenne portée"
 
 #: libexif/canon/mnote-canon-entry.c:186
-#, fuzzy
 msgid "Far range"
-msgstr "Échelle de transfert"
+msgstr "De loin"
 
 #: libexif/canon/mnote-canon-entry.c:189
 #: libexif/pentax/mnote-pentax-entry.c:210
-#, fuzzy
 msgid "Infinity"
-msgstr "Intel"
+msgstr "Infini"
 
 #: libexif/canon/mnote-canon-entry.c:190
-#, fuzzy
 msgid "Manual AF point selection"
-msgstr "Balance des blancs manuelle"
+msgstr "Sélection point AF manuelle"
 
 #: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
 msgid "None (MF)"
-msgstr ""
+msgstr "Aucun (MF)"
 
 #: libexif/canon/mnote-canon-entry.c:192
 msgid "Auto-selected"
-msgstr ""
+msgstr "Sélection automatique"
 
 #: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:224
 #: libexif/pentax/mnote-pentax-entry.c:238
-#, fuzzy
 msgid "Right"
-msgstr "Lumière du jour"
+msgstr "Droit"
 
 #: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
-#, fuzzy
 msgid "Center"
-msgstr "Centimère"
+msgstr "Centre"
 
 #: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
 #: libexif/pentax/mnote-pentax-entry.c:220
 #: libexif/pentax/mnote-pentax-entry.c:236
 msgid "Left"
-msgstr ""
+msgstr "Gauche"
 
 #: libexif/canon/mnote-canon-entry.c:196
 msgid "Auto AF point selection"
-msgstr ""
+msgstr "Sélection point AF automatique"
 
 #: libexif/canon/mnote-canon-entry.c:197
 msgid "Easy shooting"
-msgstr ""
+msgstr "Prise de vue facile"
 
 #: libexif/canon/mnote-canon-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:163
 msgid "Program"
-msgstr ""
+msgstr "Programme"
 
 #: libexif/canon/mnote-canon-entry.c:199
 msgid "Tv-priority"
-msgstr ""
+msgstr "Priorité à l'obturation"
 
 #: libexif/canon/mnote-canon-entry.c:200
-#, fuzzy
 msgid "Av-priority"
-msgstr "Priorité ouverture"
+msgstr "Priorité à l'ouverture"
 
 #: libexif/canon/mnote-canon-entry.c:202
 msgid "A-DEP"
-msgstr ""
+msgstr "Profondeur de champ auto"
 
 #: libexif/canon/mnote-canon-entry.c:203
 msgid "M-DEP"
-msgstr ""
+msgstr "Profondeur de champ manuelle"
 
 #: libexif/canon/mnote-canon-entry.c:204
 msgid "Canon EF 50mm f/1.8"
-msgstr ""
+msgstr "Canon EF 50mm f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:205
 msgid "Canon EF 28mm f/2.8"
-msgstr ""
+msgstr "Canon EF 28mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:206
 msgid "Sigma UC Zoom 35-135mm f/4-5.6"
-msgstr ""
+msgstr "Sigma UC Zoom 35-135mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:207
 msgid "Tokina AF193-2 19-35mm f/3.5-4.5"
-msgstr ""
+msgstr "Tokina AF193-2 19-35mm f/3.5-4.5"
 
 #: libexif/canon/mnote-canon-entry.c:208
 msgid "Canon EF 100-300mm F5.6L"
-msgstr ""
+msgstr "Canon EF 100-300mm F5.6L"
 
 #: libexif/canon/mnote-canon-entry.c:209
 msgid "Sigma 50mm f/2.8 EX or 28mm f/1.8"
-msgstr ""
+msgstr "Sigma 50mm f/2.8 EX ou 28mm f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:210
 msgid "Canon EF 35mm f/2"
-msgstr ""
+msgstr "Canon EF 35mm f/2"
 
 #: libexif/canon/mnote-canon-entry.c:211
 msgid "Canon EF 15mm f/2.8"
-msgstr ""
+msgstr "Canon EF 15mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:212
 msgid "Canon EF 80-200mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 80-200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:213
 msgid "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
-msgstr ""
+msgstr "Tokina AT-X280AF PRO 28-80mm F2.8 Asphérique"
 
 #: libexif/canon/mnote-canon-entry.c:214
 msgid "Cosina 100mm f/3.5 Macro AF"
-msgstr ""
+msgstr "Cosina 100mm f/3.5 Macro AF"
 
 #: libexif/canon/mnote-canon-entry.c:215
 msgid "Tamron AF Aspherical 28-200mm f/3.8-5.6"
-msgstr ""
+msgstr "Tamron AF Asphérique 28-200mm f/3.8-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:216
 msgid "Canon EF 50mm f/1.8 MkII"
-msgstr ""
+msgstr "Canon EF 50mm f/1.8 MkII"
 
 #: libexif/canon/mnote-canon-entry.c:217
 msgid "Tamron SP AF 300mm f/2.8 LD IF"
-msgstr ""
+msgstr "Tamron SP AF 300mm f/2.8 LD IF"
 
 #: libexif/canon/mnote-canon-entry.c:218
 msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
-msgstr ""
+msgstr "Canon EF 24mm f/2.8 ou Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 75-300mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:221
 msgid "Canon EF 28-80mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF 28-80mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF 28-105mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 28-105mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
-msgstr ""
+msgstr "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 
 #: libexif/canon/mnote-canon-entry.c:226
 msgid "Canon TS-E 24mm f/3.5L"
-msgstr ""
+msgstr "Canon TS-E 24mm f/3.5L"
 
 #: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon TS-E 45mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 45mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:228
 msgid "Canon TS-E 90mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 90mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 50mm f/1.0L"
-msgstr ""
+msgstr "Canon EF 50mm f/1.0L"
 
 #: libexif/canon/mnote-canon-entry.c:230
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
-msgstr ""
+msgstr "Sigma 17-35mm f2.8-4 EX Asphérique HSM"
 
 #: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 600mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 600mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 200mm f/1.8L"
-msgstr ""
+msgstr "Canon EF 200mm f/1.8L"
 
 #: libexif/canon/mnote-canon-entry.c:233
 msgid "Canon EF 300mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 300mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 85mm f/1.2L"
-msgstr ""
+msgstr "Canon EF 85mm f/1.2L"
 
 #: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 400mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 400mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:236
 msgid "Canon EF 500mm f/4.5L"
-msgstr ""
+msgstr "Canon EF 500mm f/4.5L"
 
 #: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 300mm f/2.8L IS"
-msgstr ""
+msgstr "Canon EF 300mm f/2.8L IS"
 
 #: libexif/canon/mnote-canon-entry.c:238
 msgid "Canon EF 500mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 500mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 100mm f/2"
-msgstr ""
+msgstr "Canon EF 100mm f/2"
 
 #: libexif/canon/mnote-canon-entry.c:240
 msgid "Sigma 20mm EX f/1.8"
-msgstr ""
+msgstr "Sigma 20mm EX f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:241
 msgid "Canon EF 200mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:242
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
-msgstr ""
+msgstr "Sigma 10-20mm F4-5.6 ou 12-24mm f/4.5-5.6 ou 14mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 35-350mm f/3.5-5.6L"
-msgstr ""
+msgstr "Canon EF 35-350mm f/3.5-5.6L"
 
 #: libexif/canon/mnote-canon-entry.c:244
 msgid "Canon EF 85mm f/1.8 USM"
-msgstr ""
+msgstr "Canon EF 85mm f/1.8 USM"
 
 #: libexif/canon/mnote-canon-entry.c:245
 msgid "Canon EF 28-105mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 28-105mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:246
 msgid "Canon EF 20-35mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 20-35mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:247
 msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
-msgstr ""
+msgstr "Canon EF 28-70mm f/2.8L ou Sigma 24-70mm EX f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:248
 msgid "Canon EF 70-200mm f/2.8 L"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L"
 
 #: libexif/canon/mnote-canon-entry.c:249
 msgid "Canon EF 70-200mm f/2.8 L + x1.4"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:250
 msgid "Canon EF 70-200mm f/2.8 L + x2"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 28mm f/1.8 USM"
-msgstr ""
+msgstr "Canon EF 28mm f/1.8 USM"
 
 #: libexif/canon/mnote-canon-entry.c:252
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
-msgstr ""
+msgstr "Sigma 15-30mm f/3.5-4.5 EX DG Asphérique"
 
 #: libexif/canon/mnote-canon-entry.c:253
 msgid "Canon EF 200mm f/2.8L II"
-msgstr ""
+msgstr "Canon EF 200mm f/2.8L II"
 
 #: libexif/canon/mnote-canon-entry.c:254
 msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
-msgstr ""
+msgstr "Canon EF 180mm Macro f/3.5L ou Sigma 180mm EX HSM Macro f/3.5"
 
 #: libexif/canon/mnote-canon-entry.c:255
 msgid "Canon EF 135mm f/2L"
-msgstr ""
+msgstr "Canon EF 135mm f/2L"
 
 #: libexif/canon/mnote-canon-entry.c:256
 msgid "Canon EF 24-85mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 24-85mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:257
 msgid "Canon EF 300mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 300mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:258
 msgid "Canon EF 28-135mm f/3.5-5.6 IS"
-msgstr ""
+msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
 
 #: libexif/canon/mnote-canon-entry.c:259
 msgid "Canon EF 35mm f/1.4L"
-msgstr ""
+msgstr "Canon EF 35mm f/1.4L"
 
 #: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 
 #: libexif/canon/mnote-canon-entry.c:262
 msgid "Canon EF 100-400mm f/4.5-5.6L IS"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
 
 #: libexif/canon/mnote-canon-entry.c:263
 msgid "Canon EF 400mm f/2.8L + x2"
-msgstr ""
+msgstr "Canon EF 400mm f/2.8L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:264
 msgid "Canon EF 70-200mm f/4L"
-msgstr ""
+msgstr "Canon EF 70-200mm f/4L"
 
 #: libexif/canon/mnote-canon-entry.c:265
 msgid "Canon EF 100mm f/2.8 Macro"
-msgstr ""
+msgstr "Canon EF 100mm f/2.8 Macro"
 
 #: libexif/canon/mnote-canon-entry.c:266
 msgid "Canon EF 400mm f/4 DO IS"
-msgstr ""
+msgstr "Canon EF 400mm f/4 DO IS"
 
 #: libexif/canon/mnote-canon-entry.c:267
 msgid "Canon EF 75-300mm f/4-5.6 IS"
-msgstr ""
+msgstr "Canon EF 75-300mm f/4-5.6 IS"
 
 #: libexif/canon/mnote-canon-entry.c:268
 msgid "Canon EF 50mm f/1.4"
-msgstr ""
+msgstr "Canon EF 50mm f/1.4"
 
 #: libexif/canon/mnote-canon-entry.c:269
 msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
-msgstr ""
+msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
 #: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF 28-200mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF 28-200mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 90-300mm f/4.5-5.6"
-msgstr ""
+msgstr "Canon EF 90-300mm f/4.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
 #: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 16-35mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 16-35mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:277
 msgid "Canon EF 24-70mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 24-70mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:278
 msgid "Canon EF 17-40mm f/4L"
-msgstr ""
+msgstr "Canon EF 17-40mm f/4L"
 
 #: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF-S60mm F2.8 Macro USM"
-msgstr ""
+msgstr "Canon EF-S60mm F2.8 Macro USM"
 
 #: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 24-105mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 24-105mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:285
 msgid "Canon EF 50mm F1.2L USM"
-msgstr ""
+msgstr "Canon EF 50mm F1.2L USM"
 
 #: libexif/canon/mnote-canon-entry.c:286
 msgid "Canon EF 70-200mm f/4L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
-msgstr ""
+msgstr "TTL"
 
 #: libexif/canon/mnote-canon-entry.c:290
 msgid "A-TTL"
-msgstr ""
+msgstr "A-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:291
 msgid "E-TTL"
-msgstr ""
+msgstr "E-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:292
 msgid "FP sync enabled"
-msgstr ""
+msgstr "Synchro FP activée"
 
 #: libexif/canon/mnote-canon-entry.c:293
 msgid "2nd-curtain sync used"
-msgstr ""
+msgstr "Synchronisation 2ème rideau utilisée"
 
 #: libexif/canon/mnote-canon-entry.c:294
 msgid "FP sync used"
-msgstr ""
+msgstr "Synchro FP utilisée"
 
 #: libexif/canon/mnote-canon-entry.c:295
 #: libexif/olympus/mnote-olympus-entry.c:193
-#, fuzzy
 msgid "Internal"
-msgstr "Intel"
+msgstr "Interne"
 
 #: libexif/canon/mnote-canon-entry.c:296
 #: libexif/olympus/mnote-olympus-entry.c:194
 msgid "External"
-msgstr ""
+msgstr "Externe"
 
 #: libexif/canon/mnote-canon-entry.c:299
-#, fuzzy
 msgid "Normal AE"
-msgstr "Normal"
+msgstr "AE normale"
 
 #: libexif/canon/mnote-canon-entry.c:300
-#, fuzzy
 msgid "Exposure compensation"
-msgstr "Temps d'exposition"
+msgstr "Compensation de l'exposition"
 
 #: libexif/canon/mnote-canon-entry.c:301
 msgid "AE lock"
-msgstr ""
+msgstr "AE verrouillée"
 
 #: libexif/canon/mnote-canon-entry.c:302
-#, fuzzy
 msgid "AE lock + exposure compensation"
-msgstr "Temps d'exposition"
+msgstr "AE verrouillée + compensation de l'exposition"
 
 #: libexif/canon/mnote-canon-entry.c:303
 msgid "No AE"
-msgstr ""
+msgstr "Pas d'AE"
 
 #: libexif/canon/mnote-canon-entry.c:306
 msgid "On, shot only"
-msgstr ""
+msgstr "Activé, uniquement prise de vue"
 
 #: libexif/canon/mnote-canon-entry.c:310
 msgid "Smooth"
-msgstr ""
+msgstr "Adoucir"
 
 #: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
 #: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
 #: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
-#, fuzzy
 msgid "Custom"
-msgstr "Processus personnel"
+msgstr "Personnalisé"
 
 #: libexif/canon/mnote-canon-entry.c:314
 msgid "My color data"
-msgstr ""
+msgstr "Données de mes couleurs"
 
 #: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
 #: libexif/pentax/mnote-pentax-entry.c:126
 #: libexif/pentax/mnote-pentax-entry.c:145
 msgid "Full"
-msgstr ""
+msgstr "Complet"
 
 #: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
 msgid "2/3"
-msgstr ""
+msgstr "2/3"
 
 #: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
 msgid "1/3"
-msgstr ""
+msgstr "1/3"
 
 #: libexif/canon/mnote-canon-entry.c:324
 msgid "Fixed"
-msgstr ""
+msgstr "Fixé"
 
 #: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
 msgid "Zoom"
-msgstr ""
+msgstr "Zoom"
 
 #: libexif/canon/mnote-canon-entry.c:332
-#, fuzzy
 msgid "Sunny"
-msgstr "ensoleillé"
+msgstr "Ensoleillé"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
 #: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
-#, fuzzy
 msgid "Cloudy"
-msgstr "nuageux"
+msgstr "Nuageux"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
 #: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
-#, fuzzy
 msgid "Tungsten"
-msgstr "tungsten"
+msgstr "Tungstène"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
 #: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
@@ -1096,35 +1059,33 @@ msgstr "Ombragé"
 
 #: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "Manual temperature (Kelvin)"
-msgstr ""
+msgstr "Température manuelle (Kelvin)"
 
 #: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
 msgid "PC set 1"
-msgstr ""
+msgstr "Paramètre PC 1"
 
 #: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "PC set 2"
-msgstr ""
+msgstr "Paramètre PC 2"
 
 #: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "PC set 3"
-msgstr ""
+msgstr "Paramètre PC 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
 #: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
-msgstr ""
+msgstr "Fluorescent lumière du jour"
 
 #: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
-#, fuzzy
 msgid "Custom 1"
-msgstr "Processus personnel"
+msgstr "Personnalisé 1"
 
 #: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
-#, fuzzy
 msgid "Custom 2"
-msgstr "Processus personnel"
+msgstr "Personnalisé 2"
 
 #: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
 #: libexif/pentax/mnote-pentax-entry.c:78
@@ -1135,91 +1096,84 @@ msgid "Night scene"
 msgstr "Scène de nuit"
 
 #: libexif/canon/mnote-canon-entry.c:355
-#, fuzzy
 msgid "Center-right"
-msgstr "Centre pondéré"
+msgstr "Centre-droit"
 
 #: libexif/canon/mnote-canon-entry.c:357
-#, fuzzy
 msgid "Left-right"
-msgstr "bas - droit"
+msgstr "Gauche-droit"
 
 #: libexif/canon/mnote-canon-entry.c:358
-#, fuzzy
 msgid "Left-center"
-msgstr "Centimère"
+msgstr "Gauche-centre"
 
 #: libexif/canon/mnote-canon-entry.c:359
 msgid "All"
-msgstr ""
+msgstr "Tout"
 
 #: libexif/canon/mnote-canon-entry.c:361
 msgid "On (shot 1)"
-msgstr ""
+msgstr "Activé (prise 1)"
 
 #: libexif/canon/mnote-canon-entry.c:362
 msgid "On (shot 2)"
-msgstr ""
+msgstr "Activé (prise 2)"
 
 #: libexif/canon/mnote-canon-entry.c:363
 msgid "On (shot 3)"
-msgstr ""
+msgstr "Activé (prise 3)"
 
 #: libexif/canon/mnote-canon-entry.c:365
 msgid "EOS high-end"
-msgstr ""
+msgstr "EOS haut de gamme"
 
 #: libexif/canon/mnote-canon-entry.c:366
 msgid "Compact"
-msgstr ""
+msgstr "Compact"
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
-msgstr ""
+msgstr "EOS milieu de gamme"
 
 #: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotate 90 CW"
-msgstr ""
+msgstr "Rotation 90° horaire"
 
 #: libexif/canon/mnote-canon-entry.c:370
 msgid "Rotate 180"
-msgstr ""
+msgstr "Rotation de 180°"
 
 #: libexif/canon/mnote-canon-entry.c:371
 msgid "Rotate 270 CW"
-msgstr ""
+msgstr "Rotation 270° horaire"
 
 #: libexif/canon/mnote-canon-entry.c:372
 msgid "Rotated by software"
-msgstr ""
+msgstr "Rotation par logiciel"
 
 #: libexif/canon/mnote-canon-entry.c:384
 #: libexif/olympus/mnote-olympus-entry.c:612
-#, fuzzy
 msgid "Left to right"
-msgstr "bas - droit"
+msgstr "Gauche vers droite"
 
 #: libexif/canon/mnote-canon-entry.c:385
 #: libexif/olympus/mnote-olympus-entry.c:615
-#, fuzzy
 msgid "Right to left"
-msgstr "droit - haut"
+msgstr "Droite vers gauche"
 
 #: libexif/canon/mnote-canon-entry.c:386
 #: libexif/olympus/mnote-olympus-entry.c:618
-#, fuzzy
 msgid "Bottom to top"
-msgstr "bas - gauche"
+msgstr "Bas vers haut"
 
 #: libexif/canon/mnote-canon-entry.c:387
 #: libexif/olympus/mnote-olympus-entry.c:621
-#, fuzzy
 msgid "Top to bottom"
-msgstr "gauche - bas"
+msgstr "Haut vers bas"
 
 #: libexif/canon/mnote-canon-entry.c:388
 msgid "2x2 matrix (clockwise)"
-msgstr ""
+msgstr "matrice 2x2 (sens horaire)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
@@ -1231,17 +1185,15 @@ msgstr "Standard"
 
 #: libexif/canon/mnote-canon-entry.c:397
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: libexif/canon/mnote-canon-entry.c:398
-#, fuzzy
 msgid "Lowest"
-msgstr "haut - gauche"
+msgstr "Le plus bas"
 
 #: libexif/canon/mnote-canon-entry.c:402
-#, fuzzy
 msgid "Highest"
-msgstr "Scène de nuit"
+msgstr "Le plus haut"
 
 #: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
 #: libexif/fuji/mnote-fuji-entry.c:74
@@ -1253,84 +1205,81 @@ msgstr "Lumière du jour"
 
 #: libexif/canon/mnote-canon-entry.c:422
 msgid "Set 1"
-msgstr ""
+msgstr "Ensemble 1"
 
 #: libexif/canon/mnote-canon-entry.c:423
 msgid "Set 2"
-msgstr ""
+msgstr "Ensemble 2"
 
 #: libexif/canon/mnote-canon-entry.c:424
 msgid "Set 3"
-msgstr ""
+msgstr "Ensemble 3"
 
 #: libexif/canon/mnote-canon-entry.c:425
 msgid "User def. 1"
-msgstr ""
+msgstr "Déf. util. 1"
 
 #: libexif/canon/mnote-canon-entry.c:426
 msgid "User def. 2"
-msgstr ""
+msgstr "Déf. util. 2"
 
 #: libexif/canon/mnote-canon-entry.c:427
 msgid "User def. 3"
-msgstr ""
+msgstr "Déf. util. 3"
 
 #: libexif/canon/mnote-canon-entry.c:428
-#, fuzzy
 msgid "External 1"
-msgstr "Flash"
+msgstr "Externe 1"
 
 #: libexif/canon/mnote-canon-entry.c:429
-#, fuzzy
 msgid "External 2"
-msgstr "Flash"
+msgstr "Externe 2"
 
 #: libexif/canon/mnote-canon-entry.c:430
-#, fuzzy
 msgid "External 3"
-msgstr "Flash"
+msgstr "Externe 3"
 
 #: libexif/canon/mnote-canon-entry.c:435
 msgid "Faithful"
-msgstr ""
+msgstr "Fidèle"
 
 #: libexif/canon/mnote-canon-entry.c:436
 #: libexif/olympus/mnote-olympus-entry.c:118
 msgid "Monochrome"
-msgstr ""
+msgstr "Monochrome"
 
 #: libexif/canon/mnote-canon-entry.c:494
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
 #, c-format
 msgid "%i (ms)"
-msgstr ""
+msgstr "%i (ms)"
 
 #: libexif/canon/mnote-canon-entry.c:624
 #, c-format
 msgid "%.2f mm"
-msgstr ""
+msgstr "%.2f mm"
 
 #: libexif/canon/mnote-canon-entry.c:648
 #, c-format
 msgid "%.2f EV"
-msgstr ""
+msgstr "%.2f EV"
 
 #: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
 #, c-format
 msgid "1/%i"
-msgstr ""
+msgstr "1/%i"
 
 #: libexif/canon/mnote-canon-entry.c:670
 #, c-format
 msgid "%u mm"
-msgstr ""
+msgstr "%u mm"
 
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
-msgstr ""
+msgstr "Réglages (première partie)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
 #: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
@@ -1339,82 +1288,72 @@ msgstr "Longueur focale"
 
 #: libexif/canon/mnote-canon-tag.c:37
 msgid "Settings (Second Part)"
-msgstr ""
+msgstr "Paramètres (seconde partie)"
 
 #: libexif/canon/mnote-canon-tag.c:38
 #: libexif/olympus/mnote-olympus-entry.c:601
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
-msgstr ""
+msgstr "Panorama"
 
 #: libexif/canon/mnote-canon-tag.c:39
-#, fuzzy
 msgid "Image Type"
-msgstr "Hauteur de l'image"
+msgstr "Type d'image"
 
 #: libexif/canon/mnote-canon-tag.c:40 libexif/olympus/mnote-olympus-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:113
-#, fuzzy
 msgid "Firmware Version"
-msgstr "Version d'exif"
+msgstr "Version du microprogramme"
 
 #: libexif/canon/mnote-canon-tag.c:41
-#, fuzzy
 msgid "Image Number"
-msgstr "ID unique de l'image"
+msgstr "Numéro de l'image"
 
 #: libexif/canon/mnote-canon-tag.c:42
-#, fuzzy
 msgid "Owner Name"
-msgstr "Le nombre F."
+msgstr "Nom du propriétaire"
 
 #: libexif/canon/mnote-canon-tag.c:43
-#, fuzzy
 msgid "Color Information"
-msgstr "Espace des couleurs"
+msgstr "Information des couleurs"
 
 #: libexif/canon/mnote-canon-tag.c:44 libexif/fuji/mnote-fuji-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:81
 #: libexif/olympus/mnote-olympus-tag.c:146
-#, fuzzy
 msgid "Serial Number"
-msgstr "Le nombre F."
+msgstr "Numéro de série"
 
 #: libexif/canon/mnote-canon-tag.c:45
-#, fuzzy
 msgid "Custom Functions"
-msgstr "Processus personnel"
+msgstr "Fonctions personnelles"
 
 #: libexif/canon/mnote-canon-tag.c:56 libexif/fuji/mnote-fuji-tag.c:45
-#, fuzzy
 msgid "Macro Mode"
-msgstr "Macro"
+msgstr "Mode Macro"
 
 #: libexif/canon/mnote-canon-tag.c:57 libexif/canon/mnote-canon-tag.c:117
 #: libexif/olympus/mnote-olympus-tag.c:175
 #: libexif/pentax/mnote-pentax-tag.c:128
 msgid "Self-timer"
-msgstr ""
+msgstr "Retardateur"
 
 #: libexif/canon/mnote-canon-tag.c:58 libexif/fuji/mnote-fuji-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:94
 #: libexif/olympus/mnote-olympus-tag.c:107
 msgid "Quality"
-msgstr ""
+msgstr "Qualité"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
 #: libexif/olympus/mnote-olympus-tag.c:127
 #: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
-#, fuzzy
 msgid "Flash Mode"
-msgstr "Flash"
+msgstr "Mode flash"
 
 #: libexif/canon/mnote-canon-tag.c:60 libexif/pentax/mnote-pentax-tag.c:101
-#, fuzzy
 msgid "Drive Mode"
-msgstr "Mode de mesure"
+msgstr "Mode de pilotage"
 
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
@@ -1422,32 +1361,28 @@ msgstr "Mode de mesure"
 #: libexif/olympus/mnote-olympus-tag.c:173
 #: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
 #: libexif/pentax/mnote-pentax-tag.c:130
-#, fuzzy
 msgid "Focus Mode"
-msgstr "Mode d'exposition"
+msgstr "Mode de mise au point"
 
 #: libexif/canon/mnote-canon-tag.c:62 libexif/pentax/mnote-pentax-tag.c:127
-#, fuzzy
 msgid "Record Mode"
-msgstr "Macro"
+msgstr "Mode d'enregistrement"
 
 #: libexif/canon/mnote-canon-tag.c:63 libexif/pentax/mnote-pentax-tag.c:71
-#, fuzzy
 msgid "Image Size"
-msgstr "Hauteur de l'image"
+msgstr "Taille de l'image"
 
 #: libexif/canon/mnote-canon-tag.c:64
 msgid "Easy Shooting Mode"
-msgstr ""
+msgstr "Mode de prise de vue facile"
 
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
 #: libexif/olympus/mnote-olympus-tag.c:180
 #: libexif/pentax/mnote-pentax-tag.c:89
-#, fuzzy
 msgid "Digital Zoom"
-msgstr "Valeur du zoom numérique"
+msgstr "Zoom numérique"
 
 #: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
@@ -1470,7 +1405,7 @@ msgstr "Netteté"
 
 #: libexif/canon/mnote-canon-tag.c:69
 msgid "ISO"
-msgstr ""
+msgstr "ISO"
 
 #: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
 #: libexif/pentax/mnote-pentax-tag.c:82
@@ -1478,14 +1413,12 @@ msgid "Metering Mode"
 msgstr "Mode de mesure"
 
 #: libexif/canon/mnote-canon-tag.c:71 libexif/olympus/mnote-olympus-tag.c:133
-#, fuzzy
 msgid "Focus Range"
-msgstr "Mode d'exposition"
+msgstr "Plage de mise au point"
 
 #: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
-#, fuzzy
 msgid "AF Point"
-msgstr "Mode d'exposition"
+msgstr "Point AF"
 
 #: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
 msgid "Exposure Mode"
@@ -1493,125 +1426,105 @@ msgstr "Mode d'exposition"
 
 #: libexif/canon/mnote-canon-tag.c:74 libexif/olympus/mnote-olympus-tag.c:61
 #: libexif/pentax/mnote-pentax-tag.c:106
-#, fuzzy
 msgid "Lens Type"
-msgstr "Type de scène"
+msgstr "Type d'optique"
 
 #: libexif/canon/mnote-canon-tag.c:75
-#, fuzzy
 msgid "Long Focal Length of Lens"
-msgstr "Longueur focale"
+msgstr "Longue longueur focale de l'optique"
 
 #: libexif/canon/mnote-canon-tag.c:76
-#, fuzzy
 msgid "Short Focal Length of Lens"
-msgstr "Longueur focale"
+msgstr "Courte longueur focale de l'optique"
 
 #: libexif/canon/mnote-canon-tag.c:77
-#, fuzzy
 msgid "Focal Units per mm"
-msgstr "Longueur focale"
+msgstr "Unités focales par mm"
 
 #: libexif/canon/mnote-canon-tag.c:78
-#, fuzzy
 msgid "Maximal Aperture"
-msgstr "ouverture"
+msgstr "Ouverture maximale"
 
 #: libexif/canon/mnote-canon-tag.c:79
-#, fuzzy
 msgid "Minimal Aperture"
-msgstr "ouverture"
+msgstr "Ouverture minimale"
 
 #: libexif/canon/mnote-canon-tag.c:80
-#, fuzzy
 msgid "Flash Activity"
-msgstr "Le flash s'est déclenché."
+msgstr "Activité du flash"
 
 #: libexif/canon/mnote-canon-tag.c:81
-#, fuzzy
 msgid "Flash Details"
-msgstr "Flash"
+msgstr "Détails du flash"
 
 #: libexif/canon/mnote-canon-tag.c:83
-#, fuzzy
 msgid "AE Setting"
-msgstr "Netteté"
+msgstr "Réglage exposition automatique"
 
 #: libexif/canon/mnote-canon-tag.c:84
-#, fuzzy
 msgid "Image Stabilization"
-msgstr "Description de l'image"
+msgstr "Stabilisation de l'image"
 
 #: libexif/canon/mnote-canon-tag.c:85
-#, fuzzy
 msgid "Display Aperture"
-msgstr "ouverture"
+msgstr "Ouverture d'affichage"
 
 #: libexif/canon/mnote-canon-tag.c:86
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Largeur source du zoom"
 
 #: libexif/canon/mnote-canon-tag.c:87
-#, fuzzy
 msgid "Zoom Target Width"
-msgstr "Hauteur de l'image"
+msgstr "Largeur cible du zoom"
 
 #: libexif/canon/mnote-canon-tag.c:88
 msgid "Photo Effect"
-msgstr ""
+msgstr "Effet de photo"
 
 #: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
 msgid "Manual Flash Output"
-msgstr ""
+msgstr "Sortie flash manuel"
 
 #: libexif/canon/mnote-canon-tag.c:90
-#, fuzzy
 msgid "Color Tone"
-msgstr "Espace des couleurs"
+msgstr "Ton de couleur"
 
 #: libexif/canon/mnote-canon-tag.c:91
-#, fuzzy
 msgid "Focal Type"
-msgstr "Longueur focale"
+msgstr "Type de focale"
 
 #: libexif/canon/mnote-canon-tag.c:93
-#, fuzzy
 msgid "Focal Plane X Size"
-msgstr "x-Résolution du plan focal"
+msgstr "Dimension X du plan focal"
 
 #: libexif/canon/mnote-canon-tag.c:94
-#, fuzzy
 msgid "Focal Plane Y Size"
-msgstr "x-Résolution du plan focal"
+msgstr "Dimension Y du plan focal"
 
 #: libexif/canon/mnote-canon-tag.c:95
 msgid "Auto ISO"
-msgstr ""
+msgstr "Mode sensibilité automatique"
 
 #: libexif/canon/mnote-canon-tag.c:96
-#, fuzzy
 msgid "Shot ISO"
-msgstr "Spot"
+msgstr "Prise d'image ISO"
 
 #: libexif/canon/mnote-canon-tag.c:97
 msgid "Measured EV"
-msgstr ""
+msgstr "Valeur d'exposition mesurée"
 
 #: libexif/canon/mnote-canon-tag.c:98
-#, fuzzy
 msgid "Target Aperture"
-msgstr "ouverture"
+msgstr "Ouverture cible"
 
 #: libexif/canon/mnote-canon-tag.c:99
-#, fuzzy
 msgid "Target Exposure Time"
-msgstr "Temps d'exposition"
+msgstr "Temps d'exposition cible"
 
 #: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
 #: libexif/pentax/mnote-pentax-tag.c:81
-#, fuzzy
 msgid "Exposure Compensation"
-msgstr "Temps d'exposition"
+msgstr "Compensation d'exposition"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
 #: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
@@ -1622,50 +1535,42 @@ msgid "White Balance"
 msgstr "Balance des blancs"
 
 #: libexif/canon/mnote-canon-tag.c:102
-#, fuzzy
 msgid "Slow Shutter"
-msgstr "obturation"
+msgstr "Obturateur lent"
 
 #: libexif/canon/mnote-canon-tag.c:103
-#, fuzzy
 msgid "Sequence Number"
-msgstr "Le nombre F."
+msgstr "Numéro de séquence"
 
 #: libexif/canon/mnote-canon-tag.c:104
-#, fuzzy
 msgid "Flash Guide Number"
-msgstr "Le nombre F."
+msgstr "Numéro du guide du flash"
 
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
-#, fuzzy
 msgid "Flash Exposure Compensation"
-msgstr "Temps d'exposition"
+msgstr "Composition d'exposition du flash"
 
 #: libexif/canon/mnote-canon-tag.c:107
-#, fuzzy
 msgid "AE Bracketing"
-msgstr "action"
+msgstr "Brackting exposition automatique"
 
 #: libexif/canon/mnote-canon-tag.c:108
-#, fuzzy
 msgid "AE Bracket Value"
-msgstr "Ouverture"
+msgstr "Valeurs du bracketing de l'auto exposition"
 
 #: libexif/canon/mnote-canon-tag.c:109
-#, fuzzy
 msgid "Focus Distance Upper"
-msgstr "Balance des blancs manuelle"
+msgstr "Distance de focus supérieure"
 
 #: libexif/canon/mnote-canon-tag.c:110
-#, fuzzy
 msgid "Focus Distance Lower"
-msgstr "Balance des blancs manuelle"
+msgstr "Distance de focus inférieure"
 
-#: libexif/canon/mnote-canon-tag.c:111
-#, fuzzy
-msgid "FNumber"
-msgstr "Le nombre F."
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:469
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "Nombre d'ouverture"
 
 #: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
 #: libexif/pentax/mnote-pentax-tag.c:78
@@ -1673,47 +1578,40 @@ msgid "Exposure Time"
 msgstr "Temps d'exposition"
 
 #: libexif/canon/mnote-canon-tag.c:113
-#, fuzzy
 msgid "Bulb Duration"
-msgstr "Saturation"
+msgstr "Durée obturateur B"
 
 #: libexif/canon/mnote-canon-tag.c:114
 msgid "Camera Type"
-msgstr ""
+msgstr "Type d'appareil"
 
 #: libexif/canon/mnote-canon-tag.c:115
-#, fuzzy
 msgid "Auto Rotate"
-msgstr "Bracketing automatique"
+msgstr "Rotation automatique"
 
 #: libexif/canon/mnote-canon-tag.c:116
-#, fuzzy
 msgid "ND Filter"
-msgstr "Valeur du zoom numérique"
+msgstr "Filtre ND"
 
 #: libexif/canon/mnote-canon-tag.c:119
-#, fuzzy
 msgid "Panorama Frame"
-msgstr "normal"
+msgstr "Cadre panoramique"
 
 #: libexif/canon/mnote-canon-tag.c:120
 msgid "Panorama Direction"
-msgstr ""
+msgstr "Direction de panorama"
 
 #: libexif/canon/mnote-canon-tag.c:121
-#, fuzzy
 msgid "Tone Curve"
-msgstr "Contraste"
+msgstr "Courbe des tons"
 
 #: libexif/canon/mnote-canon-tag.c:122
-#, fuzzy
 msgid "Sharpness Frequency"
-msgstr "Netteté"
+msgstr "Fréquence de netteté"
 
 #: libexif/canon/mnote-canon-tag.c:124
-#, fuzzy
 msgid "Picture Style"
-msgstr "Mode d'exposition"
+msgstr "Style d'image"
 
 #: libexif/exif-byte-order.c:33
 msgid "Motorola"
@@ -1725,118 +1623,98 @@ msgstr "Intel"
 
 #: libexif/exif-data.c:780
 msgid "Size of data too small to allow for EXIF data."
-msgstr ""
+msgstr "Taille des données trop petite pour permettre des données EXIF."
 
 #: libexif/exif-data.c:841
 msgid "EXIF marker not found."
-msgstr ""
+msgstr "Marqueur EXIF non trouvé"
 
 #: libexif/exif-data.c:868
 msgid "EXIF header not found."
-msgstr ""
+msgstr "Entête EXIF non trouvé."
 
 #: libexif/exif-data.c:893
-#, fuzzy
 msgid "Unknown encoding."
-msgstr "Inconnu"
+msgstr "Codage inconnu."
 
 #: libexif/exif-data.c:1178
-#, fuzzy
 msgid "Ignore unknown tags"
-msgstr "Inconnu"
+msgstr "Ignorer les descripteurs inconnus"
 
 #: libexif/exif-data.c:1179
 msgid "Ignore unknown tags when loading EXIF data."
-msgstr ""
+msgstr "Ignorer les descripteurs inconnus lors du chargement des données EXIF."
 
 #: libexif/exif-data.c:1180
 msgid "Follow specification"
-msgstr ""
+msgstr "Suivre les spécifications"
 
 #: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Ajouter, corriger ou supprimer des entrées pour obtenir des données EXIF conformes aux spécifications."
 
 #: libexif/exif-data.c:1183
 msgid "Do not change maker note"
-msgstr ""
+msgstr "Ne pas changer la note du créateur"
 
 #: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Lors du chargement et de la sauvegarde des données Exif, conserver la note du créateur sans modification. Attention que la note du créateur peut en être corrompue."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Le descripteur « %s » était au format « %s » (qui n'est pas conforme aux spécifications); il a été mis au format « %s »."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Le descripteur « %s » est au format « %s » (qui n'est pas conforme aux spécifications) mais il ne peut pas être mis au format « %s »."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Format « %s » du descripteur « UserComment » invalide. Le format a été réinitialisé à « undefined »."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Le descripteur « UserComment » a été étendu à au moins 8 octets afin de suivre les spécifications."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Le descripteur « UserComment » n'est pas vide mais il ne débute pas par un identificateur de format. Ceci a été corrigé."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Le descripteur « UserComment » ne commençait pas par un identificateur de format. Ceci a été corrigé."
 
 #: libexif/exif-entry.c:462
-#, fuzzy, c-format
+#, c-format
 msgid "%i bytes undefined data"
-msgstr "%i de données inconnues"
+msgstr "%i octets de données inconnues"
 
 #: libexif/exif-entry.c:585
-#, fuzzy, c-format
+#, c-format
 msgid "%i bytes unsupported data type"
-msgstr "%i de données inconnues"
+msgstr "%i octets de type de données non supporté"
 
 #: libexif/exif-entry.c:642
-#, fuzzy, c-format
+#, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr "Format invalide '%s', attendait '%s'."
+msgstr "Le descripteur « %s » contient des données d'un format invalide (« %s », format prévu « %s »)."
 
 #: libexif/exif-entry.c:655
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr ""
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "Le descripteur « %s » contient un nombre invalide de composants (%i, %i attendu)."
 
 #: libexif/exif-entry.c:669
 msgid "Chunky format"
-msgstr ""
+msgstr "Format chunky"
 
 #: libexif/exif-entry.c:669
-#, fuzzy
 msgid "Planar format"
-msgstr "Configuration du plan"
+msgstr "Format planar"
 
 #: libexif/exif-entry.c:671 libexif/exif-entry.c:763
 #: test/nls/test-codeset.c:54
@@ -1845,19 +1723,19 @@ msgstr "Non défini"
 
 #: libexif/exif-entry.c:671
 msgid "One-chip color area sensor"
-msgstr ""
+msgstr "Sonde de couleur à un capteur"
 
 #: libexif/exif-entry.c:672
 msgid "Two-chip color area sensor"
-msgstr ""
+msgstr "Sonde de couleur à deux capteurs"
 
 #: libexif/exif-entry.c:672
 msgid "Three-chip color area sensor"
-msgstr ""
+msgstr "Sonde de couleur à trois capteurs"
 
 #: libexif/exif-entry.c:673
 msgid "Color sequential area sensor"
-msgstr ""
+msgstr "Sonde de couleur à capteur séquentiel"
 
 #: libexif/exif-entry.c:673
 msgid "Trilinear sensor"
@@ -1868,74 +1746,64 @@ msgid "Color sequential linear sensor"
 msgstr "Capteur linéaire séquentiel de couleur"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
-#, fuzzy
 msgid "Top-left"
-msgstr "haut - gauche"
+msgstr "Haut-gauche"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
-#, fuzzy
 msgid "Top-right"
-msgstr "haut - droit"
+msgstr "Haut-droit"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
-#, fuzzy
 msgid "Bottom-right"
-msgstr "bas - droit"
+msgstr "Bas-droit"
 
 #: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
-#, fuzzy
 msgid "Bottom-left"
-msgstr "bas - gauche"
+msgstr "Bas-gauche"
 
 #: libexif/exif-entry.c:677
 msgid "Left-top"
-msgstr ""
+msgstr "Gauche-haut"
 
 #: libexif/exif-entry.c:677
-#, fuzzy
 msgid "Right-top"
-msgstr "droit - haut"
+msgstr "Droit-haut"
 
 #: libexif/exif-entry.c:678
-#, fuzzy
 msgid "Right-bottom"
-msgstr "droit - bas"
+msgstr "Droit-bas"
 
 #: libexif/exif-entry.c:678
-#, fuzzy
 msgid "Left-bottom"
-msgstr "gauche - bas"
+msgstr "Gauche-bas"
 
 #: libexif/exif-entry.c:680
-#, fuzzy
 msgid "Centered"
-msgstr "centré"
+msgstr "Centré"
 
 #: libexif/exif-entry.c:680
 msgid "Co-sited"
-msgstr ""
+msgstr "Co-situés"
 
 #: libexif/exif-entry.c:682
 msgid "Reversed mono"
-msgstr ""
+msgstr "Monochrome inversé"
 
 #: libexif/exif-entry.c:682
-#, fuzzy
 msgid "Normal mono"
-msgstr "Normal"
+msgstr "Monochrome normal"
 
 #: libexif/exif-entry.c:682
 msgid "RGB"
 msgstr "RGB"
 
 #: libexif/exif-entry.c:682
-#, fuzzy
 msgid "Palette"
-msgstr "Motif"
+msgstr "Palette"
 
 #: libexif/exif-entry.c:683
 msgid "CMYK"
-msgstr ""
+msgstr "CMJN"
 
 #: libexif/exif-entry.c:683
 msgid "YCbCr"
@@ -1943,7 +1811,7 @@ msgstr "YCbCr"
 
 #: libexif/exif-entry.c:683
 msgid "CieLAB"
-msgstr ""
+msgstr "CieLAB"
 
 #: libexif/exif-entry.c:685
 msgid "Normal process"
@@ -1959,7 +1827,7 @@ msgstr "Exposition automatique"
 
 #: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
-msgstr "Exposition manuel"
+msgstr "Exposition manuelle"
 
 #: libexif/exif-entry.c:687
 msgid "Auto bracket"
@@ -1975,19 +1843,19 @@ msgstr "Balance des blancs manuelle"
 
 #: libexif/exif-entry.c:694
 msgid "Low gain up"
-msgstr ""
+msgstr "Faible augmentation du gain"
 
 #: libexif/exif-entry.c:694
 msgid "High gain up"
-msgstr ""
+msgstr "Forte augmentation du gain"
 
 #: libexif/exif-entry.c:695
 msgid "Low gain down"
-msgstr ""
+msgstr "Faible réduction du gain"
 
 #: libexif/exif-entry.c:695
 msgid "High gain down"
-msgstr ""
+msgstr "Forte réduction du gain"
 
 #: libexif/exif-entry.c:697
 msgid "Low saturation"
@@ -2024,17 +1892,14 @@ msgid "Unknown"
 msgstr "Inconnu"
 
 #: libexif/exif-entry.c:716
-#, fuzzy
 msgid "Avg"
-msgstr "moyenne"
+msgstr "Moy."
 
 #: libexif/exif-entry.c:717
-#, fuzzy
 msgid "Center-weight"
-msgstr "Centre pondéré"
+msgstr "Pondération centrale"
 
 #: libexif/exif-entry.c:719
-#, fuzzy
 msgid "Multi spot"
 msgstr "Multi spot"
 
@@ -2063,9 +1928,8 @@ msgid "PackBits compression"
 msgstr "Compression PackBits"
 
 #: libexif/exif-entry.c:736
-#, fuzzy
 msgid "Tungsten incandescent light"
-msgstr "Tungstène (lumière incandescente)"
+msgstr "Éclairage incandescent au tungstène"
 
 #: libexif/exif-entry.c:738
 msgid "Fine weather"
@@ -2078,16 +1942,16 @@ msgstr "Temps couvert"
 #: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
-msgstr ""
+msgstr "Fluorescent lumière blanche naturelle"
 
 #: libexif/exif-entry.c:743
 msgid "Cool white fluorescent"
-msgstr ""
+msgstr "Fluorescent blanc froid"
 
 #: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
-msgstr ""
+msgstr "Fluorescent blanc"
 
 #: libexif/exif-entry.c:745
 msgid "Standard light A"
@@ -2127,7 +1991,7 @@ msgstr "pouces"
 
 #: libexif/exif-entry.c:756 libexif/exif-entry.c:760
 msgid "Centimeter"
-msgstr "Centimère"
+msgstr "Centimètre"
 
 #: libexif/exif-entry.c:756 libexif/exif-entry.c:760
 msgid "cm"
@@ -2150,54 +2014,45 @@ msgid "Shutter priority"
 msgstr "Priorité obturation"
 
 #: libexif/exif-entry.c:767
-#, fuzzy
 msgid "Shutter"
-msgstr "obturation"
+msgstr "Obturateur"
 
 #: libexif/exif-entry.c:768
 msgid "Creative program (biased toward depth of field)"
 msgstr "Programme créatif (grande profondeur de champ)"
 
 #: libexif/exif-entry.c:769
-#, fuzzy
 msgid "Creative"
-msgstr "créatif"
+msgstr "Créatif"
 
 #: libexif/exif-entry.c:770
-#, fuzzy
 msgid "Creative program (biased toward fast shutter speed)"
-msgstr "Programme action (vitesse d'obturation élevée)"
+msgstr "Programme créatif (favorisant une vitesse élevée)"
 
 #: libexif/exif-entry.c:771
-#, fuzzy
 msgid "Action"
-msgstr "action"
+msgstr "Action"
 
 #: libexif/exif-entry.c:772
-#, fuzzy
 msgid "Portrait mode (for closeup photos with the background out of focus)"
-msgstr "Mode portrait (photos en gros plan avec arrière-plan flou)"
+msgstr "Mode portrait (pour photos en gros plan avec arrière-plan flou)"
 
 #: libexif/exif-entry.c:774
-#, fuzzy
 msgid "Landscape mode (for landscape photos with the background in focus)"
-msgstr "Mode paysage (paysages avec arrière-plan net)"
+msgstr "Mode paysage (pour paysages avec arrière-plan net)"
 
 #: libexif/exif-entry.c:778 libexif/exif-entry.c:783
 #: libexif/olympus/mnote-olympus-entry.c:100
-#, fuzzy
 msgid "Flash did not fire"
-msgstr "Le flash ne s'est pas déclenché."
+msgstr "Le flash ne s'est pas déclenché"
 
 #: libexif/exif-entry.c:778
-#, fuzzy
 msgid "No flash"
-msgstr "Flash"
+msgstr "Pas de flash"
 
 #: libexif/exif-entry.c:779
-#, fuzzy
 msgid "Flash fired"
-msgstr "Le flash s'est déclenché."
+msgstr "Flash déclenché"
 
 #: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
@@ -2205,140 +2060,103 @@ msgstr "Le flash s'est déclenché."
 #: libexif/olympus/mnote-olympus-entry.c:221
 #: libexif/olympus/mnote-olympus-entry.c:244
 msgid "Yes"
-msgstr "oui"
+msgstr "Oui"
 
 #: libexif/exif-entry.c:780
-#, fuzzy
 msgid "Strobe return light not detected"
-msgstr "Flash déclenché, mode auto, lumière de retour non détectée."
+msgstr "Lumière de retour non détectée"
 
 #: libexif/exif-entry.c:780
 msgid "Without strobe"
-msgstr ""
+msgstr "Sans flash"
 
 #: libexif/exif-entry.c:782
-#, fuzzy
 msgid "Strobe return light detected"
-msgstr "Flash déclenché, mode auto, lumière de retour détectée."
+msgstr "Lumière de retour détectée"
 
 #: libexif/exif-entry.c:782
 msgid "With strobe"
-msgstr ""
+msgstr "Avec flash"
 
 #: libexif/exif-entry.c:784
-#, fuzzy
 msgid "Flash fired, compulsory flash mode"
-msgstr "Flash non déclenché, mode de flash obligatoire."
+msgstr "Flash déclenché, mode de flash obligatoire"
 
 #: libexif/exif-entry.c:785
-#, fuzzy
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
-"Flash déclenché, mode de flash obligatoire, lumière de retour non détectée."
+msgstr "Flash déclenché, mode de flash obligatoire, lumière de retour non détectée"
 
 #: libexif/exif-entry.c:787
-#, fuzzy
 msgid "Flash fired, compulsory flash mode, return light detected"
-msgstr ""
-"Flash déclenché, mode de flash obligatoire, lumière de retour détectée."
+msgstr "Flash déclenché, mode de flash obligatoire, lumière de retour détectée"
 
 #: libexif/exif-entry.c:789
-#, fuzzy
 msgid "Flash did not fire, compulsory flash mode"
-msgstr "Flash non déclenché, mode de flash obligatoire."
+msgstr "Le flash n'a pas déclenché, mode de flash obligatoire"
 
 #: libexif/exif-entry.c:790
-#, fuzzy
 msgid "Flash did not fire, auto mode"
-msgstr "Flash non déclenché, mode auto."
+msgstr "Le flash n'a pas déclenché, mode auto"
 
 #: libexif/exif-entry.c:791
-#, fuzzy
 msgid "Flash fired, auto mode"
-msgstr "Flash déclenché, mode auto."
+msgstr "Flash déclenché, mode auto"
 
 #: libexif/exif-entry.c:792
-#, fuzzy
 msgid "Flash fired, auto mode, return light not detected"
-msgstr "Flash déclenché, mode auto, lumière de retour non détectée."
+msgstr "Flash déclenché, mode auto, lumière de retour non détectée"
 
 #: libexif/exif-entry.c:794
-#, fuzzy
 msgid "Flash fired, auto mode, return light detected"
-msgstr "Flash déclenché, mode auto, lumière de retour détectée."
+msgstr "Flash déclenché, mode auto, lumière de retour détectée"
 
 #: libexif/exif-entry.c:795
-#, fuzzy
 msgid "No flash function"
-msgstr "Pas de fonction flash."
+msgstr "Pas de fonction flash"
 
 #: libexif/exif-entry.c:796
-#, fuzzy
 msgid "Flash fired, red-eye reduction mode"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Flash déclenché, mode anti-yeux rouges"
 
 #: libexif/exif-entry.c:797
-#, fuzzy
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
-"Flash déclenché, mode anti-yeux rouges, lumière de retour non détectée."
+msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour non détectée"
 
 #: libexif/exif-entry.c:799
-#, fuzzy
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour détectée."
+msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour détectée"
 
 #: libexif/exif-entry.c:801
-#, fuzzy
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
-msgstr "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges."
+msgstr "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges"
 
 #: libexif/exif-entry.c:803
-#, fuzzy
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière "
-"de retour non détectée."
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière de retour non détectée"
 
 #: libexif/exif-entry.c:805
-#, fuzzy
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière "
-"de retour non détectée."
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière de retour non détectée"
 
 #: libexif/exif-entry.c:807
-#, fuzzy
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
-msgstr "Flash déclenché, mode auto, mode anti-yeux rouges."
+msgstr "Flash déclenché, mode auto, mode anti-yeux rouges"
 
 #: libexif/exif-entry.c:808
-#, fuzzy
 msgid "Flash fired, auto mode, red-eye reduction mode"
-msgstr "Flash déclenché, mode auto, mode anti-yeux rouges."
+msgstr "Flash déclenché, mode auto, mode anti-yeux rouges"
 
 #: libexif/exif-entry.c:809
-#, fuzzy
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"Flash déclenché, mode auto, lumière de retour non détectée, mode anti-yeux "
-"rouges."
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "Flash déclenché, mode auto, lumière de retour non détectée, mode anti-yeux rouges"
 
 #: libexif/exif-entry.c:811
-#, fuzzy
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"Flash déclenché, mode auto, lumière de retour détectée, mode anti-yeux "
-"rouges."
+msgstr "Flash déclenché, mode auto, lumière de retour détectée, mode anti-yeux rouges"
 
 #: libexif/exif-entry.c:815
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #: libexif/exif-entry.c:817
 msgid "Close view"
@@ -2349,7 +2167,6 @@ msgid "Distant view"
 msgstr "Vue de loin"
 
 #: libexif/exif-entry.c:818
-#, fuzzy
 msgid "Distant"
 msgstr "Vue de loin"
 
@@ -2359,7 +2176,7 @@ msgstr "sRGB"
 
 #: libexif/exif-entry.c:822
 msgid "Adobe RGB"
-msgstr ""
+msgstr "Adobe RVB"
 
 #: libexif/exif-entry.c:823
 msgid "Uncalibrated"
@@ -2368,70 +2185,70 @@ msgstr "Non calibré"
 #: libexif/exif-entry.c:878
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
-msgstr "Nombre invalide de composants (%i, attendait %li x %i)."
+msgstr "Taille de la saisie invalide (%i, prévu %li x %i)."
 
 #: libexif/exif-entry.c:911
 msgid "Unsupported UNICODE string"
-msgstr ""
+msgstr "Chaîne UNICODE non supportée"
 
 #: libexif/exif-entry.c:919
 msgid "Unsupported JIS string"
-msgstr ""
+msgstr "Chaîne JIS non supportée"
 
 #: libexif/exif-entry.c:935
 msgid "Tag UserComment contains data but is against specification."
-msgstr ""
+msgstr "Le descripteur UserComment contient des données mais est contraire au standard."
 
 #: libexif/exif-entry.c:939
 #, c-format
 msgid "Byte at position %i: 0x%02x"
-msgstr ""
+msgstr "Octet à la position %i : 0x%02x"
 
 #: libexif/exif-entry.c:947
 msgid "Unknown Exif Version"
-msgstr "Version d'exif inconnu"
+msgstr "Version d'Exif inconnue"
 
 #: libexif/exif-entry.c:951
 #, c-format
 msgid "Exif Version %d.%d"
-msgstr "Version d'exif %d.%d"
+msgstr "Exif version %d.%d"
 
 #: libexif/exif-entry.c:962
 msgid "FlashPix Version 1.0"
-msgstr ""
+msgstr "FlashPix version 1.0"
 
 #: libexif/exif-entry.c:964
 msgid "FlashPix Version 1.01"
-msgstr ""
+msgstr "FlashPix version 1.01"
 
 #: libexif/exif-entry.c:966
 msgid "Unknown FlashPix Version"
-msgstr ""
+msgstr "Version de FlashPix inconnue"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1668
+#: libexif/exif-entry.c:1673 libexif/exif-entry.c:1677
+#: libexif/exif-entry.c:1682 libexif/exif-entry.c:1683
 msgid "[None]"
-msgstr ""
+msgstr "[Aucun]"
 
 #: libexif/exif-entry.c:981
 msgid "(Photographer)"
-msgstr ""
+msgstr "(Photographe)"
 
 #: libexif/exif-entry.c:1000
 msgid "(Editor)"
-msgstr ""
+msgstr "(Éditeur)"
 
 #: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
 #: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
 #, c-format
 msgid "%.02f EV"
-msgstr ""
+msgstr "%.02f EV"
 
 #: libexif/exif-entry.c:1025
 #, c-format
 msgid " (f/%.01f)"
-msgstr ""
+msgstr " (f/%.01f)"
 
 #: libexif/exif-entry.c:1059
 #, c-format
@@ -2439,28 +2256,27 @@ msgid " (35 equivalent: %d mm)"
 msgstr " (équivalent 35mm: %d mm)"
 
 #: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
-#, fuzzy
 msgid " sec."
 msgstr " sec."
 
 #: libexif/exif-entry.c:1107
-#, fuzzy, c-format
+#, c-format
 msgid " (1/%d sec.)"
-msgstr " 1/%d sec.)"
+msgstr " (1/%d sec.)"
 
 #: libexif/exif-entry.c:1109
-#, fuzzy, c-format
+#, c-format
 msgid " (%d sec.)"
-msgstr "%d sec.)"
+msgstr " (%d sec.)"
 
 #: libexif/exif-entry.c:1122
 #, c-format
 msgid " (%.02f cd/m^2)"
-msgstr ""
+msgstr " (%.02f cd/m²)"
 
 #: libexif/exif-entry.c:1132
 msgid "DSC"
-msgstr ""
+msgstr "DSC"
 
 #: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
 #: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
@@ -2470,7 +2286,7 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:359
 #, c-format
 msgid "Internal error (unknown value %i)"
-msgstr ""
+msgstr "Erreur interne (valeur %i inconnue)"
 
 #: libexif/exif-entry.c:1142
 msgid "-"
@@ -2494,20 +2310,19 @@ msgstr "R"
 
 #: libexif/exif-entry.c:1147
 msgid "G"
-msgstr "G"
+msgstr "V"
 
 #: libexif/exif-entry.c:1148
 msgid "B"
 msgstr "B"
 
 #: libexif/exif-entry.c:1149
-#, fuzzy
 msgid "Reserved"
-msgstr "réservé"
+msgstr "Réservé"
 
 #: libexif/exif-entry.c:1172
 msgid "Directly photographed"
-msgstr ""
+msgstr "Photographié directement"
 
 #: libexif/exif-entry.c:1185
 msgid "YCbCr4:2:2"
@@ -2533,33 +2348,29 @@ msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Nombre inattendu de composants (%li, attendait 2, 3, ou 4)."
 
 #: libexif/exif-entry.c:1257
-#, fuzzy
 msgid "Sea level"
-msgstr "Niveau de charge"
+msgstr "Niveau de la mer"
 
 #: libexif/exif-entry.c:1259
 msgid "Sea level reference"
-msgstr ""
+msgstr "Référence du niveau de la mer"
 
 #: libexif/exif-entry.c:1367
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown value %i"
-msgstr "Inconnu"
+msgstr "Valeur %i inconnue"
 
 #: libexif/exif-format.c:37
-#, fuzzy
 msgid "Short"
-msgstr "Spot"
+msgstr "Court"
 
 #: libexif/exif-format.c:38
-#, fuzzy
 msgid "Rational"
-msgstr "action"
+msgstr "Rationnel"
 
 #: libexif/exif-format.c:39
-#, fuzzy
 msgid "SRational"
-msgstr "action"
+msgstr "SRationnel"
 
 #: libexif/exif-format.c:40
 msgid "Undefined"
@@ -2567,510 +2378,386 @@ msgstr "Non défini"
 
 #: libexif/exif-format.c:41
 msgid "ASCII"
-msgstr ""
+msgstr "ASCII"
 
 #: libexif/exif-format.c:42
 msgid "Long"
-msgstr ""
+msgstr "Long"
 
 #: libexif/exif-format.c:43
-#, fuzzy
 msgid "Byte"
-msgstr "Centimère"
+msgstr "Octet"
 
 #: libexif/exif-format.c:44
 msgid "SByte"
-msgstr ""
+msgstr "SOctet"
 
 #: libexif/exif-format.c:45
-#, fuzzy
 msgid "SShort"
-msgstr "Spot"
+msgstr "SCourt"
 
 #: libexif/exif-format.c:46
 msgid "SLong"
-msgstr ""
+msgstr "SLong"
 
 #: libexif/exif-format.c:47
-#, fuzzy
 msgid "Float"
-msgstr "Flash"
+msgstr "Flottant"
 
 #: libexif/exif-format.c:48
 msgid "Double"
-msgstr ""
+msgstr "Double"
 
 #: libexif/exif-loader.c:119
 #, c-format
 msgid "The file '%s' could not be opened."
-msgstr ""
+msgstr "Impossible d'ouvrir le fichier « %s »."
 
 #: libexif/exif-loader.c:300
 msgid "The data supplied does not seem to contain EXIF data."
-msgstr ""
+msgstr "Les données fournies ne semblent pas contenir de données EXIF."
 
 #: libexif/exif-log.c:43
 msgid "Debugging information"
-msgstr ""
+msgstr "Informations de débogage"
 
 #: libexif/exif-log.c:44
 msgid "Debugging information is available."
-msgstr ""
+msgstr "Des informations de débogage sont disponibles."
 
 #: libexif/exif-log.c:45
 msgid "Not enough memory"
-msgstr ""
+msgstr "Mémoire insuffisante"
 
 #: libexif/exif-log.c:46
 msgid "The system cannot provide enough memory."
-msgstr ""
+msgstr "Le système ne peut mettre à disposition suffisamment de mémoire."
 
 #: libexif/exif-log.c:47
 msgid "Corrupt data"
-msgstr ""
+msgstr "Données corrompues"
 
 #: libexif/exif-log.c:48
 msgid "The data provided does not follow the specification."
-msgstr ""
+msgstr "Les données fournies ne respectent pas les spécifications."
 
 #: libexif/exif-tag.c:62
 msgid "GPS Tag Version"
-msgstr ""
+msgstr "Version du descripteur GPS"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Indique la version de <GPSInfoIFD>. La version est donnée sous la forme 2.0.0.0. Ce descripteur est obligatoire lorsque le descripteur <GPSInfo> est présent. (Note : le descripteur <GPSVersionID> est donné en octets, contrairement au descripteur <ExifVersion>. Lorsque la version indiquée est 2.0.0.0, la valeur du descripteur est 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
-msgstr ""
+msgstr "Index d'interopérabilité"
 
 #: libexif/exif-tag.c:70
-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 ""
-"Indique l'identification de la règle d'interopérabilité. Utilisez \"R98\" "
-"pour préciser des règles ExifR98. Quatre octets sont utilisés, incluant le "
-"code de terminaison (NULL). Voyez le volume séparé des règles "
-"d'interopérabilité recommandées pour exif (ExifR98) pour les autres "
-"marqueurs utilisés pour ExifR98."
+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 "Indique l'identification de la règle d'interopérabilité. Utilisez « R98 » pour préciser des règles ExifR98. Quatre octets sont utilisés, incluant le code de terminaison (NULL). Voyez le volume séparé des règles d'interopérabilité recommandées pour exif (ExifR98) pour les autres marqueurs utilisés pour ExifR98."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
-msgstr ""
+msgstr "Latitude Nord ou Sud"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Indique si la latitude est une latitude Nord ou Sud. La valeur ASCII 'N' indique la latitude Nord et la valeur 'S' indique la latitude Sud."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
-msgstr ""
+msgstr "Version d'interopérabilité"
 
 #: libexif/exif-tag.c:83
 msgid "Latitude"
-msgstr ""
+msgstr "Latitude"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Indique la latitude. Cette latitude est exprimée par trois valeurs RATIONNELLES indiquant respectivement les degrés, minutes et secondes. Lorsque les degrés, minutes et secondes sont exprimées, le format est dd/1,mm/1,ss/1. Quand degrés et minutes sont utilisés et, par exemple, les fractions de minutes sont données jusqu'à la deuxième décimale, le format est dd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
-msgstr ""
+msgstr "Longitude Est ou Ouest"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Indique si la longitude est une longitude Est ou Ouest. La valeur ASCII 'E' indique la longitude Est et la valeur 'W' indique la longitude Ouest."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
-msgstr ""
+msgstr "Longitude"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Indique la longitude. Cette longitude est exprimée par trois valeurs RATIONNELLES indiquant respectivement les degrés, minutes et secondes. Lorsque les degrés, minutes et secondes sont exprimées, le format est ddd/1,mm/1,ss/1. Quand degrés et minutes sont utilisés et, par exemple, les fractions de minutes sont données jusqu'à la deuxième décimale, le format est ddd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:103
 msgid "Altitude Reference"
-msgstr ""
+msgstr "Référence d'altitude"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
+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 is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GPSAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags."
+msgstr "Indique l'altitude utilisée comme altitude de référence. Si la référence est le niveau de la mer et que l'altitude est au dessus du niveau de la mer, la valeur donnée est 0. Si l'altitude est inférieure au niveau de la mer, la valeur donnée est de 1 et l'altitude est indiquée sous forme de valeur absolue du descripteur GPSAltitude. L'unité de référence est le mètre. Notez que ce descripteur est de type BYTE, contrairement aux autres descripteurs de référence."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
-msgstr ""
+msgstr "Altitude"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Indique l'altitude selon la valeur de référence contenue par GPSAltitudeRef. L'altitude est exprimée sous la forme d'une valeur RATIONNELLE. L'unité de référence est le mètre."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
-msgstr ""
+msgstr "Heure GPS (horloge atomique)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Indiquer le temps UTC (temps universel). L'horodatage est représenté par trois valeurs RATIONNELLES pour l'heure, les minutes et les secondes."
 
 #: libexif/exif-tag.c:118
 msgid "GPS Satellites"
-msgstr ""
+msgstr "Satellites GPS"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
+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, 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 shall be set to NULL."
+msgstr "Indique les satellites GPS utilisés pour les mesures. Ce descripteur peut servir àdécrire le nombre de satellites, leur numéro d'identification, l'élévation, l'azimut, le rapport signal sur bruit et d'autres informations en ASCII. Le format n'est pas spécifié. Si le récepteur GPS est incapable de prendre des mesures, la valeur du descripteur est NULL."
 
 #: libexif/exif-tag.c:125
 msgid "GPS Receiver Status"
-msgstr ""
+msgstr "Statut du récepteur GPS"
 
 #: libexif/exif-tag.c:126
-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 ""
+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 "Indique le statut du récepteur GPS lors de l'enregistrement de l'image. « A » indique une mesure en cours et « V » signifie que la mesure est Interopérabilité."
 
 #: libexif/exif-tag.c:129
-#, fuzzy
 msgid "GPS Measurement Mode"
-msgstr "Mode de mesure"
+msgstr "Mode de mesure GPS"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Indique le mode de mesure GPS en cours. « 2 » pour une mesure 2D et « 3 » pour une mesure 3D."
 
 #: libexif/exif-tag.c:133
 msgid "Measurement Precision"
-msgstr ""
+msgstr "Précision de la mesure"
 
 #: libexif/exif-tag.c:134
-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 ""
+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 "Indique le degré de précision des données GPS (DOP). La valeur HDOP est écrite durant une mesure 2D et PDOP est écrite pendant une mesure 3D."
 
 #: libexif/exif-tag.c:137
 msgid "Speed Unit"
-msgstr ""
+msgstr "Unité de vitesse"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Indique l'unité qui exprime la vitesse de déplacement du récepteur GPS. « K », « M » et « N » représentent des km/h, des mille par heure et des nœuds."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
-msgstr ""
+msgstr "Vitesse du récepteur GPS"
 
 #: libexif/exif-tag.c:142
 msgid "Indicates the speed of GPS receiver movement."
-msgstr ""
+msgstr "Indique la vitesse de déplacement du récepteur GPS."
 
 #: libexif/exif-tag.c:143
 msgid "Reference for direction of movement"
-msgstr ""
+msgstr "Référence pour la direction du mouvement"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Indique la référence pour la direction de mouvement du récepteur GPS. « T » pour le nord géographique et « M » pour le nord magnétique."
 
 #: libexif/exif-tag.c:147
 msgid "Direction of Movement"
-msgstr ""
+msgstr "Direction du mouvement"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
-msgstr ""
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
+msgstr "Indique la direction de mouvement du récepteur GPS. Les valeurs vont de 0.00 à 359.99."
 
 #: libexif/exif-tag.c:150
 msgid "GPS Image Direction Reference"
-msgstr ""
+msgstr "Référence de la direction de l'image GPS"
 
 #: libexif/exif-tag.c:151
-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 ""
+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 "Indique la référence pour la direction de l'image quand elle a été prise. « T » pour le nord géographique et « M » pour le nord magnétique."
 
 #: libexif/exif-tag.c:153
-#, fuzzy
 msgid "GPS Image Direction"
-msgstr "Description de l'image"
+msgstr "Direction de l'image GPS"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
+msgstr "Indique la direction de l'image quand elle a été prise. Les valeurs vont de 0.00 à 359.99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
-msgstr ""
+msgstr "Données d'étude géodésique utilisées"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Indique les données d'étude géodésique utilisées par le récepteur GPS. Si les données de l'étude sont limitées au Japon, la valeur de ce descripteur est « TOKYO » ou « WGS-84 ». Si le descripteur d'info GPS est enregistré, il est fortement conseillé d'enregistrer ce descripteur."
 
 #: libexif/exif-tag.c:161
 msgid "Reference For Latitude of Destination"
-msgstr ""
+msgstr "Référence pour la latitude de destination"
 
 #: libexif/exif-tag.c:162
-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 ""
+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 "Indique si la latitude de la destination pointe vers le nord ou le sud. La valeur ASCII « N » indique le nord et « S » est une latitude sud."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
-msgstr ""
+msgstr "Latitude de destination"
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Indique la latitude du point de destination. La latitude est représentée par trois valeurs RATIONNELLES pour les degrés, minutes et secondes respectivement. Si la latitude est exprimée en degrés, minutes et secondes, le format typique est dd/1,mm/1,ss/1. Quand des degrés et minutes sont utilisés et, par exemple, une fraction de minute est donnée avec jusqu'à deux chiffres décimaux, le format est dd/1,mmm/100,0/1."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
-msgstr ""
+msgstr "Référence pour la longitude de destination"
 
 #: libexif/exif-tag.c:174
-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 ""
+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 "Indique si la longitude de la destination pointe vers l'est ou l'ouest. La valeur ASCII « E » indique l'est et la valeur « W » indique l'ouest."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
-msgstr ""
+msgstr "Longitude de destination"
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Indique la longitude du point de destination. La longitude est représentée par trois valeurs RATIONNELLES pour les degrés, minutes et secondes respectivement. Si la longitude est exprimée en degrés, minutes et secondes, le format typique est ddd/1,mm/1,ss/1. Quand des degrés et minutes sont utilisés et, par exemple, une fraction de minute est donnée avec jusqu'à deux chiffres décimaux, le format est ddd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
-msgstr ""
+msgstr "Référence de l'azimut de destination"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Indique la référence utilisée pour l'azimut vers le point de destination. « T » pour le nord géographique et « M » pour le nord magnétique."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
-msgstr ""
+msgstr "Azimut de destination"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
-msgstr ""
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
+msgstr "Indique l'azimut vers le point de destination. Les valeurs vont de 0.00 à 359.99."
 
 #: libexif/exif-tag.c:193
 msgid "Reference for Distance to Destination"
-msgstr ""
+msgstr "Référence pour le distance jusqu'à la destination"
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr "Indique l'unité utilisée pour exprimer la distance jusqu'à la destination. « K », « M » et « N » représentent des km, mille et mille marin."
 
 #: libexif/exif-tag.c:197
-#, fuzzy
 msgid "Distance to Destination"
-msgstr "Description des paramètres du périphérique"
+msgstr "Distance jusqu'à la destination"
 
 #: libexif/exif-tag.c:198
-#, fuzzy
 msgid "Indicates the distance to the destination point."
-msgstr "Ce marqueur indique la distance au sujet."
+msgstr "Indique la distance jusqu'au point de destination."
 
 #: libexif/exif-tag.c:199
 msgid "Name of GPS Processing Method"
-msgstr ""
+msgstr "Nom de la méthode de traitement GPS"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Une chaîne de caractères contenant le nom de la méthode utilisée pour trouver des positions. Le premier octet indique le code de caractère utilisé. Il est suivi par le nom de la méthode. Puisque le Type n'est pas ASCII, il n'est pasnécessaire de le terminer par NULL."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
-msgstr ""
+msgstr "Nom de l'aire GPS"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Une chaîne de caractères contenant le nom de l'aire GPS. Le premier octet indique le code de caractère utilise. Il est suivi par le nom de l'aire GPS. Puisque le Type n'est pas ASCII, il n'est pas nécessaire de le terminer par NULL."
 
 #: libexif/exif-tag.c:210
 msgid "GPS Date"
-msgstr ""
+msgstr "Date GPS"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "Une chaîne de caractères contenant la date et l'heure UTC (temps universel). Le format est « AAAA:MM:JJ ». La longueur de la chaîne est 11 caractères y compris le NULL de fin."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
-msgstr ""
+msgstr "Correction GPS différentielle"
 
 #: libexif/exif-tag.c:216
+msgid "Indicates whether differential correction is applied to the GPS receiver."
+msgstr "Indique si la correction différentielle est appliquée au récepteur GPS."
+
+#: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
 msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
-msgstr ""
+msgstr "Type du nouveau sous-fichier"
 
 #: libexif/exif-tag.c:220
 msgid "A general indication of the kind of data contained in this subfile."
-msgstr ""
+msgstr "Indication approximative du type de données contenues dans ce sous-fichier."
 
 #: libexif/exif-tag.c:222
 msgid "Image Width"
-msgstr "Hauteur de l'image"
+msgstr "Largeur de l'image"
 
 #: libexif/exif-tag.c:223
-#, 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 ""
-"Le nombre de colonnes des données de l'image, égal au nombre de pixels par "
-"ligne. Dans des données compressées en JPEG un marqueur JPEG est utilisé à "
-"la place de ce marqueur."
+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 "Le nombre de colonnes des données de l'image, égal au nombre de pixels par ligne. Dans des données compressées en JPEG un marqueur JPEG est utilisé à la place de ce descripteur."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
-msgstr "Longeur de l'image"
+msgstr "Longueur de l'image"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"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."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Le nombre de lignes de données de l'image. Dans des données compressées en JPEG un marqueur JPEG est utilisé à la place de ce descripteur."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
-msgstr "Bits des échantillons"
+msgstr "Bits par échantillons"
 
 #: libexif/exif-tag.c:232
-#, fuzzy
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
-"Le nombre de bits par composant d'image. Dans ce standard chaque composant "
-"de l'image fait 8 bits, donc la valeur de ce tag est 9. Voyez aussi "
-"<SamplesPerPixel>. Dans des données compressées en JPEG un marqueur JPEG est "
-"utilisé à la place de ce marqueur."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Le nombre de bits par composant d'image. Dans ce standard chaque composant de l'image occupe 8 bits, donc la valeur de ce descripteur est 8. Voyez aussi <SamplesPerPixel>. Dans des données compressées en JPEG un marqueur JPEG est utilisé à la place de ce descripteur."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Compression"
 
 #: libexif/exif-tag.c:238
-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 ""
-"Le schéma de compression utilisé par les données de l'image. Quand une image "
-"primaire est compressée en JPEG, cette désignation n'est pas nécessaire et "
-"est omise. Lorsque les vignettes utilisent la compression JPEG, la valeur de "
-"ce marqueur est de 6."
+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 "Le schéma de compression utilisé par les données de l'image. Quand une image primaire est compressée en JPEG, cette désignation n'est pas nécessaire et est omise. Lorsque les vignettes utilisent la compression JPEG, la valeur de ce descripteur est 6."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
 msgstr "Interprétation photométrique"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
-"La composition des pixels. Dans des données compressées en JPEG un marqueur "
-"JPEG est utilisé à la place de ce marqueur."
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "La composition des pixels. Dans des données compressées en JPEG un marqueur JPEG est utilisé à la place de ce descripteur."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
@@ -3085,250 +2772,148 @@ msgid "Image Description"
 msgstr "Description de l'image"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
-"Une chaîne de caractères donnant le titre de l'image. Ce peut être un "
-"commentaire comme \"pique-nique société 1988\" ou approchant. Les codes de "
-"caractères sur deux octets ne peuvent être utilisés. Lorsqu'un code deux "
-"octets est nécessaire, le marqueur privé exif <UserComment> doit être "
-"utilisé."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "Une chaîne de caractères donnant le titre de l'image. Ce peut être un commentaire comme « pique-nique société 1988 » ou approchant. Les caractères codés sur deux octets ne peuvent être utilisés. Lorsqu'un caractère sur deux octets est nécessaire, le marqueur privé exif <UserComment> doit être utilisé."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Constructeur"
 
 #: libexif/exif-tag.c:261
-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 ""
-"Le constructeur de l'équipement d'enregistrement. C'est le constructeur du "
-"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."
+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 "Le constructeur de l'équipement d'enregistrement. C'est le constructeur du 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 que inconnu."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Modèle"
 
 #: libexif/exif-tag.c:268
-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 ""
-"Le nom du modèle ou le numéro du modèle de l'équipement. C'est le nom du "
-"modèlé ou le numéro du 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."
+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 "Le nom du modèle ou le numéro du modèle de l'équipement. C'est le nom du modèle ou le numéro du 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 que inconnu."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
-msgstr ""
+msgstr "Décalages de bande"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "Pour chaque bande, le décalage en octets de cette bande. Il est recommandé de sélectionner un nombre d'octets de bande ne dépassant pas 64 KOctets. Dans le cas de données JPEG compressées, cette information n'est pas nécessaire et peut être omise. Consultez aussi <RowsPerStrip> et <StripByteCounts>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
 msgstr "Orientation"
 
 #: libexif/exif-tag.c:281
-#, fuzzy
 msgid "The image orientation viewed in terms of rows and columns."
-msgstr "L'orientation de l'image vue en terme de lignes et colonnes."
+msgstr "L'orientation de l'image considérée en termes de lignes et de colonnes."
 
 #: libexif/exif-tag.c:284
 msgid "Samples per Pixel"
 msgstr "Échantillons par pixel"
 
 #: libexif/exif-tag.c:285
-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 ""
-"Le nombre de composants par pixel. Puisque le standard s'applique aux images "
-"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."
+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 "Le nombre de composants par pixel. Puisque le standard s'applique aux images 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."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
-msgstr ""
+msgstr "Lignes par bandes"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Nombre de colonnes par bande. Ceci représente le nombre de lignes dans une bande de l'image lorsque celle-ci est divisée en bandes. Dans le cas de données JPEG compressées, cette donnée n'est pas nécessaire et elle est omise. Voir aussi <StripOffsets> et <StripByteCounts>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
-msgstr ""
+msgstr "Nombre d'octets par bande"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Le nombre total d'octets dans chaque bande. Dans le cas de données JPEG compressées cette donnée n'est pas nécessaire et est omise."
 
 #: libexif/exif-tag.c:301
-#, fuzzy
 msgid "X-Resolution"
-msgstr "x-résolution"
+msgstr "Résolution X"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
-"Le nombre de pixels par <ResolutionUnit> dans la direction <ImageWidth>."
-"Lorsque la résolution de l'image est inconnu, 72 [dpi] sont utilisés."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Le nombre de pixels par <ResolutionUnit> dans la direction <ImageWidth>. Lorsque la résolution de l'image est inconnue, 72 [dpi] est utilisé."
 
 #: libexif/exif-tag.c:306
-#, fuzzy
 msgid "Y-Resolution"
-msgstr "x-résolution"
+msgstr "Résolution Y"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"Le nombre de pixels par <ResolutionUnit> dans la direction <ImageLength>.La "
-"même valeur que pour <XResolution> est utilisée."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Le nombre de pixels par <ResolutionUnit> dans la direction <ImageLength>. La même valeur que pour <XResolution> est utilisée."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
 msgstr "Configuration du plan"
 
 #: libexif/exif-tag.c:312
-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 ""
+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 "Indique si les composant d'un pixel sont enregistrés au format chunky ou planar. Dans les fichiers JPEG compressés un marqueur JPEG est utilisé au lieu de ce descripteur. Si ce champ n'existe pas, la valeur TIFF de 1 (chunky) est adoptée par défaut."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "Unité de la résolution"
 
 #: libexif/exif-tag.c:318
-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 ""
-"L'unité de mesure pour <XResolution> et <YResolution>. La même unité est "
-"utilisée pour <XResolution> et <YResolution>. Si la résolution de l'image "
-"est inconnue, 2 (pouces) sont utilisées."
+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 "L'unité de mesure pour <XResolution> et <YResolution>. La même unité est utilisée pour <XResolution> et <YResolution>. Si la résolution de l'image est inconnue, 2 (pouces) est utilisé."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
 msgstr "Fonction de transfert"
 
 #: libexif/exif-tag.c:324
-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 ""
-"Une fonction de transfert pour l'image, décrite en style tableau. "
-"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>)."
+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 "Une fonction de transfert pour l'image, décrite en style tableau. Normalement, ce marqueur n'est pas nécessaire, puisque l'espace des couleurs est spécifié dans le descripteur d'information sur l'espace des couleurs (<ColorSpace>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Logiciel"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
-"Ce marqueur enregistre le nom et la version du logiciel ou du matériel de "
-"l'appareil ou du périphérique d'entrée utilisé pour générer l'image. Le "
-"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."
+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 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."
+msgstr "Ce marqueur enregistre le nom et la version du logiciel ou du microcode de l'appareil ou du périphérique d'entrée utilisé pour générer l'image. Le 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."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Date et heure"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"La date et l'heure de création de l'image. Dans ce standard (EXIF-2.1) il "
-"s'agit de la date et de l'heure de modification du fichier."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "La date et l'heure de création de l'image. Dans ce standard (EXIF-2.1) il s'agit de la date et de l'heure de modification du fichier."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Artiste"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
-"Ce marqueur enregistre le nom du propriétaire de l'appareil, du photographe "
-"ou du créateur de l'image. Le format détaillé n'est pas spécifié, mais il "
-"est recommandé que cette information soit écrite comme dans l'exemple ci-"
-"dessous pour faciliter l'interopérabilité. Lorsque le champ est laissé "
-"blanc, il est considéré comme inconnu."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "Ce marqueur enregistre le nom du propriétaire de l'appareil, du photographe ou du créateur de l'image. Le format détaillé n'est pas spécifié, mais il est recommandé que cette information soit écrite comme dans l'exemple ci-dessous pour faciliter l'interopérabilité. Lorsque le champ est laissé blanc, il est considéré comme inconnu."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Point blanc"
 
 #: libexif/exif-tag.c:348
-#, fuzzy
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
-"Une fonction de transfert pour l'image, décrite en style tableau. "
-"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>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space 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>)."
 
 #: libexif/exif-tag.c:353
 msgid "Primary Chromaticities"
-msgstr ""
+msgstr "Chromaticités primaires"
 
 #: libexif/exif-tag.c:354
-#, fuzzy
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
-msgstr ""
-"Une fonction de transfert pour l'image, décrite en style tableau. "
-"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>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "La chromaticité des trois couleurs primaires 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>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
+msgstr "Défini par Adobe Corporation pour activer les arbres TIFF dans un fichier TIFF."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
@@ -3339,296 +2924,188 @@ msgid "JPEG Interchange Format"
 msgstr "Format d'échange JPEG"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "Le décalage de l'octet de début (SOI) des données de la miniature JPEG compressée. Ceci n'est pas utilisé pour les données JPEG de l'image d'origine."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
 msgstr "Longueur du format d'échange JPEG"
 
 #: libexif/exif-tag.c:373
-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 ""
-"Le nombre d'octets de données des vignettes compressées JPEG. Ce n'est pas "
-"utilisé pour les données des images JPEG primaires. Les vignettes JPEG ne "
-"sont pas divisées mais sont enregistrées sous la forme d'un flux continu "
-"JPEG de SOI à EOI. Les marqueurs Appn et COM ne doivent pas être "
-"enregistrés. Les vignettes compressées doivent être enregistrées dans moins "
-"de 64 kilo-octets, incluant toutes les autres données devant être "
-"enregistrées dans APP1."
+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 "Le nombre d'octets de données dans la miniature compressée JPEG. Ce n'est pas utilisé pour les données de l'image JPEG primaire. Les miniatures JPEG ne sont pas divisées mais sont enregistrées sous la forme d'un flux continu JPEG de SOI à EOI. Les marqueurs Appn et COM ne doivent pas être enregistrés. Les miniatures compressées doivent être enregistrées dans moins de 64 kilo-octets, incluant toutes les autres données devant être enregistrées dans APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
-msgstr "Coéfficients YCbCr"
+msgstr "Coefficients YCbCr"
 
 #: libexif/exif-tag.c:383
-#, fuzzy
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
-"La valeur de référence des points noir et blanc. Nul défaut n'est donné en "
-"TIFF, mais les valeurs ci-dessous sont données comme défauts ici. L'espace "
-"des couleurs est déclaré dans le marqueur d'informations de l'espace des "
-"couleurs, avec la valeur par défaut étant celle donnant les caractéristiques "
-"optimales de l'image dans ces conditions."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "Les coefficients de la matrice pour transformer l'image RVB en YCbCr. Le TIFF nedéfini pas de valeur par défaut, mais les valeurs données dans les « Directives de l'espace des couleurs » sont utilisées par défaut ici. L'espace des couleurs est déclaré dans le marqueur d'informations de l'espace des couleurs avec comme valeur par défautcelle donnant les caractéristiques optimales d'interopérabilité de l'image dans ces conditions."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
-msgstr ""
+msgstr "Sous-échantillonnage YCbCr"
 
 #: libexif/exif-tag.c:393
-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 ""
+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 "Rapport d'échantillonnage des composants de chrominance par rapport à la composante luminance. Dans les données compressées JPEG, un marqueur JPEG est employé à la place de ce descripteur."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
 msgstr "Positionnement YCbCr"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Position des composants de chrominance par rapport à la composante luminance. Ce champ est indiqué uniquement pour des données compressées en JPEG ou des données non compressées en YCbCr. La valeur par défaut du TIFF est 1 (centré) ; mais quand Y:Cb:Cr = 4:2:2 on recommande que, dans cette norme, la valeur 2 (Co-situés) soit employée pour enregistrer des données, afin d'améliorer la qualité des images quand elles sont vues sur des TV. Quand ce champ n'existe pas, le lecteur assumera la valeur par défaut du TIFF. Dans le cas où Y:Cb:Cr = 4:2:0, la valeur par défaut du TIFF (centré) est recommandée. Si le lecteur n'a pas la capacité de supporter les deux types de <YCbCrPositioning>, il suivra la valeur par défaut du TIFF quelle que soit la valeur de ce champ. Il est préférable que les lecteurs soient capables de supporter à la fois les positions centrées et co-situées."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
 msgstr "Référence Noir/Blanc"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
-"La valeur de référence des points noir et blanc. Nul défaut n'est donné en "
-"TIFF, mais les valeurs ci-dessous sont données comme défauts ici. L'espace "
-"des couleurs est déclaré dans le marqueur d'informations de l'espace des "
-"couleurs, avec la valeur par défaut étant celle donnant les caractéristiques "
-"optimales de l'image dans ces conditions."
+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 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."
+msgstr "La valeur de référence des points noir et blanc. Nul défaut n'est donné en TIFF, mais les valeurs ci-dessous sont données comme défauts ici. L'espace des couleurs est déclaré dans le marqueur d'informations de l'espace des couleurs, avec la valeur par défaut étant celle donnant les caractéristiques optimales d'interopérabilité de l'image dans ces conditions."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
-msgstr ""
+msgstr "Paquet XML"
 
 #: libexif/exif-tag.c:423
 msgid "XMP Metadata"
-msgstr ""
+msgstr "Métadonnée XMP"
 
 #: libexif/exif-tag.c:438 libexif/exif-tag.c:784
 msgid "CFA Pattern"
 msgstr "Motif CFA"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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 ""
+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 "Indique le modèle géométrique de la mosaïque de filtre de couleur (CFA) du capteur d'image quand un capteur de couleur à puce unique est utilisé. Cela ne s'applique pas à toutes les méthodes de détection."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
-msgstr "Niveau de charge"
+msgstr "Niveau de batterie"
 
 #: libexif/exif-tag.c:444
 msgid "Copyright"
 msgstr "Copyright"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Informations relatives aux droits d'auteur. Dans cette norme, le descripteur est utilisé pour indiquer à la fois les droits du photographe et ceux de l'éditeur. C'est la notification de droits de la personne ou de l'organisation faisant valoir des droits sur l'image. La déclaration d'interopérabilité de droits incluant la date et les droits devrait être indiquée dans ce champ; par exemple, « Droits d'auteur, Jean Dupont, 19xx. Tous droits réservés. ». Dans cette norme, le champ contient à la fois les droits du photographe et ceux de l'éditeur, chacun étant inscrit dans une partie séparée de la déclaration. Quand une distinction claire existe entre les droits du photographe et ceux de l'éditeur, ceux-ci doivent être écrits avec les droits du photographe en premier suivis des droits de l'éditeur, séparés par NULL (dans ce cas, puisque la déclaration finit également par un NULL, il y a deux codes NULL) (voir l'exemple 1). Quand seul le photographe est connu, il est terminé par un code NULL (voir l'exemple 2). Quand seul l'éditeur est connu, la partie concernant les droits du photographe consiste en un espace suivi d'un code de fin NULL puis les droits de l'éditeur (voir l'exemple 3). Quand le champ est laissé vide, il est traité comme inconnu."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Temps d'exposition, en secondes (sec)."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-#, fuzzy
-msgid "F-Number"
-msgstr "Le nombre F."
-
 #: libexif/exif-tag.c:470
 msgid "The F number."
-msgstr "Le nombre F."
+msgstr "Le nombre d'ouverture."
 
 #: libexif/exif-tag.c:475
 msgid "Image Resources Block"
-msgstr ""
+msgstr "Bloc de ressources image"
 
 #: libexif/exif-tag.c:477
-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 ""
+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 "Pointeur vers l'IFD Exif. Interopérabilité, l'IFD Exif a la même structure que l'IFD spécifié pour le TIFF. D'habitude, cependant, il ne contient pas de donnée d'image comme dans le cas du TIFF."
 
 #: libexif/exif-tag.c:485
-#, fuzzy
 msgid "Exposure Program"
-msgstr "Mode d'exposition"
+msgstr "Programme d'exposition"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"La classe du programme utilisé par l'appareil pour configurer l'exposition "
-"lorsque la photo a été prise."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "La classe du programme utilisé par l'appareil pour configurer l'exposition lorsque la photo a été prise."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
-msgstr "Sensitivité spectrale"
+msgstr "Sensibilité spectrale"
 
 #: libexif/exif-tag.c:491
-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 ""
+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 "Indique la sensibilité spectrale de chaque canal de l'appareil utilisé. La valeur du descripteur est une chaîne ASCII compatible avec le standard développé par le Comité Technique ASTM."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
-msgstr ""
+msgstr "Pointeur IFD des infos du GPS"
 
 #: libexif/exif-tag.c:497
-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 ""
+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 "Pointeur vers l'IFD des infos GPS. La structure d'interopérabilité de l'IFD des infos GPS, comme celle de l'IFD Exif, n'a pas de donnée d'image."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
-msgstr ""
+msgstr "Valeurs de vitesse ISO"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Indique la vitesse et la latitude ISO de l'appareil photo ou du périphérique d'entrée comme spécifié par ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
-msgstr ""
+msgstr "Fonction de conversion opto-électronique"
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-msgstr ""
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+msgstr "Indique la fonction de conversion opto-électronique (OECF) spécifiée dans ISO 14524. <OECF> est une relation entre l'entrée de l'optique de l'appareil et les valeurs de l'image."
 
 #: libexif/exif-tag.c:513
 msgid "Time Zone Offset"
-msgstr ""
+msgstr "Décalage du fuseau horaire"
 
 #: libexif/exif-tag.c:514
 msgid "Encodes time zone of camera clock relative to GMT."
-msgstr ""
+msgstr "Encode le fuseau horaire de l'horloge de l'appareil par rapport au temps GMT."
 
 #: libexif/exif-tag.c:515
 msgid "Exif Version"
 msgstr "Version d'exif"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "Version de ce standard supportée. L'absence de ce champ est comprise comme une non conformité au standard."
 
 #: libexif/exif-tag.c:520
-#, fuzzy
 msgid "Date and Time (Original)"
 msgstr "Date et heure (originel)"
 
 #: libexif/exif-tag.c:521
-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 ""
+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 "Date et heure auxquelles les données originales de l'image ont été générées. Pour un appareil photo numérique, les date et heure auxquelles la photo a été prise sont enregistrées."
 
 #: libexif/exif-tag.c:526
-#, fuzzy
 msgid "Date and Time (Digitized)"
 msgstr "Date et heure (numérique)"
 
 #: libexif/exif-tag.c:527
-#, fuzzy
 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."
 
 #: libexif/exif-tag.c:530
-#, fuzzy
 msgid "Components Configuration"
-msgstr "Configuration du plan"
+msgstr "Configuration des composantes"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
+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 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."
+msgstr "Information spécifique aux données compressées. Les canaux de chaque composante sont rangés par ordre de la 1ère composante à la 4e. Dans le cas de données non compressées, l'arrangement des données est donné par le descripteur <PhotometricInterpretation>. Cependant, puisque <PhotometricInterpretattion> ne peut exprimer que l'ordre Y, Cb et Cr, ce descripteur est fourni pour les cas où des données compressées utiliseraient des composantes autres que Y, Cb et Cr et pour permettre la prise en charge d'autres séquences."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
-msgstr "Bits compressés par pixel"
+msgstr "Bits par pixel compressés"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Information spécifique aux données compressées. Le mode de compression utilisé pour une image compressée est indiqué en bits par pixel."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
-#, fuzzy
 msgid "Shutter Speed"
 msgstr "Vitesse d'obturation"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Vitesse d'obturation. L'unité est fixé par les paramètres de l'APEX (système additif d'exposition photographique)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
@@ -3639,31 +3116,24 @@ msgid "Brightness"
 msgstr "Luminosité"
 
 #: libexif/exif-tag.c:554
-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 ""
+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 "Valeur de la luminosité. L'unité est la valeur APEX. Elle est généralement donnée dans une fourchette -99.99 à 99.99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
-msgstr ""
+msgstr "Correction d'exposition"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "La correction d'exposition. L'unité est la valeur APEX. Elle est généralement donnée dans une fourchette -99.99 à 99.99."
 
 #: libexif/exif-tag.c:562
-#, fuzzy
 msgid "Maximum Aperture Value"
-msgstr "Ouverture"
+msgstr "Valeur d'ouverture maximale"
 
 #: libexif/exif-tag.c:563
-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 ""
+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 "Valeur F minimale de l'objectif. L'unité est la valeur APEX. Elle est habituellement exprimée dans la fourchette 00.00 à 99.99, mais n'est pas limitée à ces valeurs."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
@@ -3686,417 +3156,268 @@ msgid "The kind of light source."
 msgstr "Le type de source lumineuse."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
-msgstr ""
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
+msgstr "Ce descripteur est enregistré lorsque la photo est prise en utilisant un éclairage stroboscopique (flash)."
 
 #: libexif/exif-tag.c:582
-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 ""
+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 "Focale réelle de l'objectif, en mm. La conversion n'est pas faite vers la focale équivalente d'un appareil 35 mm."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr "Aire du sujet"
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
-msgstr ""
-"Ce marqueur indique l'emplacement et l'aire du sujet principal dans la scène "
-"générale."
+msgid "This tag indicates the location and area of the main subject in the overall scene."
+msgstr "Ce marqueur indique l'emplacement et l'aire du sujet principal dans la scène générale."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
-msgstr ""
+msgstr "ID Standard TIFF/EP"
 
 #: libexif/exif-tag.c:591
 msgid "Maker Note"
 msgstr "Note du créateur"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Un marqueur pour les constructeurs des logiciels d'écriture Exif pour noter "
-"une information désirée. Le contenu dépend du constructeur."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Un marqueur pour les constructeurs des logiciels d'écriture Exif pour noter une information désirée. Le contenu est laissé au choix du constructeur."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
 msgstr "Commentaire de l'utilisateur"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "Un descripteur pour que les utilisateurs de Exif puissent écrire des mots clés ou des commentaires sur l'image en plus de ceux dans <ImageDescription> sans la limitation de l'encodage des caractères de <ImageDescription>. L'encodage des caractères utilisé dans <UserComment> est identifié sur base d'un code ID dans une zone fixe de 8 octets au début des données du descripteur. La partie inutilisée des données est complétée avec des NULL (« 00.h »). Les codes ID sont assignés au moyen d'un enregistrement. La méthode de désignation et la référence pour chaque encodage de caractères sont définis dans la spécification. La valeur de CountN est déterminée sur base des 8 octets dans la zone de l'encodage des caractères et le nombre d'octets dans la partie du commentaire de l'utilisateur. Puisque le TYPE n'est pas en ASCII, la terminaison NULL n'est pas utile. Le code ID pour <UserComment> peut être un code défini tel que JIS ou ASCII ou peut être indéfini. Le nom pour un code indéfini est « UndefinedText » et le code ID est rempli avec 8 octets tous à NULL (« 00.H »). Un lecteur Exif qui lit le descripteur <UserComment> doit avoir une fonction pour déterminer le code ID. Cette fonction n'est pas requise dans les lecteurs qui n'utilisent pas le descripteur <UserComment>. Lorsque la zone de <UserComment> est mise de côté, il est recommandé que le code ID soit ASCII et que la partie du commentaire utilisateur soit remplie avec des espaces [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
-msgstr ""
+msgstr "Temps inférieur à la seconde"
 
 #: libexif/exif-tag.c:620
 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>."
+msgstr "Marqueur utilisé pour enregistrer des fractions de seconde pour le marqueur <DateTime>."
 
 #: libexif/exif-tag.c:624
-#, fuzzy
 msgid "Sub-second Time (Original)"
-msgstr "Date et heure (originel)"
+msgstr "Temps inférieur à la seconde (originel)"
 
 #: libexif/exif-tag.c:625
-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>."
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr "Marqueur utilisé pour enregistrer des fractions de seconde pour le marqueur <DateTimeOriginal>."
 
 #: libexif/exif-tag.c:629
-#, fuzzy
 msgid "Sub-second Time (Digitized)"
-msgstr "Date et heure (numérique)"
+msgstr "Temps inférieur à la seconde (numérique)"
 
 #: libexif/exif-tag.c:630
-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>."
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr "Marqueur utilisé pour enregistrer des fractions de seconde pour le marqueur <DateTimeDigitized>."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
-msgstr ""
+msgstr "Titre XP"
 
 #: libexif/exif-tag.c:635
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
-msgstr ""
+msgstr "Une chaîne de caractères donnant le titre de l'image, encodée en UTF-16LE."
 
 #: libexif/exif-tag.c:639
-#, fuzzy
 msgid "XP Comment"
-msgstr "Commentaire de l'utilisateur"
+msgstr "Commentaire XP"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
-msgstr ""
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
+msgstr "Une chaîne de caractères contenant un commentaire à propos de l'image, encodée en UTF-16LE."
 
 #: libexif/exif-tag.c:644
 msgid "XP Author"
-msgstr ""
+msgstr "Auteur XP"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
-msgstr ""
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
+msgstr "Une chaîne de caractères contenant le nom du créateur de l'image, encodée en UTF-16LE."
 
 #: libexif/exif-tag.c:649
 msgid "XP Keywords"
-msgstr ""
+msgstr "Mots clés XP"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "Une chaîne de caractères contenant des mots clés décrivant l'image, encodée en UTF-16LE."
 
 #: libexif/exif-tag.c:654
-#, fuzzy
 msgid "XP Subject"
-msgstr "Aire du sujet"
+msgstr "Sujet XP"
 
 #: libexif/exif-tag.c:655
 msgid "A character string giving the image subject, encoded in UTF-16LE."
-msgstr ""
+msgstr "Une chaîne de caractères contenant le sujet de l'image, encodée en UTF-16LE."
 
 #: libexif/exif-tag.c:659
 msgid "The FlashPix format version supported by a FPXR file."
-msgstr ""
+msgstr "Version du format FlashPix supportée par un fichier FPXR."
 
 #: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Espace des couleurs"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "Le descripteur de l'information de l'espace de couleurs est toujours enregistré comme le spécificateur de l'espace de couleurs. Normalement sRGB (=1) est utilisé pour définir l'espace de couleurs basé sur les conditions et environnement d'un moniteurs de PC. Si un espace de couleur autre que sRGB est utilisé, il doit être « Uncalibrated » (=FFFF.H). Les images enregistrées comme « Uncalibrated » peuvent être traitées comme sRGB quand elles sont converties vers FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
-msgstr ""
+msgstr "Dimension X du pixel"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Information spécifique aux données compressées. Quand un fichier compressé est enregistré, une largeur valable de l'image significative dans être enregistrée dans ce descripteur qu'il y ait ou non des données de bourrage et les marqueurs de redémarrage. Ce descripteur ne devrait pas être présent dans un fichier non compressé."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
-msgstr ""
+msgstr "Dimension Y du pixel"
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
+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, 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."
+msgstr "Information spécifique aux données compressées. Lorsqu'un fichier compressé est enregistré, une hauteur valable de l'image significative doit être enregistrée dans ce descripteur, qu'il y ait ou non des données de remplissage ou un marqueur de redémarrage. Ce descripteur ne devrait pas être présent dans un fichier non compressé. Puisque le bourrage est inutile dans le sens vertical, le nombre de lignes enregistré dans ce descripteur de hauteur valide d'image sera en fait le même que celui enregistré dans le SOF."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
-msgstr ""
+msgstr "Fichier son apparenté"
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Ce descripteur est utilisé pour enregistrer le nom du fichier audio apparenté aux données de l'image. La seule information relationnelle enregistrée ici est le nom et l'extension Exif du fichier audio (un chaîne ASCII constituée de 8 caractères + « . » + 3 caractères). Le chemin n'est pas stocké. Les stipulations sur les conventions audio et le nommage des fichiers sont définies dans la spécification. Lorsque ce descripteur est utilisé, les fichiers audio doivent être enregistrés en accord avec le format audio Exif. Les logiciels d'écriture sont également autorisés à stocker les données telles que de l'audio dans APP2 comme des données d'extension de flux FlashPix. La correspondance entre fichiers image et audio Exif est réalisée d'une des trois manière, [1], [2] et [3]. Si plusieurs fichiers sont mis en relation avec un autre comme dans [2] ou [3], le format ci-dessus est utilisé pour enregistre uniquement un nom de fichier audio. Si il y a plusieurs fichiers audio, le premier fichier enregistré est indiqué. Dans le cas de [3], par exemple, pour le fichier image Exif « DSC00001.JPG », seul « SND00001.WAV » est indiqué comme fichier audio Exif apparenté. Lorsqu'il y a trois fichiers audio Exif « SND00001.WAV », « SND00002.WAV » et « SND00003.WAV », le nom de fichier image Exif pour chacun d'eux « DSC00001.JPG » est indiqué. En combinant des informations relationnelles multiples, une variété de possibilités de restitutions peuvent être supportées. La méthode pour utiliser les informations relationnelles est laissée au soin de l'implémentation de la lecture. Puisque cette information est une chaîne de caractères ASCII, elle est terminée par NULL. Lorsque ce descripteur est utilisé pour faire correspondre des fichiers audio, la relation entre le fichier audio et l'image doit être indiquée du côté du fichier audio."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
-msgstr ""
+msgstr "Pointeur d'interopérabilité IFD"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "L'IFD d'interopérabilité est composé de descripteurs qui stockent l'information pour assurer l'interopérabilité et indiqué par le descripteur suivant situé dans l'IFD Exif. La structure d'interopérabilité de l'IFD d'interopérabilité est la même que la structure IFD définie par TIFF mais ne contient pas les données images caractéristiquement comparées avec l'IFD normal du TIFF."
 
 #: libexif/exif-tag.c:729
 msgid "Flash Energy"
-msgstr ""
+msgstr "Intensité du flash"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Indique l'intensité du flash au moment de la capture d'image, mesurée en BCPS (Beam Candle Power Seconds)."
 
 #: libexif/exif-tag.c:734
 msgid "Spatial Frequency Response"
-msgstr ""
+msgstr "Réponse en fréquence spatiale"
 
 #: libexif/exif-tag.c:735
-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 ""
+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 "Ce descripteur enregistre la table de fréquence spatiale de l'appareil ou du périphérique d'entrée ainsi que les valeurs SFR dans le sens de la largeur, de la longueur et de la diagonale de l'image, comme spécifié par ISO 12233."
 
 #: libexif/exif-tag.c:741
-#, fuzzy
 msgid "Focal Plane X-Resolution"
-msgstr "x-Résolution du plan focal"
+msgstr "Résolution X du plan focal"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Indique le nombre de pixels de largeur (X) de l'image par "
-"<FocalPlaneResolutionUnit> sur le plan focal de l'appareil."
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indique le nombre de pixels de largeur (X) de l'image par <FocalPlaneResolutionUnit> sur le plan focal de l'appareil."
 
 #: libexif/exif-tag.c:746
-#, fuzzy
 msgid "Focal Plane Y-Resolution"
-msgstr "x-Résolution du plan focal"
+msgstr "Résolution Y du plan focal"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Indique le nombre de pixels de hauteur (Y) de l'image par "
-"<FocalPlaneResolutionUnit> sur le plan focal de l'appareil."
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indique le nombre de pixels de hauteur (Y) de l'image par <FocalPlaneResolutionUnit> sur le plan focal de l'appareil."
 
 #: libexif/exif-tag.c:751
 msgid "Focal Plane Resolution Unit"
 msgstr "Unité de résolution du plan focal"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
-"Indique l'unité de mesure de <FocalPlaneXResolution> et de "
-"<FocalPlaneYResolution>. Cette valeur est la même que <ResolutionUnit>."
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Indique l'unité de mesure de <FocalPlaneXResolution> et de <FocalPlaneYResolution>. Cette valeur est la même que <ResolutionUnit>."
 
 #: libexif/exif-tag.c:757
 msgid "Subject Location"
 msgstr "Emplacement du sujet"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Indique la position du sujet principal dans la scène. La valeur de ce descripteur représente le pixel au centre du sujet principal relatif au bord gauche avant la rotation déclarée par le descripteur <Rotation>. La première valeur indique le numéro de colonne X. Le second indique le numéro de ligne Y."
 
 #: libexif/exif-tag.c:765
-#, fuzzy
 msgid "Exposure Index"
 msgstr "Index d'exposition"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
-msgstr ""
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Indique l'indice d'exposition sélectionné sur l'appareil ou le périphérique d'entrée au moment de la capture d'image."
 
 #: libexif/exif-tag.c:769
 msgid "Sensing Method"
-msgstr ""
+msgstr "Méthode d'acquisition"
 
 #: libexif/exif-tag.c:770
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr ""
+msgstr "Indique le type de capteur présent sur l'appareil ou le périphérique d'entrée."
 
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Source du fichier"
 
 #: libexif/exif-tag.c:774
-#, fuzzy
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"Indique la source de l'image. Si un DSC a enregistré l'image, la valeur de "
-"ce marqueur doit toujours être de 3, indiquant que l'image a été directement "
-"photographiée."
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Indique la source de l'image. Si un DSC a enregistré l'image, la valeur de ce marqueur doit toujours être de 3, indiquant que l'image a été directement photographiée."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
 msgstr "Type de scène"
 
 #: libexif/exif-tag.c:779
-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 ""
-"Indique le type de scène. Si un DSC a enregistré l'image, la valeur de ce "
-"marqueur doit toujours être de 1, indiquant que l'image a été directement "
-"photographiée."
+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 "Indique le type de scène. Si un DSC a enregistré l'image, la valeur de ce marqueur doit toujours être de 1, indiquant que l'image a été directement photographiée."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
 msgstr "Rendu personnalisé"
 
 #: libexif/exif-tag.c:790
-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 ""
+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 "Ce descripteur indique l'application d'un traitement spécial sur les données de l'image, par exemple à des fins d'impression. Lorsqu'un traitement spécial est appliqué, le lecteur est supposé réduire ou supprimer tout autre traitement."
 
 #: libexif/exif-tag.c:796
-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 ""
+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 "Ce descripteur indique le mode d'exposition choisi lors de la prise de vue. En mode auto-bracketing, l'appareil prend une série de photos de la scène avec différents réglages d'exposition."
 
 #: libexif/exif-tag.c:801
 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."
+msgstr "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image a été enregistrée."
 
 #: libexif/exif-tag.c:805
 msgid "Digital Zoom Ratio"
 msgstr "Valeur du zoom numérique"
 
 #: libexif/exif-tag.c:806
-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 ""
-"Ce marqueur indique la valeur du zoom numérique lorsque l'image a été prise."
-"Si le numérateur de la valeur enregistrée est 0, celà signifie que le zoom "
-"numérique n'a pas été utilisé."
+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 "Ce marqueur indique la valeur du zoom numérique lorsque l'image a été prise. Si le numérateur de la valeur enregistrée est 0, cela signifie que le zoom numérique n'a pas été utilisé."
 
 #: libexif/exif-tag.c:811
-#, fuzzy
 msgid "Focal Length in 35mm Film"
 msgstr "Longueur focale dans un film de 35mm"
 
 #: libexif/exif-tag.c:812
-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 ""
-"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."
+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 "Ce marqueur indique la longueur focale équivalente en supposant 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 descripteur FocalLength."
 
 #: libexif/exif-tag.c:818
 msgid "Scene Capture Type"
 msgstr "Type de capture de la scène"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
+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 scene type <SceneType> tag."
+msgstr "Ce descripteur indique le type de scène qui a été photographiée. Il peut également être utilisé pour stocker le mode dans lequel l'image a été prise. Notez que cela diffère du type de scène du descripteur <SceneType>."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
@@ -4104,39 +3425,27 @@ msgstr "Contrôle du gain"
 
 #: libexif/exif-tag.c:825
 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."
+msgstr "Ce marqueur indique le degré d'ajustement du gain général de l'image."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Ce descripteur indique la direction du traitement du contraste appliqué par l'appareil lors de la prise de vue."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Ce descripteur indique la direction du traitement de la saturation appliqué par l'appareil lors de la prise de vue."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Ce descripteur indique la direction du traitement de la netteté appliqué par l'appareil lors de la prise de vue."
 
 #: libexif/exif-tag.c:841
 msgid "Device Setting Description"
 msgstr "Description des paramètres du périphérique"
 
 #: libexif/exif-tag.c:842
-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 ""
-"Ce marqueur indique les informations sur les conditions lors de la prise de "
-"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."
+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 "Ce marqueur indique les informations sur les conditions de prise de vue d'un modèle particulier d'appareil. Ce marqueur n'est utilisé que pour indiquer les paramètres de prise de vue au lecteur."
 
 #: libexif/exif-tag.c:848
 msgid "Subject Distance Range"
@@ -4151,231 +3460,207 @@ msgid "Image Unique ID"
 msgstr "ID unique de l'image"
 
 #: libexif/exif-tag.c:852
-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 ""
-"Ce marqueur indique un identificateur unique assigné à chaque image. Il est "
-"enregistré sous la forme d'une chaîne ASCII équivalente à la notation "
-"hexadécimale et d'une longueur fixe de 128 bits."
+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 "Ce marqueur indique un identificateur unique assigné à chaque image. Il est enregistré sous la forme d'une chaîne ASCII équivalente à la notation hexadécimale et d'une longueur fixe de 128 bits."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: libexif/exif-tag.c:858
 msgid "Indicates the value of coefficient gamma."
-msgstr ""
+msgstr "Indique la valeur du coefficient gamma."
 
 #: libexif/exif-tag.c:860
 msgid "PRINT Image Matching"
-msgstr ""
+msgstr "PRINT Image Matching"
 
 #: libexif/exif-tag.c:861
 msgid "Related to Epson's PRINT Image Matching technology"
-msgstr ""
+msgstr "Apparenté à la technologie PRINT Image Matching de Epson"
 
 #: libexif/exif-tag.c:863
 msgid "Padding"
-msgstr ""
+msgstr "Bourrage"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Ce descripteur réserve de l'espace qui peut être récupéré plus tard quand des métadonnées supplémentaires sont ajoutées. Les nouvelles métadonnées peuvent être ajoutées en remplaçant ce descripteur par un élément plus petit et en utilisant l'espace libéré pour y stocker les nouveaux descripteurs de métadonnées ou étendre ceux existants."
 
 #: libexif/fuji/mnote-fuji-entry.c:62
-#, fuzzy
 msgid "Softest"
-msgstr "Doux"
+msgstr "Le plus doux"
 
 #: libexif/fuji/mnote-fuji-entry.c:66
-#, fuzzy
 msgid "Hardest"
-msgstr "Dur"
+msgstr "Le plus dur"
 
 #: libexif/fuji/mnote-fuji-entry.c:67 libexif/fuji/mnote-fuji-entry.c:96
 msgid "Medium soft"
-msgstr ""
+msgstr "Moyennement doux"
 
 #: libexif/fuji/mnote-fuji-entry.c:68 libexif/fuji/mnote-fuji-entry.c:94
 msgid "Medium hard"
-msgstr ""
+msgstr "Moyennement dur"
 
 #: libexif/fuji/mnote-fuji-entry.c:69 libexif/fuji/mnote-fuji-entry.c:90
 #: libexif/fuji/mnote-fuji-entry.c:98 libexif/fuji/mnote-fuji-entry.c:182
 msgid "Film simulation mode"
-msgstr ""
+msgstr "Mode de simulation d'un film"
 
 #: libexif/fuji/mnote-fuji-entry.c:79
 msgid "Incandescent"
-msgstr ""
+msgstr "Incandescent"
 
 #: libexif/fuji/mnote-fuji-entry.c:85
 msgid "Medium high"
-msgstr ""
+msgstr "Moyenne haute"
 
 #: libexif/fuji/mnote-fuji-entry.c:87
 msgid "Medium low"
-msgstr ""
+msgstr "Moyenne basse"
 
 #: libexif/fuji/mnote-fuji-entry.c:88 libexif/fuji/mnote-fuji-entry.c:97
 msgid "Original"
-msgstr ""
+msgstr "Originale"
 
 #: libexif/fuji/mnote-fuji-entry.c:124 libexif/pentax/mnote-pentax-entry.c:164
 #: libexif/pentax/mnote-pentax-entry.c:299
-#, fuzzy
 msgid "Program AE"
-msgstr "Programme normal"
+msgstr "Programme AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:125
-#, fuzzy
 msgid "Natural photo"
-msgstr "Saturation"
+msgstr "Photo naturelle"
 
 #: libexif/fuji/mnote-fuji-entry.c:126
-#, fuzzy
 msgid "Vibration reduction"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Réduction de vibration"
 
 #: libexif/fuji/mnote-fuji-entry.c:127
 msgid "Sunset"
-msgstr ""
+msgstr "Couché de soleil"
 
 #: libexif/fuji/mnote-fuji-entry.c:128 libexif/pentax/mnote-pentax-entry.c:181
 msgid "Museum"
-msgstr ""
+msgstr "Musée"
 
 #: libexif/fuji/mnote-fuji-entry.c:129
-#, fuzzy
 msgid "Party"
-msgstr "Partiel"
+msgstr "Fête"
 
 #: libexif/fuji/mnote-fuji-entry.c:130
 msgid "Flower"
-msgstr ""
+msgstr "Fleurs"
 
 #: libexif/fuji/mnote-fuji-entry.c:131 libexif/pentax/mnote-pentax-entry.c:176
 msgid "Text"
-msgstr ""
+msgstr "Texte"
 
 #: libexif/fuji/mnote-fuji-entry.c:132
-#, fuzzy
 msgid "NP & flash"
-msgstr "Flash"
+msgstr "NP & flash"
 
 #: libexif/fuji/mnote-fuji-entry.c:137
-#, fuzzy
 msgid "Aperture priority AE"
-msgstr "Priorité ouverture"
+msgstr "Priorité ouverture AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:138
-#, fuzzy
 msgid "Shutter priority AE"
-msgstr "Priorité obturation"
+msgstr "Priorité obturation AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:146
-#, fuzzy
 msgid "F-Standard"
-msgstr "Standard"
+msgstr "F-Standard"
 
 #: libexif/fuji/mnote-fuji-entry.c:147
 msgid "F-Chrome"
-msgstr ""
+msgstr "F-Couleur"
 
 #: libexif/fuji/mnote-fuji-entry.c:148
 msgid "F-B&W"
-msgstr ""
+msgstr "F-N&B"
 
 #: libexif/fuji/mnote-fuji-entry.c:151
 msgid "No blur"
-msgstr ""
+msgstr "Pas de flou"
 
 #: libexif/fuji/mnote-fuji-entry.c:152
 msgid "Blur warning"
-msgstr ""
+msgstr "Avertissement de flou"
 
 #: libexif/fuji/mnote-fuji-entry.c:155
-#, fuzzy
 msgid "Focus good"
-msgstr "Mode d'exposition"
+msgstr "Bonne mise au point"
 
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
-msgstr ""
+msgstr "Hors foyer"
 
 #: libexif/fuji/mnote-fuji-entry.c:159
 msgid "AE good"
-msgstr ""
+msgstr "Bon AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:160
 msgid "Over exposed"
-msgstr ""
+msgstr "Surexposé"
 
 #: libexif/fuji/mnote-fuji-entry.c:164
 msgid "Wide"
-msgstr ""
+msgstr "Large"
 
 #: libexif/fuji/mnote-fuji-entry.c:167
-#, fuzzy
 msgid "F0/Standard"
-msgstr "Standard"
+msgstr "F0/Standard"
 
 #: libexif/fuji/mnote-fuji-entry.c:168
-#, fuzzy
 msgid "F1/Studio portrait"
-msgstr "portrait"
+msgstr "F1/Portrait studio"
 
 #: libexif/fuji/mnote-fuji-entry.c:169
 msgid "F1a/Professional portrait"
-msgstr ""
+msgstr "F1a/Portrait professionnel"
 
 #: libexif/fuji/mnote-fuji-entry.c:170
 msgid "F1b/Professional portrait"
-msgstr ""
+msgstr "F1b/Portrait professionnel"
 
 #: libexif/fuji/mnote-fuji-entry.c:171
 msgid "F1c/Professional portrait"
-msgstr ""
+msgstr "F1c/Portrait professionnel"
 
 #: libexif/fuji/mnote-fuji-entry.c:172
 msgid "F2/Fujichrome"
-msgstr ""
+msgstr "F2/Fujichrome"
 
 #: libexif/fuji/mnote-fuji-entry.c:173
 msgid "F3/Studio portrait Ex"
-msgstr ""
+msgstr "F3/Ex portrait studio"
 
 #: libexif/fuji/mnote-fuji-entry.c:174
 msgid "F4/Velvia"
-msgstr ""
+msgstr "F4/Velvia"
 
 #: libexif/fuji/mnote-fuji-entry.c:177
 msgid "Auto (100-400%)"
-msgstr ""
+msgstr "Auto (100-400%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:179
-#, fuzzy
 msgid "Standard (100%)"
-msgstr "Standard"
+msgstr "Standard (100%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:180
 msgid "Wide1 (230%)"
-msgstr ""
+msgstr "Large1 (230%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:181
 msgid "Wide2 (400%)"
-msgstr ""
+msgstr "Large2 (400%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:263
 #, c-format
 msgid "%2.2f mm"
-msgstr ""
+msgstr "%2.2f mm"
 
 #: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
 #: libexif/pentax/mnote-pentax-entry.c:451
@@ -4384,360 +3669,326 @@ msgid "%i bytes unknown data"
 msgstr "%i de données inconnues"
 
 #: libexif/fuji/mnote-fuji-tag.c:36
-#, fuzzy
 msgid "Maker Note Version"
-msgstr "Note du créateur"
+msgstr "Version de note du créateur"
 
 #: libexif/fuji/mnote-fuji-tag.c:37
 msgid "This number is unique and based on the date of manufacture."
-msgstr ""
+msgstr "Ce nombre est unique et basé sur la date de fabrication."
 
 #: libexif/fuji/mnote-fuji-tag.c:41
-#, fuzzy
 msgid "Chromaticity Saturation"
-msgstr "Saturation"
+msgstr "Saturation de la chromaticité"
 
 #: libexif/fuji/mnote-fuji-tag.c:44
 msgid "Flash Firing Strength Compensation"
-msgstr ""
+msgstr "Compensation de la force du flash"
 
 #: libexif/fuji/mnote-fuji-tag.c:46
-#, fuzzy
 msgid "Focusing Mode"
-msgstr "Mode d'exposition"
+msgstr "Mode de mise au point"
 
 #: libexif/fuji/mnote-fuji-tag.c:47
-#, fuzzy
 msgid "Focus Point"
-msgstr "Mode d'exposition"
+msgstr "Point de mise au point"
 
 #: libexif/fuji/mnote-fuji-tag.c:48
 msgid "Slow Synchro Mode"
-msgstr ""
+msgstr "Mode de synchro lente"
 
 #: libexif/fuji/mnote-fuji-tag.c:49 libexif/pentax/mnote-pentax-tag.c:72
-#, fuzzy
 msgid "Picture Mode"
-msgstr "Mode d'exposition"
+msgstr "Mode d'image"
 
 #: libexif/fuji/mnote-fuji-tag.c:50
 msgid "Continuous Taking"
-msgstr ""
+msgstr "Prise continue"
 
 #: libexif/fuji/mnote-fuji-tag.c:51
 msgid "Continuous Sequence Number"
-msgstr ""
+msgstr "Numéro de séquence continu"
 
 #: libexif/fuji/mnote-fuji-tag.c:52
 msgid "FinePix Color"
-msgstr ""
+msgstr "Couleur FinePix"
 
 #: libexif/fuji/mnote-fuji-tag.c:53
 msgid "Blur Check"
-msgstr ""
+msgstr "Vérification de flou"
 
 #: libexif/fuji/mnote-fuji-tag.c:54
 msgid "Auto Focus Check"
-msgstr ""
+msgstr "Vérification d'auto focus"
 
 #: libexif/fuji/mnote-fuji-tag.c:55
-#, fuzzy
 msgid "Auto Exposure Check"
-msgstr "Exposition automatique"
+msgstr "Vérification d'exposition automatique"
 
 #: libexif/fuji/mnote-fuji-tag.c:56
 msgid "Dynamic Range"
-msgstr ""
+msgstr "Gamme dynamique"
 
 #: libexif/fuji/mnote-fuji-tag.c:57
 msgid "Film Simulation Mode"
-msgstr ""
+msgstr "Mode de simulation d'un film"
 
 #: libexif/fuji/mnote-fuji-tag.c:58
 msgid "Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Mode large gamme dynamique"
 
 #: libexif/fuji/mnote-fuji-tag.c:59
 msgid "Development Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Mode large gamme dynamique de développement"
 
 #: libexif/fuji/mnote-fuji-tag.c:60
-#, fuzzy
 msgid "Minimum Focal Length"
-msgstr "Longueur focale"
+msgstr "Longueur focale minimale"
 
 #: libexif/fuji/mnote-fuji-tag.c:61
-#, fuzzy
 msgid "Maximum Focal Length"
-msgstr "Longueur focale"
+msgstr "Longueur focale maximale"
 
 #: libexif/fuji/mnote-fuji-tag.c:62
 msgid "Maximum Aperture at Minimum Focal"
-msgstr ""
+msgstr "Ouverture maximale à focale minimale"
 
 #: libexif/fuji/mnote-fuji-tag.c:63
 msgid "Maximum Aperture at Maximum Focal"
-msgstr ""
+msgstr "Ouverture maximale à focale maximale"
 
 #: libexif/fuji/mnote-fuji-tag.c:65
-#, fuzzy
 msgid "Order Number"
-msgstr "Le nombre F."
+msgstr "Numéro d'ordre"
 
 #: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
-#, fuzzy
 msgid "Frame Number"
-msgstr "Le nombre F."
+msgstr "Numéro de trame"
 
 #: libexif/olympus/mnote-olympus-entry.c:49
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid format '%s', expected '%s' or '%s'."
-msgstr "Format invalide '%s', attendait '%s'."
+msgstr "Format invalide « %s », attendait « %s » ou « %s »."
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF non D lens"
-msgstr ""
+msgstr "Objectif AF (AF-D exclu)"
 
 #: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D or AF-S lens"
-msgstr ""
+msgstr "Objectif AF-D ou AF-S"
 
 #: libexif/olympus/mnote-olympus-entry.c:95
 msgid "AF-D G lens"
-msgstr ""
+msgstr "Objectif AF-D G"
 
 #: libexif/olympus/mnote-olympus-entry.c:96
 msgid "AF-D VR lens"
-msgstr ""
+msgstr "Objectif AF-D VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "AF-D G VR lens"
-msgstr ""
+msgstr "Objectif AF-D G VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:101
 msgid "Flash unit unknown"
-msgstr ""
+msgstr "Unité de flash inconnue"
 
 #: libexif/olympus/mnote-olympus-entry.c:102
 msgid "Flash is external"
-msgstr ""
+msgstr "Flash externe"
 
 #: libexif/olympus/mnote-olympus-entry.c:103
-#, fuzzy
 msgid "Flash is on camera"
-msgstr "Flash"
+msgstr "Flash sur l'appareil"
 
 #: libexif/olympus/mnote-olympus-entry.c:106
 msgid "VGA basic"
-msgstr ""
+msgstr "VGA basique"
 
 #: libexif/olympus/mnote-olympus-entry.c:107
-#, fuzzy
 msgid "VGA normal"
-msgstr "Normal"
+msgstr "VGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:108
 msgid "VGA fine"
-msgstr ""
+msgstr "VGA fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:109
 msgid "SXGA basic"
-msgstr ""
+msgstr "SXGA basique"
 
 #: libexif/olympus/mnote-olympus-entry.c:110
-#, fuzzy
 msgid "SXGA normal"
-msgstr "Normal"
+msgstr "SXGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:111
 msgid "SXGA fine"
-msgstr ""
+msgstr "SXGA fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:112
 msgid "2 Mpixel basic"
-msgstr ""
+msgstr "2 Mpixel basique"
 
 #: libexif/olympus/mnote-olympus-entry.c:113
 msgid "2 Mpixel normal"
-msgstr ""
+msgstr "2 Mpixel normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:114
 msgid "2 Mpixel fine"
-msgstr ""
+msgstr "2 Mpixel fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:117
-#, fuzzy
 msgid "Color"
-msgstr "Espace des couleurs"
+msgstr "Couleur"
 
 #: libexif/olympus/mnote-olympus-entry.c:122
-#, fuzzy
 msgid "Bright+"
-msgstr "Copyright"
+msgstr "Luminosité+"
 
 #: libexif/olympus/mnote-olympus-entry.c:123
-#, fuzzy
 msgid "Bright-"
-msgstr "Copyright"
+msgstr "Luminosité-"
 
 #: libexif/olympus/mnote-olympus-entry.c:124
-#, fuzzy
 msgid "Contrast+"
-msgstr "Contraste"
+msgstr "Contraste+"
 
 #: libexif/olympus/mnote-olympus-entry.c:125
-#, fuzzy
 msgid "Contrast-"
-msgstr "Contraste"
+msgstr "Contraste-"
 
 #: libexif/olympus/mnote-olympus-entry.c:128
 msgid "ISO 80"
-msgstr ""
+msgstr "ISO 80"
 
 #: libexif/olympus/mnote-olympus-entry.c:129
 msgid "ISO 160"
-msgstr ""
+msgstr "ISO 160"
 
 #: libexif/olympus/mnote-olympus-entry.c:130
 msgid "ISO 320"
-msgstr ""
+msgstr "ISO 320"
 
 #: libexif/olympus/mnote-olympus-entry.c:131
 #: libexif/olympus/mnote-olympus-entry.c:249
 msgid "ISO 100"
-msgstr ""
+msgstr "ISO 100"
 
 #: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Preset"
-msgstr ""
+msgstr "Préréglé"
 
 #: libexif/olympus/mnote-olympus-entry.c:137
 msgid "Incandescence"
-msgstr ""
+msgstr "Incandescent"
 
 #: libexif/olympus/mnote-olympus-entry.c:138
-#, fuzzy
 msgid "Fluorescence"
 msgstr "Fluorescent"
 
 #: libexif/olympus/mnote-olympus-entry.c:140
 msgid "SpeedLight"
-msgstr ""
+msgstr "SpeedLight"
 
 #: libexif/olympus/mnote-olympus-entry.c:143
-#, fuzzy
 msgid "No fisheye"
-msgstr "Flash"
+msgstr "Non fisheye"
 
 #: libexif/olympus/mnote-olympus-entry.c:144
-#, fuzzy
 msgid "Fisheye on"
-msgstr "Flash"
+msgstr "Fisheye actif"
 
 #: libexif/olympus/mnote-olympus-entry.c:147
-#, fuzzy
 msgid "Normal, SQ"
-msgstr "Normal"
+msgstr "Normal, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:148
-#, fuzzy
 msgid "Normal, HQ"
-msgstr "Normal"
+msgstr "Normal, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:149
-#, fuzzy
 msgid "Normal, SHQ"
-msgstr "Normal"
+msgstr "Normal, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:150
-#, fuzzy
 msgid "Normal, RAW"
-msgstr "Normal"
+msgstr "Normal, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:151
-#, fuzzy
 msgid "Normal, SQ1"
-msgstr "Normal"
+msgstr "Normal, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:152
-#, fuzzy
 msgid "Normal, SQ2"
-msgstr "Normal"
+msgstr "Normal, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:153
-#, fuzzy
 msgid "Normal, super high"
-msgstr "Programme normal"
+msgstr "Normal, super high"
 
 #: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Normal, standard"
-msgstr ""
+msgstr "Normal, standard"
 
 #: libexif/olympus/mnote-olympus-entry.c:155
-#, fuzzy
 msgid "Fine, SQ"
-msgstr "pouces"
+msgstr "Fin, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:156
-#, fuzzy
 msgid "Fine, HQ"
-msgstr "pouces"
+msgstr "Fin, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:157
-#, fuzzy
 msgid "Fine, SHQ"
-msgstr "pouces"
+msgstr "Fin, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:158
-#, fuzzy
 msgid "Fine, RAW"
-msgstr "pouces"
+msgstr "Fin, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:159
-#, fuzzy
 msgid "Fine, SQ1"
-msgstr "pouces"
+msgstr "Fin, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:160
-#, fuzzy
 msgid "Fine, SQ2"
-msgstr "pouces"
+msgstr "Fin, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Fine, super high"
-msgstr ""
+msgstr "Fin, super high"
 
 #: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, SQ"
-msgstr ""
+msgstr "Super fin, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, HQ"
-msgstr ""
+msgstr "Super fin, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SHQ"
-msgstr ""
+msgstr "Super fin, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, RAW"
-msgstr ""
+msgstr "Super fin, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, SQ1"
-msgstr ""
+msgstr "Super fin, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:167
 msgid "Super fine, SQ2"
-msgstr ""
+msgstr "Super fin, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:168
 msgid "Super fine, super high"
-msgstr ""
+msgstr "Super fin, super high"
 
 #: libexif/olympus/mnote-olympus-entry.c:169
 msgid "Super fine, high"
-msgstr ""
+msgstr "Super fin, high"
 
 #: libexif/olympus/mnote-olympus-entry.c:172
 #: libexif/olympus/mnote-olympus-entry.c:177
@@ -4745,1266 +3996,1113 @@ msgstr ""
 #: libexif/olympus/mnote-olympus-entry.c:220
 #: libexif/olympus/mnote-olympus-entry.c:243
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #: libexif/olympus/mnote-olympus-entry.c:183
 msgid "On (Preset)"
-msgstr ""
+msgstr "Activé (préréglé)"
 
 #: libexif/olympus/mnote-olympus-entry.c:188
 msgid "Fill"
-msgstr ""
+msgstr "Remplissage"
 
 #: libexif/olympus/mnote-olympus-entry.c:195
-#, fuzzy
 msgid "Internal + external"
-msgstr "Flash"
+msgstr "Interne + externe"
 
 #: libexif/olympus/mnote-olympus-entry.c:224
-#, fuzzy
 msgid "Interlaced"
-msgstr "Intel"
+msgstr "Entrelacé"
 
 #: libexif/olympus/mnote-olympus-entry.c:225
 msgid "Progressive"
-msgstr ""
+msgstr "Progressif"
 
 #: libexif/olympus/mnote-olympus-entry.c:231
 #: libexif/pentax/mnote-pentax-entry.c:85
 #: libexif/pentax/mnote-pentax-entry.c:139
 msgid "Best"
-msgstr ""
+msgstr "Le meilleur"
 
 #: libexif/olympus/mnote-olympus-entry.c:232
-#, fuzzy
 msgid "Adjust exposure"
-msgstr "Exposition automatique"
+msgstr "Ajuster exposition"
 
 #: libexif/olympus/mnote-olympus-entry.c:235
-#, fuzzy
 msgid "Spot focus"
-msgstr "Exposition manuel"
+msgstr "Repère de mise au point"
 
 #: libexif/olympus/mnote-olympus-entry.c:236
-#, fuzzy
 msgid "Normal focus"
-msgstr "Processus normal"
+msgstr "Mise au point normale"
 
 #: libexif/olympus/mnote-olympus-entry.c:239
 msgid "Record while down"
-msgstr ""
+msgstr "Enregistre si appuyé"
 
 #: libexif/olympus/mnote-olympus-entry.c:240
 msgid "Press start, press stop"
-msgstr ""
+msgstr "Appuyez start, appuyez stop"
 
 #: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 50"
-msgstr ""
+msgstr "ISO 50"
 
 #: libexif/olympus/mnote-olympus-entry.c:250
 msgid "ISO 200"
-msgstr ""
+msgstr "ISO 200"
 
 #: libexif/olympus/mnote-olympus-entry.c:251
 msgid "ISO 400"
-msgstr ""
+msgstr "ISO 400"
 
 #: libexif/olympus/mnote-olympus-entry.c:255
 #: libexif/pentax/mnote-pentax-entry.c:168
-#, fuzzy
 msgid "Sport"
-msgstr "Spot"
+msgstr "Sport"
 
 #: libexif/olympus/mnote-olympus-entry.c:256
 msgid "TV"
-msgstr ""
+msgstr "TV"
 
 #: libexif/olympus/mnote-olympus-entry.c:258
 msgid "User 1"
-msgstr ""
+msgstr "Utilisateur 1"
 
 #: libexif/olympus/mnote-olympus-entry.c:259
 msgid "User 2"
-msgstr ""
+msgstr "Utilisateur 2"
 
 #: libexif/olympus/mnote-olympus-entry.c:260
 msgid "Lamp"
-msgstr ""
+msgstr "Lampe"
 
 #: libexif/olympus/mnote-olympus-entry.c:263
 msgid "5 frames/sec"
-msgstr ""
+msgstr "5 images/sec"
 
 #: libexif/olympus/mnote-olympus-entry.c:264
 msgid "10 frames/sec"
-msgstr ""
+msgstr "10 images/sec"
 
 #: libexif/olympus/mnote-olympus-entry.c:265
 msgid "15 frames/sec"
-msgstr ""
+msgstr "15 images/sec"
 
 #: libexif/olympus/mnote-olympus-entry.c:266
 msgid "20 frames/sec"
-msgstr ""
+msgstr "20 images/sec"
 
 #: libexif/olympus/mnote-olympus-entry.c:381
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
-msgstr ""
+msgstr "Correction rouge %f, correction bleue %f"
 
 #: libexif/olympus/mnote-olympus-entry.c:388
-#, fuzzy
 msgid "No manual focus selection"
-msgstr "Balance des blancs manuelle"
+msgstr "Pas de mise au point manuelle sélectionnée"
 
 #: libexif/olympus/mnote-olympus-entry.c:391
 #, c-format
 msgid "%2.2f meters"
-msgstr ""
+msgstr "%2.2f mètres"
 
 #: libexif/olympus/mnote-olympus-entry.c:417
-#, fuzzy
 msgid "AF position: center"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: centre"
 
 #: libexif/olympus/mnote-olympus-entry.c:418
-#, fuzzy
 msgid "AF position: top"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: haut"
 
 #: libexif/olympus/mnote-olympus-entry.c:419
-#, fuzzy
 msgid "AF position: bottom"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: bas"
 
 #: libexif/olympus/mnote-olympus-entry.c:420
-#, fuzzy
 msgid "AF position: left"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: gauche"
 
 #: libexif/olympus/mnote-olympus-entry.c:421
-#, fuzzy
 msgid "AF position: right"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: droite"
 
 #: libexif/olympus/mnote-olympus-entry.c:422
-#, fuzzy
 msgid "AF position: upper-left"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: haut-gauche"
 
 #: libexif/olympus/mnote-olympus-entry.c:423
-#, fuzzy
 msgid "AF position: upper-right"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: haut-droit"
 
 #: libexif/olympus/mnote-olympus-entry.c:424
-#, fuzzy
 msgid "AF position: lower-left"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: bas-gauche"
 
 #: libexif/olympus/mnote-olympus-entry.c:425
-#, fuzzy
 msgid "AF position: lower-right"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: bas-droite"
 
 #: libexif/olympus/mnote-olympus-entry.c:426
-#, fuzzy
 msgid "AF position: far left"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: extrême gauche"
 
 #: libexif/olympus/mnote-olympus-entry.c:427
-#, fuzzy
 msgid "AF position: far right"
-msgstr "Positionnement YCbCr"
+msgstr "Position AF: extrême droite"
 
 #: libexif/olympus/mnote-olympus-entry.c:428
-#, fuzzy
 msgid "Unknown AF position"
-msgstr "Version d'exif inconnu"
+msgstr "Position AF inconnue"
 
 #: libexif/olympus/mnote-olympus-entry.c:439
 #: libexif/olympus/mnote-olympus-entry.c:509
 #, c-format
 msgid "Internal error (unknown value %hi)"
-msgstr ""
+msgstr "Erreur interne (valeur %hi inconnue)"
 
 #: libexif/olympus/mnote-olympus-entry.c:447
 #: libexif/olympus/mnote-olympus-entry.c:517
 #, c-format
 msgid "Unknown value %hi"
-msgstr ""
+msgstr "Valeur %hi inconnue"
 
 #: libexif/olympus/mnote-olympus-entry.c:542
 #: libexif/olympus/mnote-olympus-entry.c:562
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown %hu"
-msgstr "Inconnu"
+msgstr "%hu inconnu"
 
 #: libexif/olympus/mnote-olympus-entry.c:559
-#, fuzzy
 msgid "2 sec."
-msgstr " sec."
+msgstr "2 sec."
 
 #: libexif/olympus/mnote-olympus-entry.c:598
 msgid "Fast"
-msgstr ""
+msgstr "Rapide"
 
 #: libexif/olympus/mnote-olympus-entry.c:702
 msgid "Automatic"
-msgstr ""
+msgstr "Automatique"
 
 #: libexif/olympus/mnote-olympus-entry.c:732
-#, fuzzy, c-format
+#, c-format
 msgid "Manual: %liK"
-msgstr "Manuel"
+msgstr "Manuel: %liK"
 
 #: libexif/olympus/mnote-olympus-entry.c:735
-#, fuzzy
 msgid "Manual: unknown"
-msgstr "inconnu"
+msgstr "Manuel: inconnu"
 
 #: libexif/olympus/mnote-olympus-entry.c:741
 msgid "One-touch"
-msgstr ""
+msgstr "Touche unique"
 
 #: libexif/olympus/mnote-olympus-entry.c:797
 #: libexif/olympus/mnote-olympus-entry.c:807
 msgid "Infinite"
-msgstr ""
+msgstr "Infini"
 
 #: libexif/olympus/mnote-olympus-entry.c:815
 #, c-format
 msgid "%i bytes unknown data: "
-msgstr "%i de données inconnues: "
+msgstr "%i octets de données inconnues: "
 
 #: libexif/olympus/mnote-olympus-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:53
-#, fuzzy
 msgid "ISO Setting"
-msgstr "Netteté"
+msgstr "Réglage ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:39
-#, fuzzy
 msgid "Color Mode (?)"
-msgstr "Espace des couleurs"
+msgstr "Mode de couleur (?)"
 
 #: libexif/olympus/mnote-olympus-tag.c:42
-#, fuzzy
 msgid "Image Sharpening"
-msgstr "Longeur de l'image"
+msgstr "Netteté de l'image"
 
 #: libexif/olympus/mnote-olympus-tag.c:44
-#, fuzzy
 msgid "Flash Setting"
-msgstr "Contraste"
+msgstr "Réglage du flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-#, fuzzy
 msgid "White Balance Fine Adjustment"
-msgstr "Balance des blancs"
+msgstr "Ajustement fin de la balance des blancs"
 
 #: libexif/olympus/mnote-olympus-tag.c:47
-#, fuzzy
 msgid "White Balance RB"
-msgstr "Balance des blancs"
+msgstr "Balance des blancs RB"
 
 #: libexif/olympus/mnote-olympus-tag.c:49
-#, fuzzy
 msgid "ISO Selection"
-msgstr "Netteté"
+msgstr "Sélection ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Preview Image IFD"
-msgstr ""
+msgstr "Prévisualiser l'image IFD"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Offset of the preview image directory (IFD) inside the file."
-msgstr ""
+msgstr "Offset vers le répertoire des images de prévisualisation (IFD) dans le fichier."
 
 #: libexif/olympus/mnote-olympus-tag.c:51
-#, fuzzy
 msgid "Exposurediff ?"
-msgstr "Mode d'exposition"
+msgstr "Écart d'exposition ?"
 
 #: libexif/olympus/mnote-olympus-tag.c:54
-#, fuzzy
 msgid "Image Boundary"
-msgstr "ID unique de l'image"
+msgstr "Bordure de l'image"
 
 #: libexif/olympus/mnote-olympus-tag.c:56
-#, fuzzy
 msgid "Flash Exposure Bracket Value"
-msgstr "Mode d'exposition"
+msgstr "Valeur du bracketing de l'exposition du flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:57
-#, fuzzy
 msgid "Exposure Bracket Value"
-msgstr "Temps d'exposition"
+msgstr "Valeur du bracketing de l'exposition"
 
 #: libexif/olympus/mnote-olympus-tag.c:58
 #: libexif/olympus/mnote-olympus-tag.c:96
-#, fuzzy
 msgid "Image Adjustment"
-msgstr "Longeur de l'image"
+msgstr "Ajustement de l'image"
 
 #: libexif/olympus/mnote-olympus-tag.c:59
-#, fuzzy
 msgid "Tone Compensation"
-msgstr "Temps d'exposition"
+msgstr "Compensation des tons"
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
-msgstr ""
+msgstr "Adaptateur"
 
 #: libexif/olympus/mnote-olympus-tag.c:62
 msgid "Lens"
-msgstr ""
+msgstr "Objectif"
 
 #: libexif/olympus/mnote-olympus-tag.c:63
 #: libexif/olympus/mnote-olympus-tag.c:135
 #: libexif/olympus/mnote-olympus-tag.c:185
-#, fuzzy
 msgid "Manual Focus Distance"
-msgstr "Balance des blancs manuelle"
+msgstr "Distance de la mise au point manuelle"
 
 #: libexif/olympus/mnote-olympus-tag.c:65
-#, fuzzy
 msgid "Flash Used"
-msgstr "Le flash s'est déclenché."
+msgstr "Flash utilisé"
 
 #: libexif/olympus/mnote-olympus-tag.c:66
-#, fuzzy
 msgid "AF Focus Position"
-msgstr "Mode d'exposition"
+msgstr "Positionnement mise au point AF"
 
 #: libexif/olympus/mnote-olympus-tag.c:67
-#, fuzzy
 msgid "Bracketing"
-msgstr "action"
+msgstr "Bracketing"
 
 #: libexif/olympus/mnote-olympus-tag.c:69
-#, fuzzy
 msgid "Lens F Stops"
-msgstr "Type de scène"
+msgstr "Valeur f de l'objectif"
 
 #: libexif/olympus/mnote-olympus-tag.c:70
-#, fuzzy
 msgid "Contrast Curve"
-msgstr "Contraste"
+msgstr "Courbe de contraste"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
 #: libexif/olympus/mnote-olympus-tag.c:95
 #: libexif/pentax/mnote-pentax-tag.c:134
-#, fuzzy
 msgid "Color Mode"
-msgstr "Espace des couleurs"
+msgstr "Mode de couleur"
 
 #: libexif/olympus/mnote-olympus-tag.c:72
-#, fuzzy
 msgid "Light Type"
-msgstr "Scène de nuit"
+msgstr "Type de lumière"
 
 #: libexif/olympus/mnote-olympus-tag.c:74
 msgid "Hue Adjustment"
-msgstr ""
+msgstr "Ajustement de teinte"
 
 #: libexif/olympus/mnote-olympus-tag.c:76
 #: libexif/olympus/mnote-olympus-tag.c:163
 #: libexif/pentax/mnote-pentax-tag.c:108
-#, fuzzy
 msgid "Noise Reduction"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Réduction du bruit"
 
 #: libexif/olympus/mnote-olympus-tag.c:79
 msgid "Sensor Pixel Size"
-msgstr ""
+msgstr "Taille du capteur en pixels"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
-#, fuzzy
 msgid "Image Data Size"
-msgstr "Hauteur de l'image"
+msgstr "Hauteur des données de l'image"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
 msgid "Size of compressed image data in bytes."
-msgstr ""
+msgstr "Taille des données compressées de l'image en octets."
 
 #: libexif/olympus/mnote-olympus-tag.c:84
 msgid "Total Number of Pictures Taken"
-msgstr ""
+msgstr "Nombre total d'images prises"
 
 #: libexif/olympus/mnote-olympus-tag.c:86
 msgid "Optimize Image"
-msgstr ""
+msgstr "Optimiser l'image"
 
 #: libexif/olympus/mnote-olympus-tag.c:88
-#, fuzzy
 msgid "Vari Program"
-msgstr "Programme normal"
+msgstr "Program Vari"
 
 #: libexif/olympus/mnote-olympus-tag.c:89
 msgid "Capture Editor Data"
-msgstr ""
+msgstr "Données liées à l'éditeur de capture"
 
 #: libexif/olympus/mnote-olympus-tag.c:90
 msgid "Capture Editor Version"
-msgstr ""
+msgstr "Version de l'éditeur de capture"
 
 #: libexif/olympus/mnote-olympus-tag.c:97
 #: libexif/olympus/mnote-olympus-tag.c:183
-#, fuzzy
 msgid "CCD Sensitivity"
-msgstr "Sensitivité spectrale"
+msgstr "Sensibilité CCD"
 
 #: libexif/olympus/mnote-olympus-tag.c:99
-#, fuzzy
 msgid "Focus"
-msgstr "Mode d'exposition"
+msgstr "Mise au point"
 
 #: libexif/olympus/mnote-olympus-tag.c:102
-#, fuzzy
 msgid "Converter"
-msgstr "Centimère"
+msgstr "Convertisseur"
 
 #: libexif/olympus/mnote-olympus-tag.c:105
 msgid "Thumbnail Image"
-msgstr ""
+msgstr "Image miniature"
 
 #: libexif/olympus/mnote-olympus-tag.c:106
 msgid "Speed/Sequence/Panorama Direction"
-msgstr ""
+msgstr "Vitesse/séquence/direction panorama"
 
 #: libexif/olympus/mnote-olympus-tag.c:109
-#, fuzzy
 msgid "Black & White Mode"
-msgstr "Modèle"
+msgstr "Mode noir et blanc"
 
 #: libexif/olympus/mnote-olympus-tag.c:111
-#, fuzzy
 msgid "Focal Plane Diagonal"
-msgstr "x-Résolution du plan focal"
+msgstr "Diagonale du plan focal"
 
 #: libexif/olympus/mnote-olympus-tag.c:112
 msgid "Lens Distortion Parameters"
-msgstr ""
+msgstr "Paramètres de la distorsion de l'objectif"
 
 #: libexif/olympus/mnote-olympus-tag.c:114
 msgid "Info"
-msgstr ""
+msgstr "Info"
 
 #: libexif/olympus/mnote-olympus-tag.c:115
 msgid "Camera ID"
-msgstr ""
+msgstr "ID de l'appareil photo"
 
 #: libexif/olympus/mnote-olympus-tag.c:116
 msgid "Precapture Frames"
-msgstr ""
+msgstr "Images d'amorce"
 
 #: libexif/olympus/mnote-olympus-tag.c:117
-#, fuzzy
 msgid "White Board"
-msgstr "Balance des blancs"
+msgstr "Tableau blanc"
 
 #: libexif/olympus/mnote-olympus-tag.c:118
-#, fuzzy
 msgid "One Touch White Balance"
-msgstr "Balance des blancs"
+msgstr "Balance des blancs immédiate"
 
 #: libexif/olympus/mnote-olympus-tag.c:119
-#, fuzzy
 msgid "White Balance Bracket"
-msgstr "Balance des blancs"
+msgstr "Bracketing de la balance des blancs"
 
 #: libexif/olympus/mnote-olympus-tag.c:120
 #: libexif/pentax/mnote-pentax-tag.c:123
-#, fuzzy
 msgid "White Balance Bias"
-msgstr "Balance des blancs"
+msgstr "Biais de la balance des blancs"
 
 #: libexif/olympus/mnote-olympus-tag.c:121
 msgid "Data Dump"
-msgstr ""
+msgstr "Vidage des données"
 
 #: libexif/olympus/mnote-olympus-tag.c:124
 msgid "ISO Value"
-msgstr ""
+msgstr "Valeur ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:125
-#, fuzzy
 msgid "Aperture Value"
-msgstr "Ouverture"
+msgstr "Valeur ouverture"
 
 #: libexif/olympus/mnote-olympus-tag.c:126
-#, fuzzy
 msgid "Brightness Value"
-msgstr "Luminosité"
+msgstr "Valeur luminosité"
 
 #: libexif/olympus/mnote-olympus-tag.c:128
-#, fuzzy
 msgid "Flash Device"
-msgstr "Le flash s'est déclenché."
+msgstr "Appareil de flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:130
 msgid "Sensor Temperature"
-msgstr ""
+msgstr "Capteur de température"
 
 #: libexif/olympus/mnote-olympus-tag.c:131
 msgid "Lens Temperature"
-msgstr ""
+msgstr "Température de l'objectif"
 
 #: libexif/olympus/mnote-olympus-tag.c:132
 msgid "Light Condition"
-msgstr ""
+msgstr "Condition d'éclairage"
 
 #: libexif/olympus/mnote-olympus-tag.c:136
 msgid "Zoom Step Count"
-msgstr ""
+msgstr "Décompte des pas du zoom"
 
 #: libexif/olympus/mnote-olympus-tag.c:137
 msgid "Focus Step Count"
-msgstr ""
+msgstr "Décompte des pas du focus"
 
 #: libexif/olympus/mnote-olympus-tag.c:138
-#, fuzzy
 msgid "Sharpness Setting"
-msgstr "Netteté"
+msgstr "Réglage de la netteté"
 
 #: libexif/olympus/mnote-olympus-tag.c:139
 msgid "Flash Charge Level"
-msgstr ""
+msgstr "Niveau de charge du flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:140
-#, fuzzy
 msgid "Color Matrix"
-msgstr "Espace des couleurs"
+msgstr "Matrice des couleurs"
 
 #: libexif/olympus/mnote-olympus-tag.c:141
-#, fuzzy
 msgid "Black Level"
-msgstr "Niveau de charge"
+msgstr "Niveau de noir"
 
 #: libexif/olympus/mnote-olympus-tag.c:142
-#, fuzzy
 msgid "White Balance Setting"
-msgstr "Balance des blancs"
+msgstr "Réglage de la balance des blancs"
 
 #: libexif/olympus/mnote-olympus-tag.c:143
 #: libexif/pentax/mnote-pentax-tag.c:87
-#, fuzzy
 msgid "Red Balance"
-msgstr "Balance des blancs"
+msgstr "Balance des rouges"
 
 #: libexif/olympus/mnote-olympus-tag.c:144
 #: libexif/pentax/mnote-pentax-tag.c:86
-#, fuzzy
 msgid "Blue Balance"
-msgstr "Balance des blancs"
+msgstr "Balance des bleus"
 
 #: libexif/olympus/mnote-olympus-tag.c:145
 msgid "Color Matrix Number"
-msgstr ""
+msgstr "Numéro de la matrice des couleurs"
 
 #: libexif/olympus/mnote-olympus-tag.c:147
-#, fuzzy
 msgid "Flash Exposure Comp"
-msgstr "Mode d'exposition"
+msgstr "Comp exposition flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:148
-#, fuzzy
 msgid "Internal Flash Table"
-msgstr "Flash"
+msgstr "Table flash interne"
 
 #: libexif/olympus/mnote-olympus-tag.c:149
-#, fuzzy
 msgid "External Flash G Value"
-msgstr "Flash"
+msgstr "Valeur G flash externe"
 
 #: libexif/olympus/mnote-olympus-tag.c:150
-#, fuzzy
 msgid "External Flash Bounce"
-msgstr "Flash"
+msgstr "Rebond flash externe"
 
 #: libexif/olympus/mnote-olympus-tag.c:151
-#, fuzzy
 msgid "External Flash Zoom"
-msgstr "Flash"
+msgstr "Zoom flash externe"
 
 #: libexif/olympus/mnote-olympus-tag.c:152
-#, fuzzy
 msgid "External Flash Mode"
-msgstr "Flash"
+msgstr "Mode flash externe"
 
 #: libexif/olympus/mnote-olympus-tag.c:153
-#, fuzzy
 msgid "Contrast Setting"
-msgstr "Contraste"
+msgstr "Réglage du contraste"
 
 #: libexif/olympus/mnote-olympus-tag.c:154
-#, fuzzy
 msgid "Sharpness Factor"
-msgstr "Netteté"
+msgstr "Facteur de netteté"
 
 #: libexif/olympus/mnote-olympus-tag.c:155
-#, fuzzy
 msgid "Color Control"
-msgstr "Espace des couleurs"
+msgstr "Contrôle des couleurs"
 
 #: libexif/olympus/mnote-olympus-tag.c:156
-#, fuzzy
 msgid "Olympus Image Width"
-msgstr "Hauteur de l'image"
+msgstr "Largeur d'image Olympus"
 
 #: libexif/olympus/mnote-olympus-tag.c:157
 msgid "Olympus Image Height"
-msgstr ""
+msgstr "Hauteur d'image Olympus"
 
 #: libexif/olympus/mnote-olympus-tag.c:158
-#, fuzzy
 msgid "Scene Detect"
-msgstr "Type de scène"
+msgstr "Détection de scène"
 
 #: libexif/olympus/mnote-olympus-tag.c:159
-#, fuzzy
 msgid "Compression Ratio"
-msgstr "Compression"
+msgstr "Taux de compression"
 
 #: libexif/olympus/mnote-olympus-tag.c:160
 msgid "Preview Image Valid"
-msgstr ""
+msgstr "Image prévisualisation valide"
 
 #: libexif/olympus/mnote-olympus-tag.c:161
 msgid "AF Result"
-msgstr ""
+msgstr "Résultat AF"
 
 #: libexif/olympus/mnote-olympus-tag.c:162
 msgid "CCD Scan Mode"
-msgstr ""
+msgstr "Scan mode CCD"
 
 #: libexif/olympus/mnote-olympus-tag.c:164
-#, fuzzy
 msgid "Infinity Lens Step"
-msgstr "Intel"
+msgstr "Incrément objectif portée infinie"
 
 #: libexif/olympus/mnote-olympus-tag.c:165
-#, fuzzy
 msgid "Near Lens Step"
-msgstr "Type de scène"
+msgstr "Incrément objectif courte portée"
 
 #: libexif/olympus/mnote-olympus-tag.c:166
-#, fuzzy
 msgid "Light Value Center"
-msgstr "Centimère"
+msgstr "Valeur lumière (centre)"
 
 #: libexif/olympus/mnote-olympus-tag.c:167
 msgid "Light Value Periphery"
-msgstr ""
+msgstr "Valeur lumière (périphérie)"
 
 #: libexif/olympus/mnote-olympus-tag.c:170
 msgid "Sequential Shot"
-msgstr ""
+msgstr "Prise séquentielle"
 
 #: libexif/olympus/mnote-olympus-tag.c:171
-#, fuzzy
 msgid "Wide Range"
-msgstr "Balance des blancs"
+msgstr "Gamme large"
 
 #: libexif/olympus/mnote-olympus-tag.c:172
-#, fuzzy
 msgid "Color Adjustment Mode"
-msgstr "Espace des couleurs"
+msgstr "Mode d'ajustement des couleurs"
 
 #: libexif/olympus/mnote-olympus-tag.c:174
-#, fuzzy
 msgid "Quick Shot"
-msgstr "Multi spot"
+msgstr "Prise rapide"
 
 #: libexif/olympus/mnote-olympus-tag.c:176
 msgid "Voice Memo"
-msgstr ""
+msgstr "Mémo vocal"
 
 #: libexif/olympus/mnote-olympus-tag.c:177
 msgid "Record Shutter Release"
-msgstr ""
+msgstr "Enregistre la relaxe de l'obturateur"
 
 #: libexif/olympus/mnote-olympus-tag.c:178
 msgid "Flicker Reduce"
-msgstr ""
+msgstr "Réduction des scintillements"
 
 #: libexif/olympus/mnote-olympus-tag.c:179
-#, fuzzy
 msgid "Optical Zoom"
-msgstr "Valeur du zoom numérique"
+msgstr "Zoom optique"
 
 #: libexif/olympus/mnote-olympus-tag.c:181
-#, fuzzy
 msgid "Light Source Special"
-msgstr "Source lumineuse"
+msgstr "Source lumineuse spéciale"
 
 #: libexif/olympus/mnote-olympus-tag.c:182
-#, fuzzy
 msgid "Resaved"
-msgstr "réservé"
+msgstr "Re-sauvé"
 
 #: libexif/olympus/mnote-olympus-tag.c:184
-#, fuzzy
 msgid "Scene Select"
-msgstr "Type de scène"
+msgstr "Sélection scène"
 
 #: libexif/olympus/mnote-olympus-tag.c:186
 msgid "Sequence Shot Interval"
-msgstr ""
+msgstr "Intervalle séquence de prise"
 
 #: libexif/olympus/mnote-olympus-tag.c:189
-#, fuzzy
 msgid "Epson Image Width"
-msgstr "Hauteur de l'image"
+msgstr "Largeur de l'image Epson"
 
 #: libexif/olympus/mnote-olympus-tag.c:190
-#, fuzzy
 msgid "Epson Image Height"
-msgstr "Longeur de l'image"
+msgstr "Hauteur de l'image Epson"
 
 #: libexif/olympus/mnote-olympus-tag.c:191
-#, fuzzy
 msgid "Epson Software Version"
-msgstr "Version d'exif"
+msgstr "Version logiciel Epson"
 
 #: libexif/pentax/mnote-pentax-entry.c:80
 #: libexif/pentax/mnote-pentax-entry.c:134
-#, fuzzy
 msgid "Multi-exposure"
-msgstr "Exposition manuel"
+msgstr "Exposition multiple"
 
 #: libexif/pentax/mnote-pentax-entry.c:83
 #: libexif/pentax/mnote-pentax-entry.c:137
 msgid "Good"
-msgstr ""
+msgstr "Bon"
 
 #: libexif/pentax/mnote-pentax-entry.c:84
 #: libexif/pentax/mnote-pentax-entry.c:138
-#, fuzzy
 msgid "Better"
-msgstr "Centimère"
+msgstr "Meilleur"
 
 #: libexif/pentax/mnote-pentax-entry.c:92
-#, fuzzy
 msgid "Flash on"
-msgstr "Flash"
+msgstr "Flash activé"
 
 #: libexif/pentax/mnote-pentax-entry.c:140
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #: libexif/pentax/mnote-pentax-entry.c:150
 msgid "2560x1920 or 2304x1728"
-msgstr ""
+msgstr "2560x1920 ou 2304x1728"
 
 #: libexif/pentax/mnote-pentax-entry.c:156
 msgid "2304x1728 or 2592x1944"
-msgstr ""
+msgstr "2304x1728 ou 2592x1944"
 
 #: libexif/pentax/mnote-pentax-entry.c:158
 msgid "2816x2212 or 2816x2112"
-msgstr ""
+msgstr "2816x2212 ou 2816x2112"
 
 #: libexif/pentax/mnote-pentax-entry.c:171
 msgid "Surf & snow"
-msgstr ""
+msgstr "Surf & neige"
 
 #: libexif/pentax/mnote-pentax-entry.c:172
-#, fuzzy
 msgid "Sunset or candlelight"
-msgstr "Lumière du jour"
+msgstr "Couché de soleil ou chandelle"
 
 #: libexif/pentax/mnote-pentax-entry.c:173
 msgid "Autumn"
-msgstr ""
+msgstr "Automne"
 
 #: libexif/pentax/mnote-pentax-entry.c:178
-#, fuzzy
 msgid "Self portrait"
-msgstr "Portrait"
+msgstr "Auto portrait"
 
 #: libexif/pentax/mnote-pentax-entry.c:179
-#, fuzzy
 msgid "Illustrations"
-msgstr "Saturation"
+msgstr "Illustrations"
 
 #: libexif/pentax/mnote-pentax-entry.c:180
-#, fuzzy
 msgid "Digital filter"
-msgstr "Valeur du zoom numérique"
+msgstr "Filtre digital"
 
 #: libexif/pentax/mnote-pentax-entry.c:182
 msgid "Food"
-msgstr ""
+msgstr "Nourriture"
 
 #: libexif/pentax/mnote-pentax-entry.c:183
-#, fuzzy
 msgid "Green mode"
-msgstr "Mode de mesure"
+msgstr "Mode vert"
 
 #: libexif/pentax/mnote-pentax-entry.c:184
-#, fuzzy
 msgid "Light pet"
-msgstr "Scène de nuit"
+msgstr "Animal clair"
 
 #: libexif/pentax/mnote-pentax-entry.c:185
 msgid "Dark pet"
-msgstr ""
+msgstr "Animal sombre"
 
 #: libexif/pentax/mnote-pentax-entry.c:186
 msgid "Medium pet"
-msgstr ""
+msgstr "Animal couleur neutre"
 
 #: libexif/pentax/mnote-pentax-entry.c:188
 #: libexif/pentax/mnote-pentax-entry.c:296
-#, fuzzy
 msgid "Candlelight"
-msgstr "Lumière du jour"
+msgstr "Chandelle"
 
 #: libexif/pentax/mnote-pentax-entry.c:189
-#, fuzzy
 msgid "Natural skin tone"
-msgstr "Saturation"
+msgstr "Couleur peau naturelle"
 
 #: libexif/pentax/mnote-pentax-entry.c:190
 msgid "Synchro sound record"
-msgstr ""
+msgstr "Enregistrement synchro son"
 
 #: libexif/pentax/mnote-pentax-entry.c:191
 msgid "Frame composite"
-msgstr ""
+msgstr "Cadre de décoration"
 
 #: libexif/pentax/mnote-pentax-entry.c:194
-#, fuzzy
 msgid "Auto, did not fire"
-msgstr "Le flash ne s'est pas déclenché."
+msgstr "Auto, pas déclenché"
 
 #: libexif/pentax/mnote-pentax-entry.c:196
-#, fuzzy
 msgid "Auto, did not fire, red-eye reduction"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Auto, pas déclenché, mode anti-yeux rouges"
 
 #: libexif/pentax/mnote-pentax-entry.c:197
-#, fuzzy
 msgid "Auto, fired"
-msgstr "Bracketing automatique"
+msgstr "Auto, déclenché"
 
 #: libexif/pentax/mnote-pentax-entry.c:199
-#, fuzzy
 msgid "Auto, fired, red-eye reduction"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Auto, déclenché, mode anti-yeux rouges."
 
 #: libexif/pentax/mnote-pentax-entry.c:201
 msgid "On, wireless"
-msgstr ""
+msgstr "Activé, sans fil"
 
 #: libexif/pentax/mnote-pentax-entry.c:202
-#, fuzzy
 msgid "On, soft"
-msgstr "Doux"
+msgstr "Activé, doux"
 
 #: libexif/pentax/mnote-pentax-entry.c:203
 msgid "On, slow-sync"
-msgstr ""
+msgstr "Activé, sync lente"
 
 #: libexif/pentax/mnote-pentax-entry.c:204
-#, fuzzy
 msgid "On, slow-sync, red-eye reduction"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Activé, sync lente, mode anti-yeux rouges"
 
 #: libexif/pentax/mnote-pentax-entry.c:205
 msgid "On, trailing-curtain sync"
-msgstr ""
+msgstr "Activé, sync au rideau"
 
 #: libexif/pentax/mnote-pentax-entry.c:213
 msgid "AF-S"
-msgstr ""
+msgstr "AF-S"
 
 #: libexif/pentax/mnote-pentax-entry.c:214
 msgid "AF-C"
-msgstr ""
+msgstr "AF-C"
 
 #: libexif/pentax/mnote-pentax-entry.c:217
-#, fuzzy
 msgid "Upper-left"
-msgstr "haut - gauche"
+msgstr "Haut-gauche"
 
 #: libexif/pentax/mnote-pentax-entry.c:218
 msgid "Top"
-msgstr ""
+msgstr "Haut"
 
 #: libexif/pentax/mnote-pentax-entry.c:219
-#, fuzzy
 msgid "Upper-right"
-msgstr "haut - droit"
+msgstr "Haut-droit"
 
 #: libexif/pentax/mnote-pentax-entry.c:221
 msgid "Mid-left"
-msgstr ""
+msgstr "Milieu-gauche"
 
 #: libexif/pentax/mnote-pentax-entry.c:223
-#, fuzzy
 msgid "Mid-right"
-msgstr "Copyright"
+msgstr "Milieu-droit"
 
 #: libexif/pentax/mnote-pentax-entry.c:225
-#, fuzzy
 msgid "Lower-left"
-msgstr "haut - gauche"
+msgstr "Bas-gauche"
 
 #: libexif/pentax/mnote-pentax-entry.c:226
-#, fuzzy
 msgid "Bottom"
-msgstr "bas - gauche"
+msgstr "Bas"
 
 #: libexif/pentax/mnote-pentax-entry.c:227
-#, fuzzy
 msgid "Lower-right"
-msgstr "haut - droit"
+msgstr "Bas-droit"
 
 #: libexif/pentax/mnote-pentax-entry.c:228
-#, fuzzy
 msgid "Fixed center"
-msgstr "Temps clair"
+msgstr "Centre fixe"
 
 #: libexif/pentax/mnote-pentax-entry.c:232
-#, fuzzy
 msgid "Multiple"
-msgstr "Multi spot"
+msgstr "Multiple"
 
 #: libexif/pentax/mnote-pentax-entry.c:234
-#, fuzzy
 msgid "Top-center"
-msgstr "centré"
+msgstr "Haut-centré"
 
 #: libexif/pentax/mnote-pentax-entry.c:240
-#, fuzzy
 msgid "Bottom-center"
-msgstr "centré"
+msgstr "Bas-centré"
 
 #: libexif/pentax/mnote-pentax-entry.c:257
 msgid "User selected"
-msgstr ""
+msgstr "Sélectionné par l'utilisateur"
 
 #: libexif/pentax/mnote-pentax-entry.c:282
 msgid "3008x2008 or 3040x2024"
-msgstr ""
+msgstr "3008x2008 ou 3040x2024"
 
 #: libexif/pentax/mnote-pentax-entry.c:293
-#, fuzzy
 msgid "Digital filter?"
-msgstr "Valeur du zoom numérique"
+msgstr "Filtre digital ?"
 
 #: libexif/pentax/mnote-pentax-entry.c:374
 #: libexif/pentax/mnote-pentax-entry.c:383
 #, c-format
 msgid "Internal error (unknown value %i %i)"
-msgstr ""
+msgstr "Erreur interne (valeur inconnue %i %i)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
-#, fuzzy
 msgid "Capture Mode"
-msgstr "Mode d'exposition"
+msgstr "Mode de capture"
 
 #: libexif/pentax/mnote-pentax-tag.c:36 libexif/pentax/mnote-pentax-tag.c:70
 #: libexif/pentax/mnote-pentax-tag.c:129
-#, fuzzy
 msgid "Quality Level"
-msgstr "Niveau de charge"
+msgstr "Niveau de qualité"
 
 #: libexif/pentax/mnote-pentax-tag.c:54
-#, fuzzy
 msgid "ISO Speed"
-msgstr "Vitesse d'obturation"
+msgstr "Vitesse ISO"
 
 #: libexif/pentax/mnote-pentax-tag.c:56
-#, fuzzy
 msgid "Colors"
-msgstr "Espace des couleurs"
+msgstr "Couleurs"
 
 #: libexif/pentax/mnote-pentax-tag.c:59
 msgid "PrintIM Settings"
-msgstr ""
+msgstr "Réglages PrintIM"
 
 #: libexif/pentax/mnote-pentax-tag.c:60 libexif/pentax/mnote-pentax-tag.c:131
 msgid "Time Zone"
-msgstr ""
+msgstr "Fuseau horaire"
 
 #: libexif/pentax/mnote-pentax-tag.c:61
-#, fuzzy
 msgid "Daylight Savings"
-msgstr "Lumière du jour"
+msgstr "Changement heure été/hiver"
 
 #: libexif/pentax/mnote-pentax-tag.c:64
 msgid "Preview Size"
-msgstr ""
+msgstr "Taille de la prévisualisation"
 
 #: libexif/pentax/mnote-pentax-tag.c:65
-#, fuzzy
 msgid "Preview Length"
-msgstr "Longeur de l'image"
+msgstr "Longueur prévisualisation"
 
 #: libexif/pentax/mnote-pentax-tag.c:66 libexif/pentax/mnote-pentax-tag.c:122
 msgid "Preview Start"
-msgstr ""
+msgstr "Début prévisualisation"
 
 #: libexif/pentax/mnote-pentax-tag.c:67
 msgid "Model Identification"
-msgstr ""
+msgstr "Identification du modèle"
 
 #: libexif/pentax/mnote-pentax-tag.c:68
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #: libexif/pentax/mnote-pentax-tag.c:69
 msgid "Time"
-msgstr ""
+msgstr "Heure"
 
 #: libexif/pentax/mnote-pentax-tag.c:75
-#, fuzzy
 msgid "AF Point Selected"
-msgstr "Balance des blancs manuelle"
+msgstr "Point AF sélectionné"
 
 #: libexif/pentax/mnote-pentax-tag.c:76
 msgid "Auto AF Point"
-msgstr ""
+msgstr "Point AF auto"
 
 #: libexif/pentax/mnote-pentax-tag.c:77
-#, fuzzy
 msgid "Focus Position"
-msgstr "Mode d'exposition"
+msgstr "Positionnement mise au point"
 
 #: libexif/pentax/mnote-pentax-tag.c:80
-#, fuzzy
 msgid "ISO Number"
-msgstr "Le nombre F."
+msgstr "Nombre ISO"
 
 #: libexif/pentax/mnote-pentax-tag.c:83
-#, fuzzy
 msgid "Auto Bracketing"
 msgstr "Bracketing automatique"
 
 #: libexif/pentax/mnote-pentax-tag.c:85
-#, fuzzy
 msgid "White Balance Mode"
-msgstr "Balance des blancs"
+msgstr "Mode de balance des blancs"
 
 #: libexif/pentax/mnote-pentax-tag.c:93
 msgid "World Time Location"
-msgstr ""
+msgstr "Emplacement temps mondial"
 
 #: libexif/pentax/mnote-pentax-tag.c:94
 msgid "Hometown City"
-msgstr ""
+msgstr "Ville d'origine"
 
 #: libexif/pentax/mnote-pentax-tag.c:95
 msgid "Destination City"
-msgstr ""
+msgstr "Ville de destination"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Hometown DST"
-msgstr ""
+msgstr "Changement heure été/hiver de l'origine"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
-#, fuzzy
 msgid "Home Daylight Savings Time"
-msgstr "Lumière du jour"
+msgstr "Changement heure été/hiver de l'origine"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
 msgid "Destination DST"
-msgstr ""
+msgstr "Changement heure été/hiver de destination"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
-#, fuzzy
 msgid "Destination Daylight Savings Time"
-msgstr "Lumière du jour"
+msgstr "Changement heure été/hiver de destination"
 
 #: libexif/pentax/mnote-pentax-tag.c:99
-#, fuzzy
 msgid "Image Processing"
-msgstr "Longeur de l'image"
+msgstr "Traitement d'image"
 
 #: libexif/pentax/mnote-pentax-tag.c:100
-#, fuzzy
 msgid "Picture Mode (2)"
-msgstr "Mode d'exposition"
+msgstr "Mode d'image (2)"
 
 #: libexif/pentax/mnote-pentax-tag.c:103
-#, fuzzy
 msgid "Image Area Offset"
-msgstr "Longeur de l'image"
+msgstr "Décalage de la zone de l'image"
 
 #: libexif/pentax/mnote-pentax-tag.c:104
-#, fuzzy
 msgid "Raw Image Size"
-msgstr "Hauteur de l'image"
+msgstr "Hauteur de l'image brute"
 
 #: libexif/pentax/mnote-pentax-tag.c:105
-#, fuzzy
 msgid "Autofocus Points Used"
-msgstr "Mode d'exposition"
+msgstr "Points mise au point automatique utilisés"
 
 #: libexif/pentax/mnote-pentax-tag.c:107
-#, fuzzy
 msgid "Camera Temperature"
-msgstr "ouverture"
+msgstr "Température caméra"
 
 #: libexif/pentax/mnote-pentax-tag.c:110
-#, fuzzy
 msgid "Image Tone"
-msgstr "ID unique de l'image"
+msgstr "Ton de l'image"
 
 #: libexif/pentax/mnote-pentax-tag.c:111
-#, fuzzy
 msgid "Shake Reduction Info"
-msgstr "Flash déclenché, mode anti-yeux rouges."
+msgstr "Info réduction tremblement"
 
 #: libexif/pentax/mnote-pentax-tag.c:112
-#, fuzzy
 msgid "Black Point"
-msgstr "Mode d'exposition"
+msgstr "Point noir"
 
 #: libexif/pentax/mnote-pentax-tag.c:114
 msgid "AE Info"
-msgstr ""
+msgstr "Info AE"
 
 #: libexif/pentax/mnote-pentax-tag.c:115
 msgid "Lens Info"
-msgstr ""
+msgstr "Information optique"
 
 #: libexif/pentax/mnote-pentax-tag.c:116
-#, fuzzy
 msgid "Flash Info"
-msgstr "Flash"
+msgstr "Information flash"
 
 #: libexif/pentax/mnote-pentax-tag.c:117
 msgid "Camera Info"
-msgstr ""
+msgstr "Information appareil"
 
 #: libexif/pentax/mnote-pentax-tag.c:118
-#, fuzzy
 msgid "Battery Info"
-msgstr "Niveau de charge"
+msgstr "Information batterie"
 
 #: libexif/pentax/mnote-pentax-tag.c:119
 msgid "Hometown City Code"
-msgstr ""
+msgstr "Code de la ville d'habitation"
 
 #: libexif/pentax/mnote-pentax-tag.c:120
 msgid "Destination City Code"
-msgstr ""
+msgstr "Code de la ville de destination"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
-#, fuzzy
 msgid "Object Distance"
-msgstr "Distance au sujet"
+msgstr "Distance de l'objet"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
-#, fuzzy
 msgid "Distance of photographed object in millimeters."
-msgstr "La distance au sujet, donnée en mètres."
+msgstr "Distance de l'objet photographié en millimètres."
 
 #: libexif/pentax/mnote-pentax-tag.c:126
-#, fuzzy
 msgid "Flash Distance"
-msgstr "Le flash s'est déclenché."
+msgstr "Distance du flash"
 
 #: libexif/pentax/mnote-pentax-tag.c:132
-#, fuzzy
 msgid "Bestshot Mode"
-msgstr "Flash"
+msgstr "Mode Bestshot"
 
 #: libexif/pentax/mnote-pentax-tag.c:133
-#, fuzzy
 msgid "CCS ISO Sensitivity"
-msgstr "Sensitivité spectrale"
+msgstr "Sensibilité CCS ISO"
 
 #: libexif/pentax/mnote-pentax-tag.c:135
 msgid "Enhancement"
-msgstr ""
+msgstr "Amélioration"
 
 #: libexif/pentax/mnote-pentax-tag.c:136
-#, fuzzy
 msgid "Finer"
-msgstr "pouces"
+msgstr "Plus fin"
 
 # This is a very special string. It is used for test purposes, and
 # we only test the de locale as a proof-of-concept example. There is
 # no need for anybody to translate it.
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
-msgstr ""
+msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
-#, fuzzy
-#~ msgid "On + Red-eye reduction"
-#~ msgstr "Flash déclenché, mode anti-yeux rouges."
+# Valeur f d'ouverture du diaphragme de l'objectif.
+#~ msgid "FNumber"
+#~ msgstr "Valeur f d'ouverture"
+
+#~ msgid "normal"
+#~ msgstr "normal"
 
 #, fuzzy
-#~ msgid "Center + Right"
-#~ msgstr "Centre pondéré"
+#~ msgid "auto"
+#~ msgstr "action"
 
 #, fuzzy
-#~ msgid "Left + Right"
-#~ msgstr "bas - droit"
+#~ msgid "red eyes reduction"
+#~ msgstr "Flash déclenché, mode anti-yeux rouges."
 
 #, fuzzy
-#~ msgid "Daylight Fluorescent"
-#~ msgstr "Fluorescent"
+#~ msgid "one-Shot"
+#~ msgstr "Spot"
 
-#~ msgid "1/%d"
-#~ msgstr "1/%d"
+#~ msgid "manual"
+#~ msgstr "manuel"
 
-#, fuzzy
-#~ msgid "Focal length"
-#~ msgstr "Longueur focale"
+#~ msgid "landscape"
+#~ msgstr "paysage"
 
-#, fuzzy
-#~ msgid "Flash mode"
-#~ msgstr "Flash"
+#~ msgid "partial"
+#~ msgstr "partiel"
 
 #, fuzzy
-#~ msgid "Focus mode"
-#~ msgstr "Mode d'exposition"
+#~ msgid "center-weighted"
+#~ msgstr "Centre pondéré"
 
 #, fuzzy
-#~ msgid "Digital zoom"
-#~ msgstr "Valeur du zoom numérique"
+#~ msgid "none (manual focus)"
+#~ msgstr "Exposition manuel"
 
 #, fuzzy
-#~ msgid "Metering mode"
-#~ msgstr "Mode de mesure"
+#~ msgid "Flourescent"
+#~ msgstr "Fluorescent"
 
 #, fuzzy
-#~ msgid "Focus range"
-#~ msgstr "Mode d'exposition"
+#~ msgid "Flash mode"
+#~ msgstr "Flash"
 
 #, fuzzy
-#~ msgid "Focal plane y size"
-#~ msgstr "y-Résolution du plan focal"
+#~ msgid "Zoomed resolution"
+#~ msgstr "x-résolution"
 
 #, fuzzy
 #~ msgid "White balance"
 #~ msgstr "Balance des blancs"
 
-#~ msgid "top - left"
-#~ msgstr "haut - gauche"
-
-#~ msgid "top - right"
-#~ msgstr "haut - droit"
-
-#~ msgid "bottom - right"
-#~ msgstr "bas - droit"
-
-#~ msgid "bottom - left"
-#~ msgstr "bas - gauche"
+#, fuzzy
+#~ msgid "Subject distance"
+#~ msgstr "Distance au sujet"
 
 #~ msgid "left - top"
 #~ msgstr "gauche - haut"
 
-#~ msgid "Center-Weighted Average"
-#~ msgstr "Mesure pondérée centrale"
+#~ msgid "cloudy"
+#~ msgstr "nuageux"
 
 #~ msgid "Flash did not fire."
 #~ msgstr "Le flash ne s'est pas déclenché."
@@ -6013,106 +5111,40 @@ msgstr ""
 #~ msgid "flash"
 #~ msgstr "Flash"
 
-#~ msgid "y-Resolution"
-#~ msgstr "y-résolution"
-
-#~ msgid "Shutter speed"
-#~ msgstr "Vitesse d'obturation"
-
-#~ msgid "Focal Plane y-Resolution"
-#~ msgstr "y-Résolution du plan focal"
-
 #, fuzzy
-#~ msgid "Daylight-color fluorescent"
-#~ msgstr "Fluorescent"
+#~ msgid "Flash fired, compulsory flash mode, 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"
 
 #, fuzzy
-#~ msgid "DayWhite-color fluorescent"
-#~ msgstr "Fluorescent"
+#~ msgid "1/%d"
+#~ msgstr "1/%d sec."
 
-#, fuzzy
-#~ msgid "Super Macro"
-#~ msgstr "Macro"
+#~ msgid "y-Resolution"
+#~ msgstr "y-résolution"
 
-#~ msgid "normal"
-#~ msgstr "normal"
+#~ msgid "Focal Plane y-Resolution"
+#~ msgstr "y-Résolution du plan focal"
 
 #~ msgid "unknown"
 #~ msgstr "inconnu"
 
 #, fuzzy
-#~ msgid "left to right"
-#~ msgstr "bas - droit"
-
-#, fuzzy
-#~ msgid "right to left"
-#~ msgstr "droit - haut"
-
-#, fuzzy
-#~ msgid "bottom to top"
-#~ msgstr "bas - gauche"
-
-#, fuzzy
-#~ msgid "top to bottom"
-#~ msgstr "gauche - bas"
+#~ msgid "Unknown tag."
+#~ msgstr "Inconnu"
 
 #, fuzzy
 #~ msgid "Whitebalance"
 #~ msgstr "Balance des blancs"
 
 #, fuzzy
-#~ msgid "Noisereduction"
-#~ msgstr "Flash déclenché, mode anti-yeux rouges."
-
-#, fuzzy
 #~ msgid "Night-scene"
 #~ msgstr "Scène de nuit"
 
 #, fuzzy
-#~ msgid "Night Scene"
-#~ msgstr "Scène de nuit"
-
-#, fuzzy
-#~ msgid "Pan Focus"
-#~ msgstr "Exposition manuel"
-
-#, fuzzy
-#~ msgid "Daywhite Fluorescent"
-#~ msgstr "Fluorescent"
-
-#, fuzzy
-#~ msgid "White Fluorescent"
-#~ msgstr "Fluorescent"
-
-#, fuzzy
-#~ msgid "PictureMode"
-#~ msgstr "Mode d'exposition"
-
-#, fuzzy
-#~ msgid "Manual Focus"
-#~ msgstr "Exposition manuel"
-
-#, fuzzy
-#~ msgid ""
-#~ "Flash fired, compulsory flash mode, 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."
-
-#, fuzzy
 #~ msgid "Flash not fired"
 #~ msgstr "Le flash ne s'est pas déclenché."
 
 #, fuzzy
-#~ msgid "red eyes reduction"
-#~ msgstr "Flash déclenché, mode anti-yeux rouges."
-
-#, fuzzy
-#~ msgid "on + red eyes reduction"
-#~ msgstr "Flash déclenché, mode anti-yeux rouges."
-
-#, fuzzy
 #~ msgid " / Contrast : "
 #~ msgstr "Contraste"
 
@@ -6141,10 +5173,6 @@ msgstr ""
 #~ msgstr "Balance des blancs"
 
 #, fuzzy
-#~ msgid "Flourescent"
-#~ msgstr "Fluorescent"
-
-#, fuzzy
 #~ msgid " / Flash bias : %.2f EV"
 #~ msgstr "Flash"
 
@@ -6152,9 +5180,6 @@ msgstr ""
 #~ msgid " / Subject Distance (mm) : %u"
 #~ msgstr "Distance au sujet"
 
-#~ msgid "center-weight"
-#~ msgstr "Centre pondéré"
-
 #~ msgid "spot"
 #~ msgstr "spot"
 
@@ -6164,9 +5189,6 @@ msgstr ""
 #~ msgid "matrix"
 #~ msgstr "matrice"
 
-#~ msgid "partial"
-#~ msgstr "partiel"
-
 #~ msgid "other"
 #~ msgstr "autre"
 
@@ -6179,12 +5201,6 @@ msgstr ""
 #~ msgid "tungsten"
 #~ msgstr "tungsten"
 
-#~ msgid "manual"
-#~ msgstr "manuel"
-
-#~ msgid "landscape"
-#~ msgstr "paysage"
-
 #~ msgid "yes"
 #~ msgstr "oui"
 
diff --git a/po/insert-header.sin b/po/insert-header.sin
deleted file mode 100644
index b26de01..0000000
--- a/po/insert-header.sin
+++ /dev/null
@@ -1,23 +0,0 @@
-# Sed script that inserts the file called HEADER before the header entry.
-#
-# At each occurrence of a line starting with "msgid ", we execute the following
-# commands. At the first occurrence, insert the file. At the following
-# occurrences, do nothing. The distinction between the first and the following
-# occurrences is achieved by looking at the hold space.
-/^msgid /{
-x
-# Test if the hold space is empty.
-s/m/m/
-ta
-# Yes it was empty. First occurrence. Read the file.
-r HEADER
-# Output the file's contents by reading the next line. But don't lose the
-# current line while doing this.
-g
-N
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}
diff --git a/po/it.gmo b/po/it.gmo
deleted file mode 100644
index 07b37a6..0000000
--- a/po/it.gmo
+++ /dev/null
diff --git a/po/it.po b/po/it.po
index 07b0ed7..3980305 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif-0.6.20-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2010-02-05 16:15-0800\n"
 "PO-Revision-Date: 2010-06-01 12:32+0200\n"
 "Last-Translator: Sergio Zanchetta <primes2h@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
-"Language: it\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,8 +38,8 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Numero di componenti non valido (%i, atteso %i o %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
-#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:797
+#: libexif/olympus/mnote-olympus-entry.c:196
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
 #: libexif/pentax/mnote-pentax-entry.c:209
@@ -49,14 +49,14 @@ msgstr "Macro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
-#: libexif/olympus/mnote-olympus-entry.c:121
-#: libexif/olympus/mnote-olympus-entry.c:198
-#: libexif/olympus/mnote-olympus-entry.c:206
-#: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:675
+#: libexif/exif-entry.c:678 libexif/exif-entry.c:679 libexif/exif-entry.c:680
+#: libexif/exif-entry.c:746 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:213
+#: libexif/olympus/mnote-olympus-entry.c:586
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -81,33 +81,33 @@ msgstr "RAW"
 msgid "Superfine"
 msgstr "Superfine"
 
-#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
-#: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
-#: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
-#: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:301
+#: libexif/canon/mnote-canon-entry.c:304 libexif/canon/mnote-canon-entry.c:312
+#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:357
+#: libexif/canon/mnote-canon-entry.c:370 libexif/canon/mnote-canon-entry.c:372
+#: libexif/canon/mnote-canon-entry.c:574 libexif/canon/mnote-canon-entry.c:671
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
-#: libexif/olympus/mnote-olympus-entry.c:181
-#: libexif/olympus/mnote-olympus-entry.c:189
-#: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:178
+#: libexif/olympus/mnote-olympus-entry.c:186
+#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:530
+#: libexif/olympus/mnote-olympus-entry.c:547
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
 msgstr "Spento"
 
 #: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
-#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
-#: libexif/canon/mnote-canon-entry.c:403 libexif/fuji/mnote-fuji-entry.c:73
+#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:328
+#: libexif/canon/mnote-canon-entry.c:400 libexif/fuji/mnote-fuji-entry.c:73
 #: libexif/fuji/mnote-fuji-entry.c:101 libexif/fuji/mnote-fuji-entry.c:111
 #: libexif/fuji/mnote-fuji-entry.c:119
-#: libexif/olympus/mnote-olympus-entry.c:134
-#: libexif/olympus/mnote-olympus-entry.c:186
-#: libexif/olympus/mnote-olympus-entry.c:202
-#: libexif/olympus/mnote-olympus-entry.c:247
+#: libexif/olympus/mnote-olympus-entry.c:131
+#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/olympus/mnote-olympus-entry.c:244
 #: libexif/pentax/mnote-pentax-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:88
 #: libexif/pentax/mnote-pentax-entry.c:91
@@ -119,21 +119,21 @@ msgstr "Spento"
 msgid "Auto"
 msgstr "Automatico"
 
-#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
-#: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
-#: libexif/canon/mnote-canon-entry.c:374 libexif/fuji/mnote-fuji-entry.c:102
+#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:302
+#: libexif/canon/mnote-canon-entry.c:347 libexif/canon/mnote-canon-entry.c:361
+#: libexif/canon/mnote-canon-entry.c:371 libexif/fuji/mnote-fuji-entry.c:102
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
-#: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:179
+#: libexif/olympus/mnote-olympus-entry.c:533
+#: libexif/olympus/mnote-olympus-entry.c:550
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
 msgstr "Acceso"
 
 #: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
-#: libexif/olympus/mnote-olympus-entry.c:187
+#: libexif/olympus/mnote-olympus-entry.c:184
 #: libexif/pentax/mnote-pentax-entry.c:94
 msgid "Red-eye reduction"
 msgstr "Riduzione occhi rossi"
@@ -156,12 +156,12 @@ msgid "External flash"
 msgstr "Flash esterno"
 
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
-#: libexif/canon/mnote-canon-entry.c:297
+#: libexif/canon/mnote-canon-entry.c:294
 msgid "Single"
 msgstr "Singolo"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
-#: libexif/canon/mnote-canon-entry.c:298
+#: libexif/canon/mnote-canon-entry.c:295
 msgid "Continuous"
 msgstr "Continuo"
 
@@ -268,11 +268,11 @@ msgid "Full auto"
 msgstr "Automatica"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
-#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
+#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:285
+#: libexif/canon/mnote-canon-entry.c:392 libexif/exif-entry.c:745
 #: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
-#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:90
+#: libexif/olympus/mnote-olympus-entry.c:200
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
 #: libexif/pentax/mnote-pentax-entry.c:133
@@ -282,8 +282,8 @@ msgstr "Automatica"
 msgid "Manual"
 msgstr "Manuale"
 
-#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:430
+#: libexif/exif-entry.c:672 libexif/exif-entry.c:756
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -298,7 +298,7 @@ msgid "Slow shutter"
 msgstr "Otturatore lento"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
-#: libexif/olympus/mnote-olympus-entry.c:257
+#: libexif/olympus/mnote-olympus-entry.c:254
 msgid "Night"
 msgstr "Notturno"
 
@@ -306,13 +306,13 @@ msgstr "Notturno"
 msgid "Grayscale"
 msgstr "Scala di grigio"
 
-#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
+#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:308
 #: libexif/pentax/mnote-pentax-entry.c:128
 msgid "Sepia"
 msgstr "Seppia"
 
-#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:429
+#: libexif/exif-entry.c:672 libexif/exif-entry.c:754
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -324,18 +324,18 @@ msgstr "Ritratto"
 msgid "Sports"
 msgstr "Sport"
 
-#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
-#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
+#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:309
+#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
 #: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
 msgid "Black & white"
 msgstr "Bianco e nero"
 
-#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
+#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:305
 msgid "Vivid"
 msgstr "Vivace"
 
-#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
-#: libexif/canon/mnote-canon-entry.c:434
+#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:306
+#: libexif/canon/mnote-canon-entry.c:431
 msgid "Neutral"
 msgstr "Neutro"
 
@@ -349,7 +349,7 @@ msgid "Long shutter"
 msgstr "Otturatore lungo"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
-#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:171
 msgid "Super macro"
 msgstr "Super macro"
 
@@ -370,8 +370,8 @@ msgstr "Fuochi d'artificio"
 msgid "Beach"
 msgstr "Spiaggia"
 
-#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
-#: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:344
+#: libexif/canon/mnote-canon-entry.c:416 libexif/fuji/mnote-fuji-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
@@ -418,11 +418,11 @@ msgstr ""
 msgid "ISO 3200"
 msgstr "ISO 3200"
 
-#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
-#: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
-#: libexif/olympus/mnote-olympus-entry.c:192
-#: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:348
+#: libexif/canon/mnote-canon-entry.c:365 libexif/canon/mnote-canon-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:189
+#: libexif/olympus/mnote-olympus-entry.c:226
+#: libexif/olympus/mnote-olympus-entry.c:451
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Disattivato"
@@ -435,20 +435,20 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:703
+#: libexif/exif-entry.c:733
 msgid "Other"
 msgstr "Altro"
 
 #: libexif/canon/mnote-canon-entry.c:158 libexif/canon/mnote-canon-entry.c:161
-#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:401
+#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:398
 #: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
 #: libexif/pentax/mnote-pentax-entry.c:117
 msgid "High"
 msgstr "Alta"
 
 #: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
-#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
+#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:396
 #: libexif/pentax/mnote-pentax-entry.c:111
 #: libexif/pentax/mnote-pentax-entry.c:116
 msgid "Low"
@@ -486,11 +486,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Predefinita"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:699
 msgid "Spot"
 msgstr "Spot"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:697
 msgid "Average"
 msgstr "Media"
 
@@ -498,11 +498,11 @@ msgstr "Media"
 msgid "Evaluative"
 msgstr "Valutativa"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:702
 msgid "Partial"
 msgstr "Parziale"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:698
 msgid "Center-weighted average"
 msgstr "Media pesata al centro"
 
@@ -514,7 +514,7 @@ msgstr "Sconosciuto"
 msgid "Very close"
 msgstr "Molto vicino"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:798
 msgid "Close"
 msgstr "Vicino"
 
@@ -535,7 +535,7 @@ msgstr "Infinito"
 msgid "Manual AF point selection"
 msgstr "Selezione punto AF manuale"
 
-#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
+#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:349
 msgid "None (MF)"
 msgstr "Nessuno (MF)"
 
@@ -543,19 +543,19 @@ msgstr "Nessuno (MF)"
 msgid "Auto-selected"
 msgstr "Selezione automatica"
 
-#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
+#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:224
 #: libexif/pentax/mnote-pentax-entry.c:238
 msgid "Right"
 msgstr "Destra"
 
-#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
+#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:351
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
 msgid "Center"
 msgstr "Centro"
 
-#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
+#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:220
 #: libexif/pentax/mnote-pentax-entry.c:236
 msgid "Left"
@@ -651,444 +651,429 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 oppure Sigma 15mm f/2.8 EX fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
-msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
-
-#: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
 msgstr "Canon EF 75-300mm f/4-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:221
+#: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 28-80mm f/3.5-5.6"
 msgstr "Canon EF 28-80mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:222
+#: libexif/canon/mnote-canon-entry.c:221
 msgid "Canon EF 28-105mm f/4-5.6"
 msgstr "Canon EF 28-105mm f/4-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:223
+#: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
-msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
-
-#: libexif/canon/mnote-canon-entry.c:225
+#: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 msgstr "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 
-#: libexif/canon/mnote-canon-entry.c:226
+#: libexif/canon/mnote-canon-entry.c:224
 msgid "Canon TS-E 24mm f/3.5L"
 msgstr "Canon TS-E 24mm f/3.5L"
 
-#: libexif/canon/mnote-canon-entry.c:227
+#: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon TS-E 45mm f/2.8"
 msgstr "Canon TS-E 45mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:228
+#: libexif/canon/mnote-canon-entry.c:226
 msgid "Canon TS-E 90mm f/2.8"
 msgstr "Canon TS-E 90mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:229
+#: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon EF 50mm f/1.0L"
 msgstr "Canon EF 50mm f/1.0L"
 
-#: libexif/canon/mnote-canon-entry.c:230
+#: libexif/canon/mnote-canon-entry.c:228
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 msgstr "Sigma 17-35mm f2.8-4 EX asferico HSM"
 
-#: libexif/canon/mnote-canon-entry.c:231
+#: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 600mm f/4L IS"
 msgstr "Canon EF 600mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:232
+#: libexif/canon/mnote-canon-entry.c:230
 msgid "Canon EF 200mm f/1.8L"
 msgstr "Canon EF 200mm f/1.8L"
 
-#: libexif/canon/mnote-canon-entry.c:233
+#: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 300mm f/2.8L"
 msgstr "Canon EF 300mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:234
+#: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 85mm f/1.2L"
 msgstr "Canon EF 85mm f/1.2L"
 
-#: libexif/canon/mnote-canon-entry.c:235
+#: libexif/canon/mnote-canon-entry.c:233
 msgid "Canon EF 400mm f/2.8L"
 msgstr "Canon EF 400mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:236
+#: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 500mm f/4.5L"
 msgstr "Canon EF 500mm f/4.5L"
 
-#: libexif/canon/mnote-canon-entry.c:237
+#: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 300mm f/2.8L IS"
 msgstr "Canon EF 300mm f/2.8L IS"
 
-#: libexif/canon/mnote-canon-entry.c:238
+#: libexif/canon/mnote-canon-entry.c:236
 msgid "Canon EF 500mm f/4L IS"
 msgstr "Canon EF 500mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:239
+#: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 100mm f/2"
 msgstr "Canon EF 100mm f/2"
 
-#: libexif/canon/mnote-canon-entry.c:240
+#: libexif/canon/mnote-canon-entry.c:238
 msgid "Sigma 20mm EX f/1.8"
 msgstr "Sigma 20mm EX f/1.8"
 
-#: libexif/canon/mnote-canon-entry.c:241
+#: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 200mm f/2.8L"
 msgstr "Canon EF 200mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:242
+#: libexif/canon/mnote-canon-entry.c:240
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
 msgstr "Sigma 10-20mm F4-5.6 oppure 12-24mm f/4.5-5.6 oppure 14mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:243
+#: libexif/canon/mnote-canon-entry.c:241
 msgid "Canon EF 35-350mm f/3.5-5.6L"
 msgstr "Canon EF 35-350mm f/3.5-5.6L"
 
-#: libexif/canon/mnote-canon-entry.c:244
+#: libexif/canon/mnote-canon-entry.c:242
 msgid "Canon EF 85mm f/1.8 USM"
 msgstr "Canon EF 85mm f/1.8 USM"
 
-#: libexif/canon/mnote-canon-entry.c:245
+#: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 28-105mm f/3.5-4.5 USM"
 msgstr "Canon EF 28-105mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:246
+#: libexif/canon/mnote-canon-entry.c:244
 msgid "Canon EF 20-35mm f/3.5-4.5 USM"
 msgstr "Canon EF 20-35mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:247
+#: libexif/canon/mnote-canon-entry.c:245
 msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
 msgstr "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:248
+#: libexif/canon/mnote-canon-entry.c:246
 msgid "Canon EF 70-200mm f/2.8 L"
 msgstr "Canon EF 70-200mm f/2.8 L"
 
-#: libexif/canon/mnote-canon-entry.c:249
+#: libexif/canon/mnote-canon-entry.c:247
 msgid "Canon EF 70-200mm f/2.8 L + x1.4"
 msgstr "Canon EF 70-200mm f/2.8 L + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:250
+#: libexif/canon/mnote-canon-entry.c:248
 msgid "Canon EF 70-200mm f/2.8 L + x2"
 msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
-#: libexif/canon/mnote-canon-entry.c:251
+#: libexif/canon/mnote-canon-entry.c:249
 msgid "Canon EF 28mm f/1.8 USM"
 msgstr "Canon EF 28mm f/1.8 USM"
 
-#: libexif/canon/mnote-canon-entry.c:252
+#: libexif/canon/mnote-canon-entry.c:250
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
 msgstr "Sigma 15-30mm f/3.5-4.5 EX DG Asferico"
 
-#: libexif/canon/mnote-canon-entry.c:253
+#: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 200mm f/2.8L II"
 msgstr "Canon EF 200mm f/2.8L II"
 
-#: libexif/canon/mnote-canon-entry.c:254
+#: libexif/canon/mnote-canon-entry.c:252
 msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
 msgstr "Canon EF 180mm Macro f/3.5L o Sigma 180mm EX HSM Macro f/3.5"
 
-#: libexif/canon/mnote-canon-entry.c:255
+#: libexif/canon/mnote-canon-entry.c:253
 msgid "Canon EF 135mm f/2L"
 msgstr "Canon EF 135mm f/2L"
 
-#: libexif/canon/mnote-canon-entry.c:256
+#: libexif/canon/mnote-canon-entry.c:254
 msgid "Canon EF 24-85mm f/3.5-4.5 USM"
 msgstr "Canon EF 24-85mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:257
+#: libexif/canon/mnote-canon-entry.c:255
 msgid "Canon EF 300mm f/4L IS"
 msgstr "Canon EF 300mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:258
+#: libexif/canon/mnote-canon-entry.c:256
 msgid "Canon EF 28-135mm f/3.5-5.6 IS"
 msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
 
-#: libexif/canon/mnote-canon-entry.c:259
+#: libexif/canon/mnote-canon-entry.c:257
 msgid "Canon EF 35mm f/1.4L"
 msgstr "Canon EF 35mm f/1.4L"
 
-#: libexif/canon/mnote-canon-entry.c:260
+#: libexif/canon/mnote-canon-entry.c:258
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:261
+#: libexif/canon/mnote-canon-entry.c:259
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 
-#: libexif/canon/mnote-canon-entry.c:262
+#: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
 
-#: libexif/canon/mnote-canon-entry.c:263
+#: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 400mm f/2.8L + x2"
 msgstr "Canon EF 400mm f/2.8L + x2"
 
-#: libexif/canon/mnote-canon-entry.c:264
+#: libexif/canon/mnote-canon-entry.c:262
 msgid "Canon EF 70-200mm f/4L"
 msgstr "Canon EF 70-200mm f/4L"
 
-#: libexif/canon/mnote-canon-entry.c:265
+#: libexif/canon/mnote-canon-entry.c:263
 msgid "Canon EF 100mm f/2.8 Macro"
 msgstr "Canon EF 100mm f/2.8 Macro"
 
-#: libexif/canon/mnote-canon-entry.c:266
+#: libexif/canon/mnote-canon-entry.c:264
 msgid "Canon EF 400mm f/4 DO IS"
 msgstr "Canon EF 400mm f/4 DO IS"
 
-#: libexif/canon/mnote-canon-entry.c:267
+#: libexif/canon/mnote-canon-entry.c:265
 msgid "Canon EF 75-300mm f/4-5.6 IS"
 msgstr "Canon EF 75-300mm f/4-5.6 IS"
 
-#: libexif/canon/mnote-canon-entry.c:268
+#: libexif/canon/mnote-canon-entry.c:266
 msgid "Canon EF 50mm f/1.4"
 msgstr "Canon EF 50mm f/1.4"
 
-#: libexif/canon/mnote-canon-entry.c:269
+#: libexif/canon/mnote-canon-entry.c:267
 msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
 msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
-#: libexif/canon/mnote-canon-entry.c:270
+#: libexif/canon/mnote-canon-entry.c:268
 msgid "Canon EF 28-200mm f/3.5-5.6"
 msgstr "Canon EF 28-200mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:271
+#: libexif/canon/mnote-canon-entry.c:269
 msgid "Canon EF 90-300mm f/4.5-5.6"
 msgstr "Canon EF 90-300mm f/4.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:272
+#: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
 msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:273
+#: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 70-200mm f/2.8L IS USM"
 msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:274
+#: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:275
+#: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
 msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
-#: libexif/canon/mnote-canon-entry.c:276
+#: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 16-35mm f/2.8L"
 msgstr "Canon EF 16-35mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:277
+#: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 24-70mm f/2.8L"
 msgstr "Canon EF 24-70mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:278
+#: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 17-40mm f/4L"
 msgstr "Canon EF 17-40mm f/4L"
 
-#: libexif/canon/mnote-canon-entry.c:279
+#: libexif/canon/mnote-canon-entry.c:277
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:280
+#: libexif/canon/mnote-canon-entry.c:278
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
 msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:281
+#: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
 msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:282
+#: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S60mm F2.8 Macro USM"
 msgstr "Canon EF-S60mm F2.8 Macro USM"
 
-#: libexif/canon/mnote-canon-entry.c:283
+#: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF 24-105mm f/4L IS"
 msgstr "Canon EF 24-105mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:284
+#: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
 msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:285
+#: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 50mm F1.2L USM"
 msgstr "Canon EF 50mm F1.2L USM"
 
-#: libexif/canon/mnote-canon-entry.c:286
+#: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
-msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
-
-#: libexif/canon/mnote-canon-entry.c:289
+#: libexif/canon/mnote-canon-entry.c:286
 msgid "TTL"
 msgstr "TTL"
 
-#: libexif/canon/mnote-canon-entry.c:290
+#: libexif/canon/mnote-canon-entry.c:287
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: libexif/canon/mnote-canon-entry.c:291
+#: libexif/canon/mnote-canon-entry.c:288
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/canon/mnote-canon-entry.c:289
 msgid "FP sync enabled"
 msgstr "Abilitata sincronizzazione FP"
 
-#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/canon/mnote-canon-entry.c:290
 msgid "2nd-curtain sync used"
 msgstr "Usata sincronizzazione sulla seconda tendina"
 
-#: libexif/canon/mnote-canon-entry.c:294
+#: libexif/canon/mnote-canon-entry.c:291
 msgid "FP sync used"
 msgstr "Usata sincronizzazione FP"
 
-#: libexif/canon/mnote-canon-entry.c:295
-#: libexif/olympus/mnote-olympus-entry.c:193
+#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/olympus/mnote-olympus-entry.c:190
 msgid "Internal"
 msgstr "Interno"
 
-#: libexif/canon/mnote-canon-entry.c:296
-#: libexif/olympus/mnote-olympus-entry.c:194
+#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/olympus/mnote-olympus-entry.c:191
 msgid "External"
 msgstr "Esterno"
 
-#: libexif/canon/mnote-canon-entry.c:299
+#: libexif/canon/mnote-canon-entry.c:296
 msgid "Normal AE"
 msgstr "AE normale"
 
-#: libexif/canon/mnote-canon-entry.c:300
+#: libexif/canon/mnote-canon-entry.c:297
 msgid "Exposure compensation"
 msgstr "Compensazione dell'esposizione"
 
-#: libexif/canon/mnote-canon-entry.c:301
+#: libexif/canon/mnote-canon-entry.c:298
 msgid "AE lock"
 msgstr "Blocco AE"
 
-#: libexif/canon/mnote-canon-entry.c:302
+#: libexif/canon/mnote-canon-entry.c:299
 msgid "AE lock + exposure compensation"
 msgstr "Blocco AE + compensazione dell'esposizione"
 
-#: libexif/canon/mnote-canon-entry.c:303
+#: libexif/canon/mnote-canon-entry.c:300
 msgid "No AE"
 msgstr "Nessuna AE"
 
-#: libexif/canon/mnote-canon-entry.c:306
+#: libexif/canon/mnote-canon-entry.c:303
 msgid "On, shot only"
 msgstr "Acceso, solo scatto"
 
-#: libexif/canon/mnote-canon-entry.c:310
+#: libexif/canon/mnote-canon-entry.c:307
 msgid "Smooth"
 msgstr "Raffinato"
 
-#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
-#: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
+#: libexif/canon/mnote-canon-entry.c:310 libexif/canon/mnote-canon-entry.c:334
+#: libexif/canon/mnote-canon-entry.c:393 libexif/canon/mnote-canon-entry.c:406
 #: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: libexif/canon/mnote-canon-entry.c:314
+#: libexif/canon/mnote-canon-entry.c:311
 msgid "My color data"
 msgstr "Mio dato di colore"
 
-#: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
+#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:375
 #: libexif/pentax/mnote-pentax-entry.c:126
 #: libexif/pentax/mnote-pentax-entry.c:145
 msgid "Full"
 msgstr "Piena"
 
-#: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
+#: libexif/canon/mnote-canon-entry.c:314 libexif/canon/mnote-canon-entry.c:374
 msgid "2/3"
 msgstr "2/3"
 
-#: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
+#: libexif/canon/mnote-canon-entry.c:315 libexif/canon/mnote-canon-entry.c:373
 msgid "1/3"
 msgstr "1/3"
 
-#: libexif/canon/mnote-canon-entry.c:324
+#: libexif/canon/mnote-canon-entry.c:321
 msgid "Fixed"
 msgstr "Fissa"
 
-#: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
+#: libexif/canon/mnote-canon-entry.c:322 libexif/pentax/mnote-pentax-tag.c:44
 msgid "Zoom"
 msgstr "Zoom"
 
-#: libexif/canon/mnote-canon-entry.c:332
+#: libexif/canon/mnote-canon-entry.c:329
 msgid "Sunny"
 msgstr "Soleggiato"
 
-#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
-#: libexif/olympus/mnote-olympus-entry.c:139
+#: libexif/canon/mnote-canon-entry.c:330 libexif/canon/mnote-canon-entry.c:402
+#: libexif/exif-entry.c:720 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Nuvoloso"
 
-#: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/canon/mnote-canon-entry.c:331 libexif/canon/mnote-canon-entry.c:403
+#: libexif/exif-entry.c:717 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Tungsteno"
 
-#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/canon/mnote-canon-entry.c:332 libexif/canon/mnote-canon-entry.c:404
+#: libexif/exif-entry.c:716 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Fluorescente"
 
-#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
+#: libexif/exif-entry.c:718 libexif/exif-entry.c:760 libexif/exif-tag.c:577
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Flash"
 
-#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
+#: libexif/exif-entry.c:721 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Ombra"
 
-#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
+#: libexif/canon/mnote-canon-entry.c:337 libexif/canon/mnote-canon-entry.c:409
 msgid "Manual temperature (Kelvin)"
 msgstr "Temperatura manuale (Kelvin)"
 
-#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
 msgid "PC set 1"
 msgstr "PC imposta 1"
 
-#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
+#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
 msgid "PC set 2"
 msgstr "PC imposta 2"
 
-#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
+#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "PC set 3"
 msgstr "PC imposta 3"
 
-#: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+#: libexif/exif-entry.c:722 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Illuminazione diurna fluorescente"
 
-#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
+#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "Custom 1"
 msgstr "Personalizzato 1"
 
-#: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
+#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "Custom 2"
 msgstr "Personalizzato 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:346 libexif/exif-entry.c:673
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1096,188 +1081,188 @@ msgstr "Personalizzato 2"
 msgid "Night scene"
 msgstr "Scena notturna"
 
-#: libexif/canon/mnote-canon-entry.c:355
+#: libexif/canon/mnote-canon-entry.c:352
 #, fuzzy
 msgid "Center-right"
 msgstr "Peso centrale"
 
-#: libexif/canon/mnote-canon-entry.c:357
+#: libexif/canon/mnote-canon-entry.c:354
 #, fuzzy
 msgid "Left-right"
 msgstr "Da sinistra a destra"
 
-#: libexif/canon/mnote-canon-entry.c:358
+#: libexif/canon/mnote-canon-entry.c:355
 #, fuzzy
 msgid "Left-center"
 msgstr "Sinistra + Centro"
 
-#: libexif/canon/mnote-canon-entry.c:359
+#: libexif/canon/mnote-canon-entry.c:356
 msgid "All"
 msgstr "Tutto"
 
-#: libexif/canon/mnote-canon-entry.c:361
+#: libexif/canon/mnote-canon-entry.c:358
 msgid "On (shot 1)"
 msgstr "Acceso (scatto 1)"
 
-#: libexif/canon/mnote-canon-entry.c:362
+#: libexif/canon/mnote-canon-entry.c:359
 msgid "On (shot 2)"
 msgstr "Acceso (scatto 2)"
 
-#: libexif/canon/mnote-canon-entry.c:363
+#: libexif/canon/mnote-canon-entry.c:360
 msgid "On (shot 3)"
 msgstr "Acceso (scatto 3)"
 
-#: libexif/canon/mnote-canon-entry.c:365
+#: libexif/canon/mnote-canon-entry.c:362
 msgid "EOS high-end"
 msgstr "EOS di fascia alta"
 
-#: libexif/canon/mnote-canon-entry.c:366
+#: libexif/canon/mnote-canon-entry.c:363
 msgid "Compact"
 msgstr "Compatta"
 
-#: libexif/canon/mnote-canon-entry.c:367
+#: libexif/canon/mnote-canon-entry.c:364
 msgid "EOS mid-range"
 msgstr "EOS di fascia media"
 
-#: libexif/canon/mnote-canon-entry.c:369
+#: libexif/canon/mnote-canon-entry.c:366
 msgid "Rotate 90 CW"
 msgstr "Ruota di 90° orario"
 
-#: libexif/canon/mnote-canon-entry.c:370
+#: libexif/canon/mnote-canon-entry.c:367
 msgid "Rotate 180"
 msgstr "Ruota di 180°"
 
-#: libexif/canon/mnote-canon-entry.c:371
+#: libexif/canon/mnote-canon-entry.c:368
 msgid "Rotate 270 CW"
 msgstr "Ruota di 270° orario"
 
-#: libexif/canon/mnote-canon-entry.c:372
+#: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotated by software"
 msgstr "Ruotata via software"
 
-#: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/canon/mnote-canon-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:606
 msgid "Left to right"
 msgstr "Da sinistra a destra"
 
-#: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/canon/mnote-canon-entry.c:382
+#: libexif/olympus/mnote-olympus-entry.c:609
 msgid "Right to left"
 msgstr "Da destra a sinistra"
 
-#: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/canon/mnote-canon-entry.c:383
+#: libexif/olympus/mnote-olympus-entry.c:612
 msgid "Bottom to top"
 msgstr "Dal basso verso l'alto"
 
-#: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/canon/mnote-canon-entry.c:384
+#: libexif/olympus/mnote-olympus-entry.c:615
 msgid "Top to bottom"
 msgstr "Dall'alto verso il basso"
 
-#: libexif/canon/mnote-canon-entry.c:388
+#: libexif/canon/mnote-canon-entry.c:385
 msgid "2x2 matrix (clockwise)"
 msgstr "Matrice 2x2 (oraria)"
 
-#: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
-#: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/canon/mnote-canon-entry.c:391 libexif/canon/mnote-canon-entry.c:397
+#: libexif/canon/mnote-canon-entry.c:418 libexif/canon/mnote-canon-entry.c:428
+#: libexif/exif-entry.c:672 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
-#: libexif/olympus/mnote-olympus-entry.c:230
+#: libexif/olympus/mnote-olympus-entry.c:227
 msgid "Standard"
 msgstr "Normale"
 
-#: libexif/canon/mnote-canon-entry.c:397
+#: libexif/canon/mnote-canon-entry.c:394
 msgid "N/A"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:398
+#: libexif/canon/mnote-canon-entry.c:395
 msgid "Lowest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:402
+#: libexif/canon/mnote-canon-entry.c:399
 msgid "Highest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
+#: libexif/canon/mnote-canon-entry.c:401 libexif/exif-entry.c:715
 #: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/olympus/mnote-olympus-entry.c:133
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
 msgstr "Luce diurna"
 
-#: libexif/canon/mnote-canon-entry.c:422
+#: libexif/canon/mnote-canon-entry.c:419
 msgid "Set 1"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:423
+#: libexif/canon/mnote-canon-entry.c:420
 msgid "Set 2"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:424
+#: libexif/canon/mnote-canon-entry.c:421
 msgid "Set 3"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:425
+#: libexif/canon/mnote-canon-entry.c:422
 msgid "User def. 1"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:426
+#: libexif/canon/mnote-canon-entry.c:423
 msgid "User def. 2"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:427
+#: libexif/canon/mnote-canon-entry.c:424
 msgid "User def. 3"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:428
+#: libexif/canon/mnote-canon-entry.c:425
 msgid "External 1"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:429
+#: libexif/canon/mnote-canon-entry.c:426
 msgid "External 2"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:430
+#: libexif/canon/mnote-canon-entry.c:427
 msgid "External 3"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:435
+#: libexif/canon/mnote-canon-entry.c:432
 msgid "Faithful"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:436
-#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/canon/mnote-canon-entry.c:433
+#: libexif/olympus/mnote-olympus-entry.c:115
 msgid "Monochrome"
 msgstr "Monocromatico"
 
-#: libexif/canon/mnote-canon-entry.c:494
+#: libexif/canon/mnote-canon-entry.c:491
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:621
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:645
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
 # TAG_EXPOSURE_TIME
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:655 libexif/exif-entry.c:1065
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:667
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
@@ -1300,7 +1285,7 @@ msgid "Settings (Second Part)"
 msgstr "Impostazioni (seconda parte)"
 
 #: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/olympus/mnote-olympus-entry.c:595
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1393,20 +1378,20 @@ msgstr "Modalità \"Easy shooting\""
 msgid "Digital Zoom"
 msgstr "Zoom digitale"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:829
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:833
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Saturazione"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:837
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1429,7 +1414,7 @@ msgstr "Area di messa a fuoco"
 msgid "AF Point"
 msgstr "Punto AF"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:796
 msgid "Exposure Mode"
 msgstr "Modalità esposizione"
 
@@ -1536,7 +1521,7 @@ msgid "Exposure Compensation"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:801 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1631,746 +1616,687 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:826
 msgid "Size of data too small to allow for EXIF data."
 msgstr "Dimensione dati troppo piccola da consentire per i dati EXIF."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:887
 msgid "EXIF marker not found."
 msgstr "Marcatore EXIF non trovato."
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:914
 msgid "EXIF header not found."
 msgstr "Intestazioni EXIF non trovate."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:930
 msgid "Unknown encoding."
 msgstr "Codifica sconosciuta."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1214
 msgid "Ignore unknown tags"
 msgstr "Ignora etichette sconosciute"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1215
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Ignora etichette sconosciute quando vengono caricati i dati EXIF."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1216
 msgid "Follow specification"
 msgstr "Segue la specifica"
 
-#: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
-"Aggiungi, correggi e rimuovi le voci per i dati EXIF che seguono la specifica"
+#: libexif/exif-data.c:1217
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Aggiungi, correggi e rimuovi le voci per i dati EXIF che seguono la specifica"
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1219
 msgid "Do not change maker note"
 msgstr ""
 
-#: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
-"Durante il caricamento e il risalvataggio dei dati EXIF, salvare le note del "
-"produttore senza modificarle. Essere consapevoli che le note del produttore "
-"possono corrompersi."
+#: libexif/exif-data.c:1220
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Durante il caricamento e il risalvataggio dei dati EXIF, salvare le note del produttore senza modificarle. Essere consapevoli che le note del produttore possono corrompersi."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
-"L'etichetta «%s» era del formato «%s» (che non rispetta la specifica) ed è "
-"stata cambiata nel formato «%s»."
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "L'etichetta «%s» era del formato «%s» (che non rispetta la specifica) ed è stata cambiata nel formato «%s»."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
-"L'etichetta «%s» è del formato «%s» (che non rispetta la specifica) ma non "
-"può essere cambiata nel formato «%s»."
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "L'etichetta «%s» è del formato «%s» (che non rispetta la specifica) ma non può essere cambiata nel formato «%s»."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
-"L'etichetta «UserComment» aveva un formato non valido «%s». Il formato è "
-"stato impostato a «undefined»."
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "L'etichetta «UserComment» aveva un formato non valido «%s». Il formato è stato impostato a «undefined»."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
-"L'etichetta «UserComment» è stata espansa ad almeno 8 byte per seguire la "
-"specifica."
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "L'etichetta «UserComment» è stata espansa ad almeno 8 byte per seguire la specifica."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
-"L'etichetta «UserComment» non è vuota ma non inizia con l'identificatore di "
-"formato. Il problema è stato corretto."
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "L'etichetta «UserComment» non è vuota ma non inizia con l'identificatore di formato. Il problema è stato corretto."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
-"L'etichetta «UserComment» non iniziava con un identificatore di formato. Il "
-"problema è stato corretto."
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "L'etichetta «UserComment» non iniziava con un identificatore di formato. Il problema è stato corretto."
 
 #: libexif/exif-entry.c:462
 #, c-format
 msgid "%i bytes undefined data"
 msgstr ""
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:590
 #, c-format
 msgid "%i bytes unsupported data type"
-msgstr "%i byte di dati di tipo non supportato "
+msgstr "%i byte di dati di tipo non supportato"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:623
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
-"L'etichetta «%s» contiene dati in formato non valido («%s», era atteso «%s»)."
+msgstr "L'etichetta «%s» contiene dati in formato non valido («%s», era atteso «%s»)."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:636
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr ""
-"L'etichetta «%s» contiene un numero di componenti non valido (%i, atteso %i)."
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "L'etichetta «%s» contiene un numero di componenti non valido (%i, atteso %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:650
 msgid "Chunky format"
 msgstr "Formato \"chunky\""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:650
 msgid "Planar format"
 msgstr "Formato \"planar\""
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
+#: libexif/exif-entry.c:652 libexif/exif-entry.c:744
 #: test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Non definito"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:652
 msgid "One-chip color area sensor"
 msgstr "Sensore area colore 1-chip"
 
 # TAG:SENSING_METHOD
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:653
 msgid "Two-chip color area sensor"
 msgstr "Sensore area colore 2-chip"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:653
 msgid "Three-chip color area sensor"
 msgstr "Sensore area colore 3-chip"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:654
 msgid "Color sequential area sensor"
 msgstr "Sensore area colore sequenziale"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:654
 msgid "Trilinear sensor"
 msgstr "Sensore trilineare"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:655
 msgid "Color sequential linear sensor"
 msgstr "Sensore lineare colore sequenziale"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "In alto a sinistra"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "In alto a destra"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "In basso a destra"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:658 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "In basso a sinistra"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:658
 msgid "Left-top"
 msgstr "Sinistra - alto"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:658
 msgid "Right-top"
 msgstr "Destra - alto"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:659
 msgid "Right-bottom"
 msgstr "Destra - basso"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:659
 msgid "Left-bottom"
 msgstr "Sinistra - basso"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:661
 msgid "Centered"
 msgstr "Centrato"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:661
 msgid "Co-sited"
 msgstr "Co-posizionato"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Reversed mono"
 msgstr "Mono invertito"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Normal mono"
 msgstr "Mono normale"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Palette"
 msgstr "Tavolozza"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:666
 msgid "Normal process"
 msgstr "Elaborazione normale"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:666
 msgid "Custom process"
 msgstr "Elaborazione personalizzata"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:668
 msgid "Auto exposure"
 msgstr "Esposizione automatica"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:668 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Esposizione manuale"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:668
 msgid "Auto bracket"
 msgstr "Bracketing automatico"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:670
 msgid "Auto white balance"
 msgstr "Bilanciamento del bianco automatico"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:670
 msgid "Manual white balance"
 msgstr "Bilanciamento del bianco manuale"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:675
 msgid "Low gain up"
 msgstr "Leggero aumento del guadagno"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:675
 msgid "High gain up"
 msgstr "Forte aumento del guadagno"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:676
 msgid "Low gain down"
 msgstr "Leggera riduzione del guadagno"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:676
 msgid "High gain down"
 msgstr "Forte riduzione del guadagno"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:678
 msgid "Low saturation"
 msgstr "Saturazione bassa"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:678 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Saturazione alta"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:679 libexif/exif-entry.c:680
 #: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
-#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:205
+#: libexif/olympus/mnote-olympus-entry.c:214
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "Soft"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:679 libexif/exif-entry.c:680
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
-#: libexif/olympus/mnote-olympus-entry.c:207
-#: libexif/olympus/mnote-olympus-entry.c:215
+#: libexif/olympus/mnote-olympus-entry.c:204
+#: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/pentax/mnote-pentax-entry.c:107
 msgid "Hard"
 msgstr "Hard"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:714 libexif/exif-entry.c:796
+#: libexif/olympus/mnote-olympus-entry.c:589
+#: libexif/olympus/mnote-olympus-entry.c:683
+#: libexif/olympus/mnote-olympus-entry.c:738
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:697
 msgid "Avg"
 msgstr "Med"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:698
 msgid "Center-weight"
 msgstr "Peso centrale"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:700
 msgid "Multi spot"
 msgstr "Multispot"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:701
 msgid "Pattern"
 msgstr "Modello"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:706
 msgid "Uncompressed"
 msgstr "Non compressa"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:707
 msgid "LZW compression"
 msgstr "Compressione LZW"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:708 libexif/exif-entry.c:709
 msgid "JPEG compression"
 msgstr "Compressione JPG"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:710
 msgid "Deflate/ZIP compression"
 msgstr "Compressione ZIP/Deflate"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:711
 msgid "PackBits compression"
 msgstr "Compressione PackBits"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:717
 msgid "Tungsten incandescent light"
 msgstr "Luce incandescente al tungsteno"
 
 # TAG:LIGHT_SOURCE
 #
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:719
 msgid "Fine weather"
 msgstr "Cielo limpido"
 
 # TAG:LIGHT_SOURCE
 #
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:720
 msgid "Cloudy weather"
 msgstr "Cielo nuvoloso"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:723 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Fluorescente bianca diurna"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:724
 msgid "Cool white fluorescent"
 msgstr "Fluorescente bianca fredda"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:725 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "Fluorescente bianca"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:726
 msgid "Standard light A"
 msgstr "Luce standard A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:727
 msgid "Standard light B"
 msgstr "Luce standard B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:728
 msgid "Standard light C"
 msgstr "Luce strandard C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:729
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:730
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:731
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:732
 msgid "ISO studio tungsten"
 msgstr "Tungsteno ISO da studio"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "Inch"
 msgstr "Pollici"
 
 # TAG:LIGHT_SOURCE
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "in"
 msgstr "in"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:741
 msgid "Centimeter"
 msgstr "Centimetri"
 
 # TAG:LIGHT_SOURCE
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:741
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:746
 msgid "Normal program"
 msgstr "Programma normale"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:747
 msgid "Aperture priority"
 msgstr "Priorità apertura"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:747 libexif/exif-tag.c:550
 msgid "Aperture"
 msgstr "Apertura"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:748
 msgid "Shutter priority"
 msgstr "Priorità otturatore"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:748
 msgid "Shutter"
 msgstr "Otturatore"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:749
 msgid "Creative program (biased toward depth of field)"
 msgstr "Programma zona creativa (basato sulla profondità di campo)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:750
 msgid "Creative"
 msgstr "Zona creativa"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:751
 msgid "Creative program (biased toward fast shutter speed)"
-msgstr ""
-"Programma zona creativa (basato sui tempi scatto con otturatore veloce)"
+msgstr "Programma zona creativa (basato sui tempi scatto con otturatore veloce)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:752
 msgid "Action"
 msgstr "Azione"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:753
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "Modalità ritratto (per foto ravvicinate con lo sfondo fuori fuoco)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:755
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Modalità paesaggio (per foto di paesaggi con lo sfondo messo a fuoco)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
-#: libexif/olympus/mnote-olympus-entry.c:100
+#: libexif/exif-entry.c:759 libexif/exif-entry.c:764
+#: libexif/olympus/mnote-olympus-entry.c:97
 msgid "Flash did not fire"
 msgstr "Il flash non ha illuminato"
 
 # TAG:FLASH
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:759
 msgid "No flash"
 msgstr "Senza flash"
 
 # TAG:FLASH
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:760
 msgid "Flash fired"
 msgstr "Il flash ha illuminato."
 
 # TAG:FLASH
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
-#: libexif/olympus/mnote-olympus-entry.c:178
-#: libexif/olympus/mnote-olympus-entry.c:212
-#: libexif/olympus/mnote-olympus-entry.c:221
-#: libexif/olympus/mnote-olympus-entry.c:244
+#: libexif/exif-entry.c:760 libexif/olympus/mnote-olympus-entry.c:170
+#: libexif/olympus/mnote-olympus-entry.c:175
+#: libexif/olympus/mnote-olympus-entry.c:209
+#: libexif/olympus/mnote-olympus-entry.c:218
+#: libexif/olympus/mnote-olympus-entry.c:241
 msgid "Yes"
 msgstr "Sì"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:761
 msgid "Strobe return light not detected"
 msgstr "Luce sonda di ritorno non rilevata"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:761
 msgid "Without strobe"
 msgstr "Senza sonda"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:763
 msgid "Strobe return light detected"
 msgstr "Luce sonda di ritorno rilevata"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:763
 msgid "With strobe"
 msgstr "Con sonda"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:765
 msgid "Flash fired, compulsory flash mode"
 msgstr "Il flash ha illuminato, modalità flash forzato."
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:766
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
-"Il flash ha illuminato, modalità flash forzato, luce di ritorno non rilevata"
+msgstr "Il flash ha illuminato, modalità flash forzato, luce di ritorno non rilevata"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:768
 msgid "Flash fired, compulsory flash mode, return light detected"
-msgstr ""
-"Il flash ha illuminato, modalità flash forzato, luce di ritorno rilevata"
+msgstr "Il flash ha illuminato, modalità flash forzato, luce di ritorno rilevata"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:770
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "Il flash non ha illuminato, modalità flash forzato"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:771
 msgid "Flash did not fire, auto mode"
 msgstr "Il flash non ha illuminato, modalità automatica"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:772
 msgid "Flash fired, auto mode"
 msgstr "Il flash ha illuminato, modalità automatica"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:773
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
-"Il flash ha illuminato, modalità automatica, luce di ritorno non rilevata"
+msgstr "Il flash ha illuminato, modalità automatica, luce di ritorno non rilevata"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:775
 msgid "Flash fired, auto mode, return light detected"
 msgstr "Il flash ha illuminato, modalità automatica, luce di ritorno rilevata"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:776
 msgid "No flash function"
 msgstr "Funzione flash assente"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:777
 msgid "Flash fired, red-eye reduction mode"
 msgstr "Il flash ha illuminato, modalità riduzione occhi rossi"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:778
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
-"Il flash ha illuminato, modalità riduzione occhi rossi, luce di ritorno non "
-"rilevata"
+msgstr "Il flash ha illuminato, modalità riduzione occhi rossi, luce di ritorno non rilevata"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:780
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
-"Il flash ha illuminato, modalità riduzione occhi rossi, luce di ritorno "
-"rilevata"
+msgstr "Il flash ha illuminato, modalità riduzione occhi rossi, luce di ritorno rilevata"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:782
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
-msgstr ""
-"Il flash ha illuminato, modalità flash forzato, modalità riduzione occhi "
-"rossi"
+msgstr "Il flash ha illuminato, modalità flash forzato, modalità riduzione occhi rossi"
 
-#: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"Il flash ha illuminato, modalità flash forzato, modalità riduzione occhi "
-"rossi, luce di ritorno non rilevata"
+#: libexif/exif-entry.c:784
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "Il flash ha illuminato, modalità flash forzato, modalità riduzione occhi rossi, luce di ritorno non rilevata"
 
-#: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"Il flash ha illuminato, modalità flash forzato, modalità riduzione occhi "
-"rossi, luce di ritorno rilevata"
+#: libexif/exif-entry.c:786
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "Il flash ha illuminato, modalità flash forzato, modalità riduzione occhi rossi, luce di ritorno rilevata"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
-msgstr ""
-"Il flash non ha illuminato, modalità automatica, modalità riduzione occhi "
-"rossi"
+msgstr "Il flash non ha illuminato, modalità automatica, modalità riduzione occhi rossi"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:789
 msgid "Flash fired, auto mode, red-eye reduction mode"
-msgstr ""
-"Il flash ha illuminato, modalità automatica, modalità riduzione occhi rossi"
+msgstr "Il flash ha illuminato, modalità automatica, modalità riduzione occhi rossi"
 
-#: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"Il flash ha illuminato, modalità automatica, luce di ritorno non rilevata, "
-"modalità riduzione occhi rossi"
+#: libexif/exif-entry.c:790
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "Il flash ha illuminato, modalità automatica, luce di ritorno non rilevata, modalità riduzione occhi rossi"
 
 # TAG:FLASH
 #
 # ultimo della serie :-)
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:792
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"Il flash ha illuminato, modalità automatica, luce di ritorno rilevata, "
-"modalità riduzione occhi rossi"
+msgstr "Il flash ha illuminato, modalità automatica, luce di ritorno rilevata, modalità riduzione occhi rossi"
 
 # TAG:SUBJECT_DISTANCE_RANGE
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:796
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:798
 msgid "Close view"
 msgstr "Vista ravvicinata"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:799
 msgid "Distant view"
 msgstr "Vista distanziata"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:799
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:802
 msgid "sRGB"
 msgstr "sRBG"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:803
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:804
 msgid "Uncalibrated"
 msgstr "Non calibrato"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:858
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Dimensione della voce non valida (%i, atteso %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:891
 msgid "Unsupported UNICODE string"
 msgstr "Stringa UNICODE non supportata"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:899
 msgid "Unsupported JIS string"
 msgstr "Stringa JIS non supportata"
 
-#: libexif/exif-entry.c:935
-#, fuzzy
-msgid "Tag UserComment contains data but is against specification."
-msgstr ""
-"L'etichetta «UserComment» è stata espansa ad almeno 8 byte per seguire la "
-"specifica."
+#: libexif/exif-entry.c:915
+msgid "Tag UserComment does not comply with standard but contains data."
+msgstr "L'etichetta UserComment non rispetta lo standard, ma contiene dati."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:919
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Byte nella posizione %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:928
 msgid "Unknown Exif Version"
 msgstr "Versione Exif sconosciuta"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:932
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif versione %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:943
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix versione 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:945
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix versione 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:947
 msgid "Unknown FlashPix Version"
 msgstr "Versione FlashPix sconosciuta"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:960 libexif/exif-entry.c:973 libexif/exif-entry.c:1629
+#: libexif/exif-entry.c:1634 libexif/exif-entry.c:1638
+#: libexif/exif-entry.c:1643 libexif/exif-entry.c:1644
 msgid "[None]"
 msgstr "[Nessuno]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:962
 msgid "(Photographer)"
 msgstr "(Fotografo)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:976
 msgid "(Editor)"
 msgstr "(Editor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1000
 #, c-format
-msgid "%.02f EV"
-msgstr "%.02f EV"
+msgid "%.02lf EV"
+msgstr "%.02lf EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1001
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
 # TAG:OCAL_LENGTH
 #
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1035
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35 equivalente: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1068 libexif/exif-entry.c:1069
 msgid " sec."
 msgstr " sec."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1080 libexif/exif-entry.c:1097
+#: libexif/exif-entry.c:1141
+#, c-format
+msgid "%.02f EV"
+msgstr "%.02f EV"
+
+#: libexif/exif-entry.c:1083
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d sec.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1085
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d sec.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1098
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1108
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
+#: libexif/exif-entry.c:1110 libexif/exif-entry.c:1150
+#: libexif/exif-entry.c:1237 libexif/exif-entry.c:1288
+#: libexif/exif-entry.c:1297 libexif/exif-entry.c:1333
 #: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
 #: libexif/pentax/mnote-pentax-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:359
@@ -2378,78 +2304,76 @@ msgstr "DSC"
 msgid "Internal error (unknown value %i)"
 msgstr "Errore interno (valore sconosciuto %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1118
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1119
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1120
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1121
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1122
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1123
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1124
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1125
 msgid "Reserved"
 msgstr "Riservato"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1148
 msgid "Directly photographed"
 msgstr ""
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1161
 msgid "YCbCr4:2:2"
 msgstr "YCbCr 4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1163
 msgid "YCbCr4:2:0"
 msgstr "YCbCr 4:2:0"
 
 # Credo indichi qualcosa che si trova all'interno di un cerchio con raggio
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1180
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "All'interno della distanza %i partendo da (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1189
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
-msgstr ""
-"All'interno del rettangolo (larghezza %i, altezza %i) intorno a (x,y) = (%i,"
-"%i)"
+msgstr "All'interno del rettangolo (larghezza %i, altezza %i) intorno a (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1195
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Numero di componenti inatteso (%li, atteso 2, 3 o 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1233
 #, fuzzy
 msgid "Sea level"
 msgstr "Livello del mare"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1235
 msgid "Sea level reference"
 msgstr "Riferimento di altitudine"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1343
 #, c-format
 msgid "Unknown value %i"
 msgstr "Valore sconosciuto %i"
@@ -2540,46 +2464,24 @@ msgid "GPS Tag Version"
 msgstr "GPS versione tag"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
-"Indica la versione del <GPSInfoIFD>. La versione è data come 2.0.0.0. Questa "
-"etichetta è obbligatorio quando l'etichetta <GPSInfo> è presente. (Nota: "
-"l'etichetta <GPSVersionID> è data in byte, a differenza dell'etichetta "
-"<ExifVersion>. Quando la versione è 2.0.0.0, il valore dell'etichetta è "
-"02000000.H)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Indica la versione del <GPSInfoIFD>. La versione è data come 2.0.0.0. Questa etichetta è obbligatorio quando l'etichetta <GPSInfo> è presente. (Nota: l'etichetta <GPSVersionID> è data in byte, a differenza dell'etichetta <ExifVersion>. Quando la versione è 2.0.0.0, il valore dell'etichetta è 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
 msgstr ""
 
 #: libexif/exif-tag.c:70
-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 l'identificazione della regola di interoperabilità. Utilizzare "
-"\"R98\" per esprimere le regole ExifR98. Utilizzati 4 byte incluso il codice "
-"di terminazione (NULL). Vedere il volume separato delle regole raccomandate "
-"di interoperabilità Exif (ExifR98) per altre etichette utilizzate per "
-"ExifR98."
+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 l'identificazione della regola di interoperabilità. Utilizzare \"R98\" per esprimere le regole ExifR98. Utilizzati 4 byte incluso il codice di terminazione (NULL). Vedere il volume separato delle regole raccomandate di interoperabilità Exif (ExifR98) per altre etichette utilizzate per ExifR98."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
 msgstr "Latitudine Nord o Sud"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
-"Indica se la latitudine è Nord oppure Sud. Il valore ASCII \"N\" indica "
-"latitudine Nord, \"S\" latitudine Sud."
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Indica se la latitudine è Nord oppure Sud. Il valore ASCII \"N\" indica latitudine Nord, \"S\" latitudine Sud."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
@@ -2590,88 +2492,47 @@ msgid "Latitude"
 msgstr "Latitudine"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
-"Indica la latitudine. La latitudine è espressa come tre valori RATIONAL che "
-"indicano rispettivamente i gradi, i minuti e i secondi. Quando sono indicati "
-"i gradi, i minuti e i secondi, il formato è gg/1,mm/1,ss/1. Quando sono "
-"utilizzati i gradi e i minuti e, ad esempio, le frazioni dei minuti sono "
-"date sino a due cifre decimali, il formato è gg/1,mmmm/100,0/1."
+msgid "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."
+msgstr "Indica la latitudine. La latitudine è espressa come tre valori RATIONAL che indicano rispettivamente i gradi, i minuti e i secondi. Quando sono indicati i gradi, i minuti e i secondi, il formato è gg/1,mm/1,ss/1. Quando sono utilizzati i gradi e i minuti e, ad esempio, le frazioni dei minuti sono date sino a due cifre decimali, il formato è gg/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
 msgstr "Longitudine Est o Ovest"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
-"Indica se la longitudine è Est oppure Ovest. Il valore ASCII \"E\" indica "
-"longitudine Est, \"W\" longitudine Ovest."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Indica se la longitudine è Est oppure Ovest. Il valore ASCII \"E\" indica longitudine Est, \"W\" longitudine Ovest."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
 msgstr "Longitudine"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
-"Indica la longitudine. La longitudine è espressa come tre valori RATIONAL "
-"che indicano rispettivamente i gradi, i minuti e i secondi. Quando sono "
-"espressi i gradi, i minuti e i secondi, il formato è ggg/1,mm/1,ss/1. Quando "
-"sono utilizzati i gradi e i minuti e, ad esempio, le frazioni dei minuti "
-"sono date sino a due cifre decimali, il formato è ggg/1,mmmm/100,0/1."
+msgid "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."
+msgstr "Indica la longitudine. La longitudine è espressa come tre valori RATIONAL che indicano rispettivamente i gradi, i minuti e i secondi. Quando sono espressi i gradi, i minuti e i secondi, il formato è ggg/1,mm/1,ss/1. Quando sono utilizzati i gradi e i minuti e, ad esempio, le frazioni dei minuti sono date sino a due cifre decimali, il formato è ggg/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:103
 msgid "Altitude Reference"
 msgstr "Riferimento di altitudine"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
-"Indica l'altitudine utilizzata come altitudine di riferimento. Se il "
-"riferimento è il livello del mare e l'altitudine è sopra il livello del "
-"mare, è indicato 0. Se l'altitudine è sotto il livello del mare, è indicato "
-"il valore 1 e l'altitudine è data come valore assoluto nell'etichetta "
-"GSPAltitude. L'unità di riferimento sono i metri. Notare che questa "
-"etichetta è di tipo BYTE, a differenza di altre etichette di riferimento."
+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 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."
+msgstr "Indica l'altitudine utilizzata come altitudine di riferimento. Se il riferimento è il livello del mare e l'altitudine è sopra il livello del mare, è indicato 0. Se l'altitudine è sotto il livello del mare, è indicato il valore 1 e l'altitudine è data come valore assoluto nell'etichetta GSPAltitude. L'unità di riferimento sono i metri. Notare che questa etichetta è di tipo BYTE, a differenza di altre etichette di riferimento."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
 msgstr "Altitudine"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
-"Indica l'altitudine basata sul riferimento in GPSAltitudeRef. L'altitudine è "
-"espressa come un valore RATIONAL. L'unità di riferimento sono i metri."
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Indica l'altitudine basata sul riferimento in GPSAltitudeRef. L'altitudine è espressa come un valore RATIONAL. L'unità di riferimento sono i metri."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
 #: libexif/exif-tag.c:118
@@ -2679,12 +2540,7 @@ msgid "GPS Satellites"
 msgstr "Satelliti GPS"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
+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, 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 shall be set to NULL."
 msgstr ""
 
 #: libexif/exif-tag.c:125
@@ -2692,10 +2548,7 @@ msgid "GPS Receiver Status"
 msgstr ""
 
 #: libexif/exif-tag.c:126
-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."
+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 ""
 
 #: libexif/exif-tag.c:129
@@ -2704,9 +2557,7 @@ msgid "GPS Measurement Mode"
 msgstr "Modalità Verde"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
 #: libexif/exif-tag.c:133
@@ -2714,10 +2565,7 @@ msgid "Measurement Precision"
 msgstr ""
 
 #: libexif/exif-tag.c:134
-msgid ""
-"Indicates the GPS DOP (data degree of precision). An HDOP value is written "
-"during two-dimensional measurement, and PDOP during three-dimensional "
-"measurement."
+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 ""
 
 #: libexif/exif-tag.c:137
@@ -2726,9 +2574,7 @@ msgid "Speed Unit"
 msgstr "Speedlight"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 
 #: libexif/exif-tag.c:141
@@ -2745,9 +2591,7 @@ msgid "Reference for direction of movement"
 msgstr ""
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
 #: libexif/exif-tag.c:147
@@ -2755,9 +2599,7 @@ msgid "Direction of Movement"
 msgstr ""
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
 msgstr ""
 
 #: libexif/exif-tag.c:150
@@ -2765,9 +2607,7 @@ msgid "GPS Image Direction Reference"
 msgstr ""
 
 #: libexif/exif-tag.c:151
-msgid ""
-"Indicates the reference for giving the direction of the image when it is "
-"captured. 'T' denotes true direction and 'M' is magnetic direction."
+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 ""
 
 #: libexif/exif-tag.c:153
@@ -2776,9 +2616,7 @@ msgid "GPS Image Direction"
 msgstr "Descrizione immagine"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
 msgstr ""
 
 #: libexif/exif-tag.c:156
@@ -2786,11 +2624,7 @@ msgid "Geodetic Survey Data Used"
 msgstr ""
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
 msgstr ""
 
 #: libexif/exif-tag.c:161
@@ -2798,33 +2632,16 @@ msgid "Reference For Latitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:162
-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 se la latitudine del punto di destinazione è Nord oppure Sud. Il "
-"valore ASCII \"N\" indica latitudine Nord, \"S\" latitudine Sud."
+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 se la latitudine del punto di destinazione è Nord oppure Sud. Il valore ASCII \"N\" indica latitudine Nord, \"S\" latitudine Sud."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
-"Indica la latitudine del punto di destinazione. È espressa come tre valori "
-"RATIONAL che indicano rispettivamente i gradi, i minuti e i secondi. Se la "
-"latitudine è indicata in gradi, minuti e secondi, un formato tipico è gg/1,"
-"mm/1,ss/1. Quando sono utilizzati i gradi e i minuti e, ad esempio, le "
-"frazioni dei minuti sono date sino a due cifre decimali, il formato risulta "
-"gg/1,mmmm/100,0/1."
+msgid "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."
+msgstr "Indica la latitudine del punto di destinazione. È espressa come tre valori RATIONAL che indicano rispettivamente i gradi, i minuti e i secondi. Se la latitudine è indicata in gradi, minuti e secondi, un formato tipico è gg/1,mm/1,ss/1. Quando sono utilizzati i gradi e i minuti e, ad esempio, le frazioni dei minuti sono date sino a due cifre decimali, il formato risulta gg/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
@@ -2832,12 +2649,8 @@ msgstr ""
 
 #: libexif/exif-tag.c:174
 #, fuzzy
-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 ""
-"Indica se la longitudine è Est oppure Ovest. Il valore ASCII \"E\" indica "
-"longitudine Est, \"W\" longitudine Ovest."
+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 "Indica se la longitudine è Est oppure Ovest. Il valore ASCII \"E\" indica longitudine Est, \"W\" longitudine Ovest."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
@@ -2845,28 +2658,15 @@ msgstr ""
 
 #: libexif/exif-tag.c:178
 #, fuzzy
-msgid ""
-"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."
-msgstr ""
-"Indica la longitudine. La longitudine è espressa come tre valori RATIONAL "
-"che indicano rispettivamente i gradi, i minuti e i secondi. Quando sono "
-"espressi i gradi, i minuti e i secondi, il formato è ggg/1,mm/1,ss/1. Quando "
-"sono utilizzati i gradi e i minuti e, ad esempio, le frazioni dei minuti "
-"sono date sino a due cifre decimali, il formato è ggg/1,mmmm/100,0/1."
+msgid "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."
+msgstr "Indica la longitudine. La longitudine è espressa come tre valori RATIONAL che indicano rispettivamente i gradi, i minuti e i secondi. Quando sono espressi i gradi, i minuti e i secondi, il formato è ggg/1,mm/1,ss/1. Quando sono utilizzati i gradi e i minuti e, ad esempio, le frazioni dei minuti sono date sino a due cifre decimali, il formato è ggg/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
 #: libexif/exif-tag.c:190
@@ -2874,9 +2674,7 @@ msgid "Bearing of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
 msgstr ""
 
 #: libexif/exif-tag.c:193
@@ -2884,9 +2682,7 @@ msgid "Reference for Distance to Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and knots."
 msgstr ""
 
 #: libexif/exif-tag.c:197
@@ -2905,11 +2701,7 @@ msgid "Name of GPS Processing Method"
 msgstr "Metodo di rilevamento"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
+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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
 #: libexif/exif-tag.c:205
@@ -2917,10 +2709,7 @@ msgid "Name of GPS Area"
 msgstr ""
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
+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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
 #: libexif/exif-tag.c:210
@@ -2928,10 +2717,7 @@ msgid "GPS Date"
 msgstr ""
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
 msgstr ""
 
 #: libexif/exif-tag.c:215
@@ -2939,86 +2725,66 @@ msgid "GPS Differential Correction"
 msgstr ""
 
 #: libexif/exif-tag.c:216
-msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+msgid "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
 #: libexif/exif-tag.c:220
 msgid "A general indication of the kind of data contained in this subfile."
-msgstr ""
-"Una indicazione generica del tipo di dati contenuti in questo sotto-file."
+msgstr "Una indicazione generica del tipo di dati contenuti in questo sotto-file."
 
 #: libexif/exif-tag.c:222
 msgid "Image Width"
 msgstr "Larghezza immagine"
 
 #: libexif/exif-tag.c:223
-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 ""
-"Il numero di colonne di dati dell'immagine, uguale al numero di pixel per "
-"riga. Nei dati compressi come JPEG viene usato un marcatore JPEG al posto di "
-"questa etichetta."
+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 "Il numero di colonne di dati dell'immagine, uguale al numero di pixel per riga. Nei dati compressi come JPEG viene usato un marcatore JPEG al posto di questa etichetta."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
 msgstr "Altezza immagine"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"Il numero di righe di dati dell'immagine. Nei dati compressi come JPEG viene "
-"usato un marcatore JPEG al posto di questa etichetta."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Il numero di righe di dati dell'immagine. Nei dati compressi come JPEG viene usato un marcatore JPEG al posto di questa etichetta."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
 msgstr "Bit per campione"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
-"Il numero di bit per componente dell'immagine. In questo standard ogni "
-"componente dell'immagine è di 8 bit, quindi il valore per questa etichetta è "
-"8. Vedere anche <SamplesPerPixel>. Nei dati compressi come JPEG è utilizzato "
-"un marcatore JPEG al posto di questa etichetta."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Il numero di bit per componente dell'immagine. In questo standard ogni componente dell'immagine è di 8 bit, quindi il valore per questa etichetta è 8. Vedere anche <SamplesPerPixel>. Nei dati compressi come JPEG è utilizzato un marcatore JPEG al posto di questa etichetta."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Compressione"
 
 #: libexif/exif-tag.c:238
-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 ""
-"Lo schema di compressione usato per i dati dell'immagine. Quando un'immagine "
-"primaria è compressa come JPEG, questa designazione non è necessaria e viene "
-"omessa. Quando le miniature usano la compressione JPEG, il valore di questa "
-"etichetta è impostato a 6."
+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 "Lo schema di compressione usato per i dati dell'immagine. Quando un'immagine primaria è compressa come JPEG, questa designazione non è necessaria e viene omessa. Quando le miniature usano la compressione JPEG, il valore di questa etichetta è impostato a 6."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
 msgstr "Interpretazione fotometrica"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
-"La composizione dei pixel. Nei dati compressi come JPEG viene usato un "
-"marcatore JPEG al posto di questa etichetta."
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "La composizione dei pixel. Nei dati compressi come JPEG viene usato un marcatore JPEG al posto di questa etichetta."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
@@ -3033,62 +2799,32 @@ msgid "Image Description"
 msgstr "Descrizione immagine"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
-"Una stringa di caratteri che fornisce il titolo dell'immagine. Potrebbe "
-"essere un commento, come \"Picnic in montagna, maggio 2004\". Non è "
-"possibile usare codici di carattere a 2 byte. Quando un codice a 2 byte è "
-"necessario, bisogna usare l'etichetta Exit privata <UserComment>."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "Una stringa di caratteri che fornisce il titolo dell'immagine. Potrebbe essere un commento, come \"Picnic in montagna, maggio 2004\". Non è possibile usare codici di carattere a 2 byte. Quando un codice a 2 byte è necessario, bisogna usare l'etichetta Exit privata <UserComment>."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Produttore"
 
 #: libexif/exif-tag.c:261
-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 ""
-"Il produttore dell'apparecchiatura di ripresa; indica il produttore del DSC, "
-"scanner, digitalizzatore video ed altra apparecchiatura usata per generare "
-"l'immagine. Quando questo campo è lasciato in bianco, viene trattato come "
-"sconosciuto."
+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 "Il produttore dell'apparecchiatura di ripresa; indica il produttore del DSC, scanner, digitalizzatore video ed altra apparecchiatura usata per generare l'immagine. Quando questo campo è lasciato in bianco, viene trattato come sconosciuto."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Modello"
 
 #: libexif/exif-tag.c:268
-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 ""
-"Il nome o il codice di modello dell'equipaggiamento: indica il nome o codice "
-"di modello del DSC, scanner, digitalizzatore video ed altra apparecchiatura "
-"usata per generare l'immagine. Quando questo campo è lasciato in bianco, "
-"viene trattato come sconosciuto."
+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 "Il nome o il codice di modello dell'equipaggiamento: indica il nome o codice di modello del DSC, scanner, digitalizzatore video ed altra apparecchiatura usata per generare l'immagine. Quando questo campo è lasciato in bianco, viene trattato come sconosciuto."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
 msgstr "Offset della striscia"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
-"Per ciascuna striscia, l'offset in byte di quella striscia. Si raccomanda "
-"che sia selezionato in modo che il numero di byte della striscia non ecceda "
-"i 64 Kbyte. Nei dati compressi come JPEG questa designazione non è "
-"necessaria e si omette. Vedere anche <RowsPerStrip> e <StripByteCounts>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "Per ciascuna striscia, l'offset in byte di quella striscia. Si raccomanda che sia selezionato in modo che il numero di byte della striscia non ecceda i 64 Kbyte. Nei dati compressi come JPEG questa designazione non è necessaria e si omette. Vedere anche <RowsPerStrip> e <StripByteCounts>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
@@ -3103,168 +2839,95 @@ msgid "Samples per Pixel"
 msgstr "Campioni per pixel"
 
 #: libexif/exif-tag.c:285
-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 ""
-"Il numero di componenti per ciascun pixel. Poiché questo standard si applica "
-"ad immagini RGB e YCbCr, il valore di questa etichetta è impostato a 3. Nei "
-"dati compressi come JPEG viene usato un marcatore JPEG al posto di questa "
-"etichetta."
+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 "Il numero di componenti per ciascun pixel. Poiché questo standard si applica ad immagini RGB e YCbCr, il valore di questa etichetta è impostato a 3. Nei dati compressi come JPEG viene usato un marcatore JPEG al posto di questa etichetta."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
 msgstr "Righe per striscia"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
-"Il numero di righe per striscia. Questo è il numero di righe di una striscia "
-"nell'immagine quando si divide un'immagine in strisce. Nei dati compressi "
-"come JPEG questa designazione non è necessaria e viene omessa. Vedere anche "
-"<StripOffsets> e <StripByteCounts>."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Il numero di righe per striscia. Questo è il numero di righe di una striscia nell'immagine quando si divide un'immagine in strisce. Nei dati compressi come JPEG questa designazione non è necessaria e viene omessa. Vedere anche <StripOffsets> e <StripByteCounts>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
 msgstr "Conteggio byte della striscia"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
-"Il numero totale di byte per ciascuna striscia. Nei dati compressi come JPEG "
-"questa designazione non è necessaria e viene omessa."
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Il numero totale di byte per ciascuna striscia. Nei dati compressi come JPEG questa designazione non è necessaria e viene omessa."
 
 #: libexif/exif-tag.c:301
 msgid "X-Resolution"
 msgstr "Risoluzione X"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
-"Il numero di pixel per <ResolutionUnit> nella direzione <ImageWidth>. Quando "
-"la risoluzione dell'immagine è sconosciuta, è impostata a 72 [dpi]."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Il numero di pixel per <ResolutionUnit> nella direzione <ImageWidth>. Quando la risoluzione dell'immagine è sconosciuta, è impostata a 72 [dpi]."
 
 #: libexif/exif-tag.c:306
 msgid "Y-Resolution"
 msgstr "Risoluzione Y"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"Il numero di pixel per <ResolutionUnit> nella direzione <ImageLength>. È "
-"impostato allo stesso valore di <XResolution>."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Il numero di pixel per <ResolutionUnit> nella direzione <ImageLength>. È impostato allo stesso valore di <XResolution>."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
 msgstr "Configurazione planare"
 
 #: libexif/exif-tag.c:312
-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 se le componenti dei pixel sono registrate in piani separati (formato "
-"\"planar\") o in maniera contigua (formato \"chunky\"). Nei file compressi "
-"come JPEG è utilizzato un marcatore JPEG al posto di questa etichetta. Se "
-"questo campo non esiste, viene assunto per le TIFF un valore predefinito di "
-"1 (contigue)."
+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 se le componenti dei pixel sono registrate in piani separati (formato \"planar\") o in maniera contigua (formato \"chunky\"). Nei file compressi come JPEG è utilizzato un marcatore JPEG al posto di questa etichetta. Se questo campo non esiste, viene assunto per le TIFF un valore predefinito di 1 (contigue)."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "Unità di risoluzione"
 
 #: libexif/exif-tag.c:318
-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 ""
-"L'unità di misura per <XResolution> e <YResolution>. La stessa unità è "
-"utilizzata sia per <XResolution> che per <YResolution>. Se la risoluzione "
-"dell'immagine è sconosciuta, è impostata a 2 (pollici)."
+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 "L'unità di misura per <XResolution> e <YResolution>. La stessa unità è utilizzata sia per <XResolution> che per <YResolution>. Se la risoluzione dell'immagine è sconosciuta, è impostata a 2 (pollici)."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
 msgstr "Funzione trasferimento"
 
 #: libexif/exif-tag.c:324
-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 funzione di trasferimento per l'immagine, descritta in formato "
-"tabellare. Normalmente questa etichetta non è necessaria, poiché lo spazio "
-"di colore è specificato nell'etichetta informativa dello spazio di colore "
-"(<ColorSpace>)."
+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 funzione di trasferimento per l'immagine, descritta in formato tabellare. Normalmente questa etichetta non è necessaria, poiché lo spazio di colore è specificato nell'etichetta informativa dello spazio di colore (<ColorSpace>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Software"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
-"Questa etichetta registra nome e versione del software o del firmware della "
-"fotocamera o del dispositivo di acquisizione immagini usato per generare "
-"l'immagine. Il formato dettagliato non è specificato, ma si raccomanda di "
-"seguire l'esempio seguente. Quando questo campo è lasciato vuoto, viene "
-"trattato come sconosciuto."
+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 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."
+msgstr "Questa etichetta registra nome e versione del software o del firmware della fotocamera o del dispositivo di acquisizione immagini usato per generare l'immagine. Il formato dettagliato non è specificato, ma si raccomanda di seguire l'esempio seguente. Quando questo campo è lasciato vuoto, viene trattato come sconosciuto."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Data e ora"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"la data e l'ora di creazione dell'immagine. In questo standard (EXIF-2.1) "
-"corrisponde alla data e all'ora in cui il file è stato modificato."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "la data e l'ora di creazione dell'immagine. In questo standard (EXIF-2.1) corrisponde alla data e all'ora in cui il file è stato modificato."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Autore"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
-"Questa etichetta registra il nome del proprietario della fotocamera, del "
-"fotografo o del creatore dell'immagine. Il formato dettagliato non è "
-"specificato, ma si raccomanda di scrivere l'informazione come nell'esempio "
-"seguente per una facile interoperabilità. Quando il campo è lasciato vuoto, "
-"è trattato come sconosciuto."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "Questa etichetta registra il nome del proprietario della fotocamera, del fotografo o del creatore dell'immagine. Il formato dettagliato non è specificato, ma si raccomanda di scrivere l'informazione come nell'esempio seguente per una facile interoperabilità. Quando il campo è lasciato vuoto, è trattato come sconosciuto."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Punto di bianco"
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
 msgstr ""
 
 #: libexif/exif-tag.c:353
@@ -3272,17 +2935,12 @@ msgid "Primary Chromaticities"
 msgstr "Cromaticità primarie"
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
 msgstr ""
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
-"Definito da Adobe Corporation per abilitare la struttura ad albero TIFF "
-"all'interno di un file TIFF."
+msgstr "Definito da Adobe Corporation per abilitare la struttura ad albero TIFF all'interno di un file TIFF."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
@@ -3293,112 +2951,48 @@ msgid "JPEG Interchange Format"
 msgstr "Formato di interscambio JPEG"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
-"L'offset del byte iniziale (SOI) dei dati compressi JPEG della miniatura. "
-"Questo non è usato per i dati primari JPEG di una immagine."
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "L'offset del byte iniziale (SOI) dei dati compressi JPEG della miniatura. Questo non è usato per i dati primari JPEG di una immagine."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
 msgstr "Lunghezza del formato di interscambio JPEG"
 
 #: libexif/exif-tag.c:373
-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 ""
-"Il numero dei byte dei dati compressi JPEG della miniatura. Questo non è "
-"usato per i dati primari JPEG di una immagine. Le miniature JPEG non sono "
-"separate ma sono registrate come un flusso di bit JPEG continuo da SOI a "
-"EOI. I marcatori Appn e COM non dovrebbero essere registrati. Le miniature "
-"compresse devono essere registrate in non più di 64 Kbyte, inclusi tutti gli "
-"altri dati da registrare in APP1."
+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 "Il numero dei byte dei dati compressi JPEG della miniatura. Questo non è usato per i dati primari JPEG di una immagine. Le miniature JPEG non sono separate ma sono registrate come un flusso di bit JPEG continuo da SOI a EOI. I marcatori Appn e COM non dovrebbero essere registrati. Le miniature compresse devono essere registrate in non più di 64 Kbyte, inclusi tutti gli altri dati da registrare in APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
 msgstr "Coefficienti YCbCr"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
-"I coefficienti della matrice per la trasformazione dei dati immagine da RGB "
-"a YCbCr. Non ci sono valori predefiniti in TIFF, ma qui è utilizzato come "
-"predefinito il valore dato in \"Color Space Guidelines\". Lo spazio colore è "
-"dichiarato in una etichetta informativa dello spazio colore, che ha come "
-"valore predefinito quello che dà le caratteristiche di interoperabilità "
-"dell'immagine ottimali in queste condizioni."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "I coefficienti della matrice per la trasformazione dei dati immagine da RGB a YCbCr. Non ci sono valori predefiniti in TIFF, ma qui è utilizzato come predefinito il valore dato in \"Color Space Guidelines\". Lo spazio colore è dichiarato in una etichetta informativa dello spazio colore, che ha come valore predefinito quello che dà le caratteristiche di interoperabilità dell'immagine ottimali in queste condizioni."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
 msgstr "Sottocampionamento YCbCr"
 
 #: libexif/exif-tag.c:393
-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 ""
-"Il rapporto di campionamento delle componenti di crominanza in relazione "
-"alla componente di luminanza. Nei dati compressi JPEG è utilizzato un "
-"marcatore JPEG al posto di questa etichetta."
+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 "Il rapporto di campionamento delle componenti di crominanza in relazione alla componente di luminanza. Nei dati compressi JPEG è utilizzato un marcatore JPEG al posto di questa etichetta."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
 msgstr "Posizionamento YCbCr"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
-"La posizione delle componenti di crominanza in relazione alla componente di "
-"luminanza. Questo campo è designato solo per dati compressi JPEG o dati non "
-"compressi YCbCr. Il valore TIFF predefinito è 1 (centrato); ma quando Y:Cb:"
-"Cr = 4:2:2 si raccomanda di usare 2 (affiancato) in questo standard per "
-"registrare i dati, per migliorare la qualità dell'immagine quando "
-"visualizzata su apparecchi TV. Quando questo campo non esiste, il lettore "
-"assumerà il valore TIFF predefinito. Nel caso Y:Cb:Cr = 4:2:0, si raccomanda "
-"il valore TIFF predefinito (centrato). Se il lettore non ha la capacità di "
-"supportare entrambi i tipi di <YCbCrPositioning>, seguirà il valore TIFF "
-"predefinito indipendentemente dal valore in questo campo. E' preferibile che "
-"i lettori supportino sia il posizionamento centrato che quello affiancato."
+msgid "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."
+msgstr "La posizione delle componenti di crominanza in relazione alla componente di luminanza. Questo campo è designato solo per dati compressi JPEG o dati non compressi YCbCr. Il valore TIFF predefinito è 1 (centrato); ma quando Y:Cb:Cr = 4:2:2 si raccomanda di usare 2 (affiancato) in questo standard per registrare i dati, per migliorare la qualità dell'immagine quando visualizzata su apparecchi TV. Quando questo campo non esiste, il lettore assumerà il valore TIFF predefinito. Nel caso Y:Cb:Cr = 4:2:0, si raccomanda il valore TIFF predefinito (centrato). Se il lettore non ha la capacità di supportare entrambi i tipi di <YCbCrPositioning>, seguirà il valore TIFF predefinito indipendentemente dal valore in questo campo. E' preferibile che i lettori supportino sia il posizionamento centrato che quello affiancato."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
 msgstr "Riferimento nero/bianco"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
-"Il valore di riferimento del punto nero e il valore di riferimento del punto "
-"bianco. Non ci sono valori predefiniti in TIFF, ma i valori sottostanti sono "
-"qui dati come predefiniti. Lo spazio colore è dichiarato in una etichetta "
-"informativa dello spazio colore, che ha come valore predefinito quello che "
-"dà le caratteristiche di interoperabilità dell'immagine ottimali in queste "
-"condizioni."
+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 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."
+msgstr "Il valore di riferimento del punto nero e il valore di riferimento del punto bianco. Non ci sono valori predefiniti in TIFF, ma i valori sottostanti sono qui dati come predefiniti. Lo spazio colore è dichiarato in una etichetta informativa dello spazio colore, che ha come valore predefinito quello che dà le caratteristiche di interoperabilità dell'immagine ottimali in queste condizioni."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
@@ -3408,19 +3002,13 @@ msgstr "Pacchetto XML"
 msgid "XMP Metadata"
 msgstr "Metadato XMP"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:438 libexif/exif-tag.c:785
 msgid "CFA Pattern"
 msgstr "Trama CFA"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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 la trama geometrica del color filter array (CFA) del sensore immagine "
-"quando è utilizzato un sensore di area colore 1-chip. Non si applica a tutti "
-"i metodi di rilevazione."
+#: libexif/exif-tag.c:439 libexif/exif-tag.c:786
+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 la trama geometrica del color filter array (CFA) del sensore immagine quando è utilizzato un sensore di area colore 1-chip. Non si applica a tutti i metodi di rilevazione."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
@@ -3431,41 +3019,8 @@ msgid "Copyright"
 msgstr "Copyright"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
-"Informazioni di copyright. In questo standard l'etichetta è utilizzata per "
-"indicare sia i diritti del fotografo che quelli dell'editor. Questo è "
-"l'avviso di copyright della persona o dell'organizzazione che reclama i "
-"diritti sull'immagine. In questo campo dovrebbe essere scritta la "
-"dichiarazione di interoperabilità dei diritti compresa la data i i diritti; "
-"es. \"Copyright, John Smith, 19xx. Tutti i diritti riservati.\". In questo "
-"standard il campo registra sia i diritti del fotografo che quelli "
-"dell'editor, ognuno scritto in una parte separata della dichiarazione. "
-"Quando esiste una chiara distinzione tra i diritti del fotografo e quelli "
-"dell'editor, questi devono essere scritti mettendo prima i diritti del "
-"fotografo seguiti da quelli dell'editor, separati da un NULL (in questo "
-"caso, dato che anche la dichiarazione termina con un NULL, ci sono due "
-"codici NULL) (vedere esempio 1). Se è dato solo il fotografo, è terminato da "
-"un codice NULL (vedere esempio 2). Quando sono dati solo i diritti "
-"dell'editor, la parte dei diritti del fotografo consiste in uno spazio "
-"seguito da un codice di terminazione NULL e a seguire i diritti dell'editor "
-"(vedere esempio3). Quando il campo è lasciato vuoto viene trattato come "
-"sconosciuto."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Informazioni di copyright. In questo standard l'etichetta è utilizzata per indicare sia i diritti del fotografo che quelli dell'editor. Questo è l'avviso di copyright della persona o dell'organizzazione che reclama i diritti sull'immagine. In questo campo dovrebbe essere scritta la dichiarazione di interoperabilità dei diritti compresa la data i i diritti; es. \"Copyright, John Smith, 19xx. Tutti i diritti riservati.\". In questo standard il campo registra sia i diritti del fotografo che quelli dell'editor, ognuno scritto in una parte separata della dichiarazione. Quando esiste una chiara distinzione tra i diritti del fotografo e quelli dell'editor, questi devono essere scritti mettendo prima i diritti del fotografo seguiti da quelli dell'editor, separati da un NULL (in questo caso, dato che anche la dichiarazione termina con un NULL, ci sono due codici NULL) (vedere esempio 1). Se è dato solo il fotografo, è terminato da un codice NULL (vedere esempio 2). Quando sono dati solo i diritti dell'editor, la parte dei diritti del fotografo consiste in uno spazio seguito da un codice di terminazione NULL e a seguire i diritti dell'editor (vedere esempio3). Quando il campo è lasciato vuoto viene trattato come sconosciuto."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
@@ -3484,74 +3039,47 @@ msgid "Image Resources Block"
 msgstr "Blocco delle risorse dell'immagine"
 
 #: libexif/exif-tag.c:477
-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 ""
-"Un puntatore all'Exif IFD. Interoperabilità, l'Exif IFD ha la stessa "
-"struttura dell'IFD specificato nelle TIFF. Di solito, comunque, non contiene "
-"dati immagine come nel caso delle TIFF."
+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 "Un puntatore all'Exif IFD. Interoperabilità, l'Exif IFD ha la stessa struttura dell'IFD specificato nelle TIFF. Di solito, comunque, non contiene dati immagine come nel caso delle TIFF."
 
 #: libexif/exif-tag.c:485
 msgid "Exposure Program"
 msgstr ""
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"La classe del programma utilizzato dalla fotocamera per impostare "
-"l'esposizione quando viene scattata la foto."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "La classe del programma utilizzato dalla fotocamera per impostare l'esposizione quando viene scattata la foto."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
 msgstr "Sensitività spettrale"
 
 #: libexif/exif-tag.c:491
-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 ""
-"Indica la sensitività spettrale di ciascun canale utilizzato della "
-"fotocamera. Il valore dell'etichetta è una stringa ASCII compatibile con lo "
-"standard sviluppato dal comitato tecnico ASTM."
+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 "Indica la sensitività spettrale di ciascun canale utilizzato della fotocamera. Il valore dell'etichetta è una stringa ASCII compatibile con lo standard sviluppato dal comitato tecnico ASTM."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
 #: libexif/exif-tag.c:497
-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 ""
-"Un puntatore al GPS Info IFD. La struttura di interoperabilità del GPS Info "
-"IFD, come quella del Exif IFD, non ha dati immagine."
+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 "Un puntatore al GPS Info IFD. La struttura di interoperabilità del GPS Info IFD, come quella del Exif IFD, non ha dati immagine."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
 msgstr "Valori sensibilità ISO"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
-"Indica la sensibilità ISO e la latitudine ISO della fotocamera o del "
-"dispositivo di input come specificato in ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Indica la sensibilità ISO e la latitudine ISO della fotocamera o del dispositivo di input come specificato in ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
 msgstr ""
 
 #: libexif/exif-tag.c:513
@@ -3568,24 +3096,16 @@ msgid "Exif Version"
 msgstr "Versione Exif"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
-"La versione supportata di questo standard. La mancanza di questo campo è "
-"intesa come una non conformità allo standard."
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "La versione supportata di questo standard. La mancanza di questo campo è intesa come una non conformità allo standard."
 
 #: libexif/exif-tag.c:520
 msgid "Date and Time (Original)"
 msgstr "Data e ora (dati originali)"
 
 #: libexif/exif-tag.c:521
-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 ""
-"La data e l'ora di generazione dei dati dell'immagine originale. Per una "
-"fotocamera digitale, sono memorizzate la data e l'ora di scatto della foto."
+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 "La data e l'ora di generazione dei dati dell'immagine originale. Per una fotocamera digitale, sono memorizzate la data e l'ora di scatto della foto."
 
 #: libexif/exif-tag.c:526
 msgid "Date and Time (Digitized)"
@@ -3593,52 +3113,31 @@ msgstr "Data e ora (dati digitalizzati)"
 
 #: libexif/exif-tag.c:527
 msgid "The date and time when the image was stored as digital data."
-msgstr "La data e l'ora di memorizzazione dell'immagine come dati digitali. "
+msgstr "La data e l'ora di memorizzazione dell'immagine come dati digitali."
 
 #: libexif/exif-tag.c:530
 msgid "Components Configuration"
 msgstr ""
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
-"Informazione specifica di dati compressi. I canali di ciascuna componente "
-"sono organizzati in ordine dalla prima alla quarta componente. Per dati non "
-"compressi l'organizzazione dei dati è indicata nell'etichetta  "
-"<PhotometricInterpretation>. Comunque, dato che <PhotometricInterpretation> "
-"può soltanto esprimere l'ordine di Y, Cb e Cr, questa etichetta è fornita "
-"per i casi nei quali i dati compressi usano componenti diverse da Y, Cb e Cr "
-"e per abilitare il supporto di altre sequenze."
+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 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."
+msgstr "Informazione specifica di dati compressi. I canali di ciascuna componente sono organizzati in ordine dalla prima alla quarta componente. Per dati non compressi l'organizzazione dei dati è indicata nell'etichetta  <PhotometricInterpretation>. Comunque, dato che <PhotometricInterpretation> può soltanto esprimere l'ordine di Y, Cb e Cr, questa etichetta è fornita per i casi nei quali i dati compressi usano componenti diverse da Y, Cb e Cr e per abilitare il supporto di altre sequenze."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
 msgstr "Bit per pixel compressi"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
-"Informazioni specifiche per i dati compressi. Il metodo di compressione "
-"usato per un'immagine compressa è indicato in unità di bit per pixel."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Informazioni specifiche per i dati compressi. Il metodo di compressione usato per un'immagine compressa è indicato in unità di bit per pixel."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr ""
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
-"Velocità otturatore. L'unità è l'impostazione APEX (Additive System of "
-"Photographic Exposure)."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Velocità otturatore. L'unità è l'impostazione APEX (Additive System of Photographic Exposure)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
@@ -3649,24 +3148,16 @@ msgid "Brightness"
 msgstr "Luminosità"
 
 #: libexif/exif-tag.c:554
-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 ""
-"Il valore della luminosità. L'unità è il valore APEX. Solitamente è indicato "
-"nell'intervallo da -99.99 a 99.99."
+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 "Il valore della luminosità. L'unità è il valore APEX. Solitamente è indicato nell'intervallo da -99.99 a 99.99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
 msgstr "Compensazione esposizione"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
-"La compensazione dell'esposizione. L'unità è in valori APEX. Di solito è "
-"indicata nell'intervallo da -99.99 a 99.99."
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "La compensazione dell'esposizione. L'unità è in valori APEX. Di solito è indicata nell'intervallo da -99.99 a 99.99."
 
 #: libexif/exif-tag.c:562
 #, fuzzy
@@ -3674,13 +3165,8 @@ msgid "Maximum Aperture Value"
 msgstr "Apertura massima"
 
 #: libexif/exif-tag.c:563
-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 ""
-"Il più piccolo numero F dell'obiettivo. L'unità è il valore APEX. "
-"Comunemente è assegnato nell'intervallo da -99.99 a 99.99, ma non è limitato "
-"a questo intervallo."
+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 "Il più piccolo numero F dell'obiettivo. L'unità è il valore APEX. Comunemente è assegnato nell'intervallo da -99.99 a 99.99, ma non è limitato a questo intervallo."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
@@ -3703,31 +3189,20 @@ msgid "The kind of light source."
 msgstr "Il tipo di sorgente luminosa."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
-msgstr ""
-"Questa etichetta è registrata quando un'immagine è catturata utilizzando una "
-"luce stroboscopica (flash)."
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
+msgstr "Questa etichetta è registrata quando un'immagine è catturata utilizzando una luce stroboscopica (flash)."
 
 #: libexif/exif-tag.c:582
-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 ""
-"La lunghezza focale attuale della lente, in millimetri. Non è convertita "
-"nella lunghezza focale di una fotocamera con pellicola a 35 millimetri."
+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 "La lunghezza focale attuale della lente, in millimetri. Non è convertita nella lunghezza focale di una fotocamera con pellicola a 35 millimetri."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr "Area soggetto"
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
-msgstr ""
-"Questa etichetta indica la posizione e l'area del soggetto principale nella "
-"scena."
+msgid "This tag indicates the location and area of the main subject in the overall scene."
+msgstr "Questa etichetta indica la posizione e l'area del soggetto principale nella scena."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
@@ -3738,37 +3213,15 @@ msgid "Maker Note"
 msgstr "Note produttore"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Un etichetta per i produttori di \"Exif writer\" per registrare qualsiasi "
-"informazione desiderata. I contenuti sono definiti dai produttori."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Un etichetta per i produttori di \"Exif writer\" per registrare qualsiasi informazione desiderata. I contenuti sono definiti dai produttori."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
 msgstr "Commenti utente"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
 msgstr ""
 
 #: libexif/exif-tag.c:619
@@ -3777,9 +3230,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:620
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
-msgstr ""
-"Una etichetta usata per registrare le frazioni di secondo per l'etichetta "
-"<DateTime>."
+msgstr "Una etichetta usata per registrare le frazioni di secondo per l'etichetta <DateTime>."
 
 #: libexif/exif-tag.c:624
 #, fuzzy
@@ -3787,11 +3238,8 @@ msgid "Sub-second Time (Original)"
 msgstr "Data e ora (dati originali)"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
-msgstr ""
-"Una etichetta usata per registrare le frazioni di secondo per l'etichetta "
-"<DateTimeOriginal>."
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr "Una etichetta usata per registrare le frazioni di secondo per l'etichetta <DateTimeOriginal>."
 
 #: libexif/exif-tag.c:629
 #, fuzzy
@@ -3799,11 +3247,8 @@ msgid "Sub-second Time (Digitized)"
 msgstr "Data e ora (dati digitalizzati)"
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
-msgstr ""
-"Una etichetta usata per registrare le frazioni di secondo per l'etichetta "
-"<DateTimeDigitized>."
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr "Una etichetta usata per registrare le frazioni di secondo per l'etichetta <DateTimeDigitized>."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
@@ -3818,8 +3263,7 @@ msgid "XP Comment"
 msgstr "Commento (XP)"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
 #: libexif/exif-tag.c:644
@@ -3827,9 +3271,7 @@ msgid "XP Author"
 msgstr "Autore (XP)"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
 msgstr ""
 
 #: libexif/exif-tag.c:649
@@ -3837,9 +3279,7 @@ msgid "XP Keywords"
 msgstr "Parole chiave (XP)"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
 msgstr ""
 
 #: libexif/exif-tag.c:654
@@ -3859,432 +3299,227 @@ msgid "Color Space"
 msgstr "Spazio colore"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
-"L'etichetta delle informazioni dello spazio colore è sempre registrata come "
-"l'identificatore dello spazio colore. Normalmente si usa sRGB (=1) per "
-"definire lo spazio colore basato sulle condizioni del monitor del PC e "
-"l'ambiente. Se si usa uno spazio colore diverso da sRGB, è posta a \"non "
-"calibrato\" (=FFFF.H).  I dati dell'immagine registrati come \"non calibrato"
-"\" possono essere trattati come sRGB quando vengono convertiti in FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "L'etichetta delle informazioni dello spazio colore è sempre registrata come l'identificatore dello spazio colore. Normalmente si usa sRGB (=1) per definire lo spazio colore basato sulle condizioni del monitor del PC e l'ambiente. Se si usa uno spazio colore diverso da sRGB, è posta a \"non calibrato\" (=FFFF.H).  I dati dell'immagine registrati come \"non calibrato\" possono essere trattati come sRGB quando vengono convertiti in FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
 msgstr ""
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
-"Informazioni specifiche per dati compressi. Quando si memorizza un file "
-"compresso, la larghezza valida dell'immagine significativa deve essere "
-"registrata in questa etichetta, sia che ci siano o no dati di riempimento o "
-"marcatori di restart. Questa etichetta non deve esistere in un file non "
-"compresso."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Informazioni specifiche per dati compressi. Quando si memorizza un file compresso, la larghezza valida dell'immagine significativa deve essere registrata in questa etichetta, sia che ci siano o no dati di riempimento o marcatori di restart. Questa etichetta non deve esistere in un file non compresso."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
 msgstr ""
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
-"Informazioni specifiche per dati compressi. Quando si memorizza un file "
-"compresso, l'altezza valida dell'immagine significativa deve essere "
-"registrata in questa etichetta, sia che ci siano o no dati di riempimento o "
-"marcatori di restart. Questa etichetta non dovrebbe esserci in un file non "
-"compresso. Dal momento che il riempimento dei dati di non è necessario per "
-"la direzione verticale, il numero di linee registrate in questa etichetta "
-"dell'altezza valida dell'immagine saranno le stesse di quelle registrate nel "
-"SOF."
+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, 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."
+msgstr "Informazioni specifiche per dati compressi. Quando si memorizza un file compresso, l'altezza valida dell'immagine significativa deve essere registrata in questa etichetta, sia che ci siano o no dati di riempimento o marcatori di restart. Questa etichetta non dovrebbe esserci in un file non compresso. Dal momento che il riempimento dei dati di non è necessario per la direzione verticale, il numero di linee registrate in questa etichetta dell'altezza valida dell'immagine saranno le stesse di quelle registrate nel SOF."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
 msgstr ""
 
 #: libexif/exif-tag.c:689
-#, fuzzy
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
-"Questa etichetta è usata per registrare il nome di un file audio relativo ai "
-"dati immagine. L'unica informazione relazionale registrata qui è il nome e "
-"l'estensione del file audio Exif (una stringa ASCII composta da 8 caratteri "
-"+ \".\" + 3 caratteri). Il percorso non è registrato. Le convenzioni "
-"sull'audio e sulla nomenclatura dei file sono definite nelle specifiche. "
-"Quando si utilizza questa etichetta, i file audio devono essere registrati "
-"in conformità al formato audio Exif. A chi scrive è permesso di memorizzare "
-"dati di tipo Audio dentro APP2 come estensione di flusso dati FlashPix. I "
-"file audio devono essere registrati in conformità al formato audio Exif. La "
-"mappatura dei file immagine e dei file audio Exif è eseguita in uno dei tre "
-"modi, [1], [2] e [3]. Se molteplici file sono mappati su un file come in [2] "
-"o in [3], il formato sopra descritto è usato per registrare solo un nome di "
-"file audio. Se ci sono più file audio, viene restituito il primo file "
-"registrato. Nel caso [3], per esempio, per il file immagine Exif \"DSC00001."
-"JPG\" soltanto \"SND00001.WAV\" è associato come relativo file audio Exif. "
-"Quando ci sono tre file audio Exif \"SND00001.WAV\", \"SND00002.WAV\" e "
-"\"SND00003.WAV\", per ciascuno di loro viene indicato il nome del file "
-"immagine Exif \"DSC00001.JPG\". Combinando informazioni relazionali "
-"multiple, può essere supportata una molteplicità di possibilità di "
-"riproduzione. Il modo di usare le informazioni relazionali è lasciato "
-"all'implementazione lato riproduzione. Dato che questa informazione è una "
-"stringa di caratteri ASCII, è terminata con NULL. Quando questa etichetta è "
-"usata per mappare file audio, la relazione tra il file audio ed i dati "
-"immagine deve anche essere indicata alla fine del file audio."
-
-#: libexif/exif-tag.c:719
+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. Stipulations on audio and file naming conventions are defined in the specification. 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 be recorded in conformance to the Exif audio format. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Questa etichetta è usata per registrare il nome di un file audio relativo ai dati immagine. L'unica informazione relazionale registrata qui è il nome e l'estensione del file audio Exif (una stringa ASCII composta da 8 caratteri + \".\" + 3 caratteri). Il percorso non è registrato. Le convenzioni sull'audio e sulla nomenclatura dei file sono definite nelle specifiche. Quando si utilizza questa etichetta, i file audio devono essere registrati in conformità al formato audio Exif. A chi scrive è permesso di memorizzare dati di tipo Audio dentro APP2 come estensione di flusso dati FlashPix. I file audio devono essere registrati in conformità al formato audio Exif. La mappatura dei file immagine e dei file audio Exif è eseguita in uno dei tre modi, [1], [2] e [3]. Se molteplici file sono mappati su un file come in [2] o in [3], il formato sopra descritto è usato per registrare solo un nome di file audio. Se ci sono più file audio, viene restituito il primo file registrato. Nel caso [3], per esempio, per il file immagine Exif \"DSC00001.JPG\" soltanto \"SND00001.WAV\" è associato come relativo file audio Exif. Quando ci sono tre file audio Exif \"SND00001.WAV\", \"SND00002.WAV\" e \"SND00003.WAV\", per ciascuno di loro viene indicato il nome del file immagine Exif \"DSC00001.JPG\". Combinando informazioni relazionali multiple, può essere supportata una molteplicità di possibilità di riproduzione. Il modo di usare le informazioni relazionali è lasciato all'implementazione lato riproduzione. Dato che questa informazione è una stringa di caratteri ASCII, è terminata con NULL. Quando questa etichetta è usata per mappare file audio, la relazione tra il file audio ed i dati immagine deve anche essere indicata alla fine del file audio."
+
+#: libexif/exif-tag.c:720
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
-"Interoperability IFD è composto da etichette che memorizzano le informazioni "
-"per assicurare l'interoperabilità ed è puntata dalle seguenti etichette "
-"situate nel Exif IFD. La struttura di interoperabilità del Interoperability "
-"IFD è la stessa della struttura IFD definita per le TIFF ma non contiene i "
-"dati immagine tipici di un normale TIFF IFD."
-
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:721
+msgid "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."
+msgstr "Interoperability IFD è composto da etichette che memorizzano le informazioni per assicurare l'interoperabilità ed è puntata dalle seguenti etichette situate nel Exif IFD. La struttura di interoperabilità del Interoperability IFD è la stessa della struttura IFD definita per le TIFF ma non contiene i dati immagine tipici di un normale TIFF IFD."
+
+#: libexif/exif-tag.c:730
 msgid "Flash Energy"
 msgstr "Energia flash"
 
-#: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
-"Indica l'energia del flash stroboscopico quando l'immagine è stata scattata, "
-"misurata in BCPS (Beam Candle Power Seconds)."
+#: libexif/exif-tag.c:731
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Indica l'energia del flash stroboscopico quando l'immagine è stata scattata, misurata in BCPS (Beam Candle Power Seconds)."
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:735
 msgid "Spatial Frequency Response"
 msgstr "Risposta in frequenza spaziale"
 
-#: libexif/exif-tag.c:735
-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 ""
-"Questa etichetta registra la tabella delle frequenze spaziali della "
-"fotocamera o del dispositivo di input e i valori SFR nella direzione di "
-"larghezza dell'immagine, altezza dell'immagine e nella direzione diagonale, "
-"come specificato in ISO 12233."
+#: libexif/exif-tag.c:736
+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 "Questa etichetta registra la tabella delle frequenze spaziali della fotocamera o del dispositivo di input e i valori SFR nella direzione di larghezza dell'immagine, altezza dell'immagine e nella direzione diagonale, come specificato in ISO 12233."
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:742
 msgid "Focal Plane X-Resolution"
 msgstr "Misura X del piano focale"
 
-#: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Indica il numero di pixel di larghezza (X) dell'immagine per "
-"<FocalPlaneResolutionUnit> sul piano focale della fotocamera."
+#: libexif/exif-tag.c:743
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indica il numero di pixel di larghezza (X) dell'immagine per <FocalPlaneResolutionUnit> sul piano focale della fotocamera."
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:747
 msgid "Focal Plane Y-Resolution"
 msgstr "Misura Y del piano focale"
 
-#: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Indica il numero di pixel di altezza (V) dell'immagine per "
-"<FocalPlaneResolutionUnit> sul piano focale della fotocamera."
+#: libexif/exif-tag.c:748
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indica il numero di pixel di altezza (V) dell'immagine per <FocalPlaneResolutionUnit> sul piano focale della fotocamera."
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:752
 msgid "Focal Plane Resolution Unit"
 msgstr "Unità di misura piano focale"
 
-#: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
-"Indica l'unità di misura per <FocalPlaneXResolution> e "
-"<FocalPlaneYResolution>. Questo valore è lo stesso di <ResolutionUnit>."
+#: libexif/exif-tag.c:753
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Indica l'unità di misura per <FocalPlaneXResolution> e <FocalPlaneYResolution>. Questo valore è lo stesso di <ResolutionUnit>."
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:758
 msgid "Subject Location"
 msgstr "Ubicazione soggetto"
 
-#: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
-"Indica la posizione del soggetto principale sulla scena. Il valore di questa "
-"etichetta rappresenta il pixel al centro del soggetto principale relativo al "
-"bordo sinistro, prima del processo di rotazione come risulta nell'etichetta "
-"<Rotation>. Il primo valore indica il numero della colonna X ed il secondo "
-"indica il numero della riga Y."
-
-#: libexif/exif-tag.c:765
-msgid "Exposure Index"
-msgstr ""
+#: libexif/exif-tag.c:759
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Indica la posizione del soggetto principale sulla scena. Il valore di questa etichetta rappresenta il pixel al centro del soggetto principale relativo al bordo sinistro, prima del processo di rotazione come risulta nell'etichetta <Rotation>. Il primo valore indica il numero della colonna X ed il secondo indica il numero della riga Y."
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
+msgid "Exposure Index"
 msgstr ""
-"Indica l'indice di esposizione selezionato sulla fotocamera o sul "
-"dispositivo di input quando viene catturata l'immagine."
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:767
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Indica l'indice di esposizione selezionato sulla fotocamera o sul dispositivo di input quando viene catturata l'immagine."
+
+#: libexif/exif-tag.c:770
 msgid "Sensing Method"
 msgstr "Metodo di rilevamento"
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:771
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr ""
-"Indica il tipo di sensore immagine sulla fotocamera o sul dispositivo di "
-"input."
+msgstr "Indica il tipo di sensore immagine sulla fotocamera o sul dispositivo di input."
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:774 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Origine file"
 
-#: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"Indica la sorgente dell'immagine. Se un DSC ha registrato l'immagine, il "
-"valore di questa etichetta è sempre impostato a 3, indicando che l'immagine "
-"è stata registrata su un DSC."
+#: libexif/exif-tag.c:775
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Indica la sorgente dell'immagine. Se un DSC ha registrato l'immagine, il valore di questa etichetta è sempre impostato a 3, indicando che l'immagine è stata registrata su un DSC."
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:779
 msgid "Scene Type"
 msgstr "Tipo scena"
 
-#: libexif/exif-tag.c:779
-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 ""
-"Indica il tipo di scena. Se un DSC ha registrato l'immagine, il valore di "
-"questo tag deve sempre essere impostato ad 1, indicando che l'immagine è "
-"stata fotografata direttamente."
+#: libexif/exif-tag.c:780
+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 "Indica il tipo di scena. Se un DSC ha registrato l'immagine, il valore di questo tag deve sempre essere impostato ad 1, indicando che l'immagine è stata fotografata direttamente."
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:790
 msgid "Custom Rendered"
 msgstr "Elaborazione immagine personalizzata"
 
-#: libexif/exif-tag.c:790
-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 ""
-"Questa etichetta indica l'uso di elaborazioni particolari sui dati "
-"dell'immagine, come un rendering inserito in uscita. Quando si compie "
-"un'elaborazione particolare, ci si aspetta che il lettore disabiliti o "
-"minimizzi ogni ulteriore elaborazione."
+#: libexif/exif-tag.c:791
+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 "Questa etichetta indica l'uso di elaborazioni particolari sui dati dell'immagine, come un rendering inserito in uscita. Quando si compie un'elaborazione particolare, ci si aspetta che il lettore disabiliti o minimizzi ogni ulteriore elaborazione."
 
-#: libexif/exif-tag.c:796
-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 ""
-"Questa etichetta indica la modalità di esposizione impostata quando "
-"l'immagine è stata scattata. In modalità auto-bracketing, la fotocamera "
-"scatta una serie di fotogrammi della stessa scena con differenti "
-"impostazioni di esposizione."
+#: libexif/exif-tag.c:797
+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 "Questa etichetta indica la modalità di esposizione impostata quando l'immagine è stata scattata. In modalità auto-bracketing, la fotocamera scatta una serie di fotogrammi della stessa scena con differenti impostazioni di esposizione."
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:802
 msgid "This tag indicates the white balance mode set when the image was shot."
-msgstr ""
-"Questa etichetta indica la modalità di bilanciamento del bianco impostata "
-"quando l'immagine è stata scattata."
+msgstr "Questa etichetta indica la modalità di bilanciamento del bianco impostata quando l'immagine è stata scattata."
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:806
 msgid "Digital Zoom Ratio"
 msgstr "Indice zoom digitale"
 
-#: libexif/exif-tag.c:806
-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 ""
-"Questa etichetta indica il fattore di zoom digitale quando l'immagine è "
-"stata scattata. Se il numeratore del valore memorizzato è 0, significa che "
-"lo zoom digitale non è stato usato."
+#: libexif/exif-tag.c:807
+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 "Questa etichetta indica il fattore di zoom digitale quando l'immagine è stata scattata. Se il numeratore del valore memorizzato è 0, significa che lo zoom digitale non è stato usato."
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:812
 msgid "Focal Length in 35mm Film"
 msgstr "Lunghezza focale in pellicola 35mm"
 
-#: libexif/exif-tag.c:812
-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 ""
-"Questa etichetta indica la lunghezza focale equivalente in mm, con "
-"riferimento ad una fotocamera con pellicola da 35mm. Un valore pari a 0 "
-"significa che la lunghezza focale è sconosciuta. Da notare che questa "
-"etichetta è differente dall'etichetta <FocalLength>."
+#: libexif/exif-tag.c:813
+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 "Questa etichetta indica la lunghezza focale equivalente in mm, con riferimento ad una fotocamera con pellicola da 35mm. Un valore pari a 0 significa che la lunghezza focale è sconosciuta. Da notare che questa etichetta è differente dall'etichetta <FocalLength>."
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:819
 msgid "Scene Capture Type"
 msgstr "Tipo cattura scena"
 
-#: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
-"Questa etichetta indica il tipo di scena che è stata scattata. Può anche "
-"essere usata per memorizzare il modo in cui l'immagine è stata scattata. Da "
-"notare che questa è differente dall'etichetta del tipo di scena <SceneType>."
+#: libexif/exif-tag.c:820
+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 scene type <SceneType> tag."
+msgstr "Questa etichetta indica il tipo di scena che è stata scattata. Può anche essere usata per memorizzare il modo in cui l'immagine è stata scattata. Da notare che questa è differente dall'etichetta del tipo di scena <SceneType>."
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:825
 msgid "Gain Control"
 msgstr "Controllo guadagno"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:826
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr ""
-"Questa etichetta indica il grado di regolazione globale del guadagno "
-"dell'immagine."
+msgstr "Questa etichetta indica il grado di regolazione globale del guadagno dell'immagine."
 
-#: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Questa etichetta indica la direzione di elaborazione del contrasto applicata "
-"dalla fotocamera quando l'immagine è stata scattata."
+#: libexif/exif-tag.c:830
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Questa etichetta indica la direzione di elaborazione del contrasto applicata dalla fotocamera quando l'immagine è stata scattata."
 
-#: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Questa etichetta indica la direzione di elaborazione della saturazione "
-"applicata dalla fotocamera quando l'immagine è stata scattata."
+#: libexif/exif-tag.c:834
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Questa etichetta indica la direzione di elaborazione della saturazione applicata dalla fotocamera quando l'immagine è stata scattata."
 
-#: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Questa etichetta indica la direzione di elaborazione della nitidezza "
-"applicata dalla fotocamera quando l'immagine è stata scattata."
+#: libexif/exif-tag.c:838
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Questa etichetta indica la direzione di elaborazione della nitidezza applicata dalla fotocamera quando l'immagine è stata scattata."
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:842
 msgid "Device Setting Description"
 msgstr "Descrizione dell'impostazione del dispositivo"
 
-#: libexif/exif-tag.c:842
-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 ""
-"Questa etichetta indica le informazioni sulle condizioni di acquisizione "
-"dell'immagine di un particolare modello di fotocamera. L'etichetta è usata "
-"soltanto per indicare le condizioni di acquisizione dell'immagine sul "
-"lettore."
+#: libexif/exif-tag.c:843
+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 "Questa etichetta indica le informazioni sulle condizioni di acquisizione dell'immagine di un particolare modello di fotocamera. L'etichetta è usata soltanto per indicare le condizioni di acquisizione dell'immagine sul lettore."
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:849
 msgid "Subject Distance Range"
 msgstr "Intervallo di distanza dal soggetto"
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:850
 msgid "This tag indicates the distance to the subject."
 msgstr "Questa etichetta indica la distanza dal soggetto."
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:852
 msgid "Image Unique ID"
 msgstr "ID univoco immagine"
 
-#: libexif/exif-tag.c:852
-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 ""
-"Questa etichetta indica un identificativo assegnato univocamente a ciascuna "
-"immagine. È memorizzato come una stringa ASCII corrispondente alla notazione "
-"esadecimale e di lunghezza fissa di 128 bit."
+#: libexif/exif-tag.c:853
+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 "Questa etichetta indica un identificativo assegnato univocamente a ciascuna immagine. È memorizzato come una stringa ASCII corrispondente alla notazione esadecimale e di lunghezza fissa di 128 bit."
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:858
 msgid "Gamma"
 msgstr "Gamma"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:859
 msgid "Indicates the value of coefficient gamma."
 msgstr "Indica il valore del coefficiente gamma."
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:861
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:862
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:864
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
+#: libexif/exif-tag.c:865
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
 msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:62
@@ -4569,446 +3804,446 @@ msgstr ""
 msgid "Invalid format '%s', expected '%s' or '%s'."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:92
+#: libexif/olympus/mnote-olympus-entry.c:89
 msgid "AF non D lens"
 msgstr "Obiettivo AF non D"
 
-#: libexif/olympus/mnote-olympus-entry.c:94
+#: libexif/olympus/mnote-olympus-entry.c:91
 msgid "AF-D or AF-S lens"
 msgstr "Obiettivo AF-D o AF-S"
 
-#: libexif/olympus/mnote-olympus-entry.c:95
+#: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF-D G lens"
 msgstr "Obiettivo AF-D G"
 
-#: libexif/olympus/mnote-olympus-entry.c:96
+#: libexif/olympus/mnote-olympus-entry.c:93
 msgid "AF-D VR lens"
 msgstr "Obiettivo AF-D VR"
 
-#: libexif/olympus/mnote-olympus-entry.c:97
+#: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D G VR lens"
 msgstr "Obiettivo AF-D VR"
 
-#: libexif/olympus/mnote-olympus-entry.c:101
+#: libexif/olympus/mnote-olympus-entry.c:98
 msgid "Flash unit unknown"
 msgstr "Unità flash sconosciuta"
 
-#: libexif/olympus/mnote-olympus-entry.c:102
+#: libexif/olympus/mnote-olympus-entry.c:99
 msgid "Flash is external"
 msgstr "Il flash è esterno"
 
-#: libexif/olympus/mnote-olympus-entry.c:103
+#: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash is on camera"
 msgstr "Il flash è sulla fotocamera"
 
-#: libexif/olympus/mnote-olympus-entry.c:106
+#: libexif/olympus/mnote-olympus-entry.c:103
 msgid "VGA basic"
 msgstr "VGA base"
 
-#: libexif/olympus/mnote-olympus-entry.c:107
+#: libexif/olympus/mnote-olympus-entry.c:104
 msgid "VGA normal"
 msgstr "VGA normale"
 
-#: libexif/olympus/mnote-olympus-entry.c:108
+#: libexif/olympus/mnote-olympus-entry.c:105
 msgid "VGA fine"
 msgstr "VGA fine"
 
-#: libexif/olympus/mnote-olympus-entry.c:109
+#: libexif/olympus/mnote-olympus-entry.c:106
 msgid "SXGA basic"
 msgstr "SXGA base"
 
-#: libexif/olympus/mnote-olympus-entry.c:110
+#: libexif/olympus/mnote-olympus-entry.c:107
 msgid "SXGA normal"
 msgstr "SXGA normale"
 
-#: libexif/olympus/mnote-olympus-entry.c:111
+#: libexif/olympus/mnote-olympus-entry.c:108
 msgid "SXGA fine"
 msgstr "SXGA fine"
 
-#: libexif/olympus/mnote-olympus-entry.c:112
+#: libexif/olympus/mnote-olympus-entry.c:109
 msgid "2 Mpixel basic"
 msgstr "2 Megapixel base"
 
-#: libexif/olympus/mnote-olympus-entry.c:113
+#: libexif/olympus/mnote-olympus-entry.c:110
 msgid "2 Mpixel normal"
 msgstr "2 Megapizel normale"
 
-#: libexif/olympus/mnote-olympus-entry.c:114
+#: libexif/olympus/mnote-olympus-entry.c:111
 msgid "2 Mpixel fine"
 msgstr "2 Megapixel fine"
 
-#: libexif/olympus/mnote-olympus-entry.c:117
+#: libexif/olympus/mnote-olympus-entry.c:114
 msgid "Color"
 msgstr "Colore"
 
-#: libexif/olympus/mnote-olympus-entry.c:122
+#: libexif/olympus/mnote-olympus-entry.c:119
 msgid "Bright+"
 msgstr "Luminoso+"
 
-#: libexif/olympus/mnote-olympus-entry.c:123
+#: libexif/olympus/mnote-olympus-entry.c:120
 msgid "Bright-"
 msgstr "Luminoso-"
 
-#: libexif/olympus/mnote-olympus-entry.c:124
+#: libexif/olympus/mnote-olympus-entry.c:121
 msgid "Contrast+"
 msgstr "Contrasto+"
 
-#: libexif/olympus/mnote-olympus-entry.c:125
+#: libexif/olympus/mnote-olympus-entry.c:122
 msgid "Contrast-"
 msgstr "Contrasto-"
 
-#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:125
 msgid "ISO 80"
 msgstr "ISO 80"
 
-#: libexif/olympus/mnote-olympus-entry.c:129
+#: libexif/olympus/mnote-olympus-entry.c:126
 msgid "ISO 160"
 msgstr "ISO 160"
 
-#: libexif/olympus/mnote-olympus-entry.c:130
+#: libexif/olympus/mnote-olympus-entry.c:127
 msgid "ISO 320"
 msgstr "ISO 320"
 
-#: libexif/olympus/mnote-olympus-entry.c:131
-#: libexif/olympus/mnote-olympus-entry.c:249
+#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:246
 msgid "ISO 100"
 msgstr "ISO 100"
 
-#: libexif/olympus/mnote-olympus-entry.c:135
+#: libexif/olympus/mnote-olympus-entry.c:132
 msgid "Preset"
 msgstr "Preimpostazione"
 
-#: libexif/olympus/mnote-olympus-entry.c:137
+#: libexif/olympus/mnote-olympus-entry.c:134
 msgid "Incandescence"
 msgstr "Incandescenza"
 
-#: libexif/olympus/mnote-olympus-entry.c:138
+#: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Fluorescence"
 msgstr "Fluorescenza"
 
-#: libexif/olympus/mnote-olympus-entry.c:140
+#: libexif/olympus/mnote-olympus-entry.c:137
 msgid "SpeedLight"
 msgstr "Speedlight"
 
-#: libexif/olympus/mnote-olympus-entry.c:143
+#: libexif/olympus/mnote-olympus-entry.c:140
 msgid "No fisheye"
 msgstr "No fisheye"
 
-#: libexif/olympus/mnote-olympus-entry.c:144
+#: libexif/olympus/mnote-olympus-entry.c:141
 msgid "Fisheye on"
 msgstr "Fisheye attivo"
 
-#: libexif/olympus/mnote-olympus-entry.c:147
+#: libexif/olympus/mnote-olympus-entry.c:144
 msgid "Normal, SQ"
 msgstr "Normale, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:148
+#: libexif/olympus/mnote-olympus-entry.c:145
 msgid "Normal, HQ"
 msgstr "Normale, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:149
+#: libexif/olympus/mnote-olympus-entry.c:146
 msgid "Normal, SHQ"
 msgstr "Normale, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:150
+#: libexif/olympus/mnote-olympus-entry.c:147
 msgid "Normal, RAW"
 msgstr "Normale, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:151
+#: libexif/olympus/mnote-olympus-entry.c:148
 msgid "Normal, SQ1"
 msgstr "Normale, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:152
+#: libexif/olympus/mnote-olympus-entry.c:149
 msgid "Normal, SQ2"
 msgstr "Normale, SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:153
+#: libexif/olympus/mnote-olympus-entry.c:150
 #, fuzzy
 msgid "Normal, super high"
 msgstr "Programma normale"
 
-#: libexif/olympus/mnote-olympus-entry.c:154
+#: libexif/olympus/mnote-olympus-entry.c:151
 msgid "Normal, standard"
 msgstr "Normale, standard"
 
-#: libexif/olympus/mnote-olympus-entry.c:155
+#: libexif/olympus/mnote-olympus-entry.c:152
 msgid "Fine, SQ"
 msgstr "Fine, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:156
+#: libexif/olympus/mnote-olympus-entry.c:153
 msgid "Fine, HQ"
 msgstr "Fine, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:157
+#: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Fine, SHQ"
 msgstr "Fine, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:158
+#: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, RAW"
 msgstr "Fine, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:159
+#: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, SQ1"
 msgstr "Fine, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:160
+#: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SQ2"
 msgstr "Fine, SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:161
+#: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, super high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:162
+#: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Super fine, SQ"
 msgstr "Super fine, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:163
+#: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Super fine, HQ"
 msgstr "Super fine, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:164
+#: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Super fine, SHQ"
 msgstr "Super fine, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:165
+#: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, RAW"
 msgstr "Super fine, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:166
+#: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, SQ1"
 msgstr "Super fine, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:167
+#: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SQ2"
 msgstr "Super fine, SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:168
+#: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, super high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:166
 #, fuzzy
 msgid "Super fine, high"
 msgstr "Superfine"
 
-#: libexif/olympus/mnote-olympus-entry.c:172
-#: libexif/olympus/mnote-olympus-entry.c:177
-#: libexif/olympus/mnote-olympus-entry.c:211
-#: libexif/olympus/mnote-olympus-entry.c:220
-#: libexif/olympus/mnote-olympus-entry.c:243
+#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:240
 msgid "No"
 msgstr "No"
 
-#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:180
 msgid "On (Preset)"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:188
+#: libexif/olympus/mnote-olympus-entry.c:185
 msgid "Fill"
 msgstr "Riempimento"
 
-#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:192
 msgid "Internal + external"
 msgstr "Interno + esterno"
 
-#: libexif/olympus/mnote-olympus-entry.c:224
+#: libexif/olympus/mnote-olympus-entry.c:221
 msgid "Interlaced"
 msgstr "Interlacciato"
 
-#: libexif/olympus/mnote-olympus-entry.c:225
+#: libexif/olympus/mnote-olympus-entry.c:222
 msgid "Progressive"
 msgstr "Progressivo"
 
-#: libexif/olympus/mnote-olympus-entry.c:231
+#: libexif/olympus/mnote-olympus-entry.c:228
 #: libexif/pentax/mnote-pentax-entry.c:85
 #: libexif/pentax/mnote-pentax-entry.c:139
 msgid "Best"
 msgstr "Ottimo"
 
-#: libexif/olympus/mnote-olympus-entry.c:232
+#: libexif/olympus/mnote-olympus-entry.c:229
 #, fuzzy
 msgid "Adjust exposure"
 msgstr "Esposizione automatica"
 
-#: libexif/olympus/mnote-olympus-entry.c:235
+#: libexif/olympus/mnote-olympus-entry.c:232
 #, fuzzy
 msgid "Spot focus"
 msgstr "Messa a fuoco panoramica"
 
-#: libexif/olympus/mnote-olympus-entry.c:236
+#: libexif/olympus/mnote-olympus-entry.c:233
 #, fuzzy
 msgid "Normal focus"
 msgstr "Elaborazione normale"
 
-#: libexif/olympus/mnote-olympus-entry.c:239
+#: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Record while down"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:240
+#: libexif/olympus/mnote-olympus-entry.c:237
 msgid "Press start, press stop"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:248
+#: libexif/olympus/mnote-olympus-entry.c:245
 msgid "ISO 50"
 msgstr "ISO 50"
 
-#: libexif/olympus/mnote-olympus-entry.c:250
+#: libexif/olympus/mnote-olympus-entry.c:247
 msgid "ISO 200"
 msgstr "ISO 200"
 
-#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 400"
 msgstr "ISO 400"
 
-#: libexif/olympus/mnote-olympus-entry.c:255
+#: libexif/olympus/mnote-olympus-entry.c:252
 #: libexif/pentax/mnote-pentax-entry.c:168
 msgid "Sport"
 msgstr "Sport"
 
-#: libexif/olympus/mnote-olympus-entry.c:256
+#: libexif/olympus/mnote-olympus-entry.c:253
 msgid "TV"
 msgstr "TV"
 
-#: libexif/olympus/mnote-olympus-entry.c:258
+#: libexif/olympus/mnote-olympus-entry.c:255
 msgid "User 1"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:259
+#: libexif/olympus/mnote-olympus-entry.c:256
 msgid "User 2"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:260
+#: libexif/olympus/mnote-olympus-entry.c:257
 msgid "Lamp"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:263
+#: libexif/olympus/mnote-olympus-entry.c:260
 msgid "5 frames/sec"
 msgstr "5 fotogrammi/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:264
+#: libexif/olympus/mnote-olympus-entry.c:261
 msgid "10 frames/sec"
 msgstr "10 fotogrammi/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:265
+#: libexif/olympus/mnote-olympus-entry.c:262
 msgid "15 frames/sec"
 msgstr "15 fotogrammi/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:266
+#: libexif/olympus/mnote-olympus-entry.c:263
 msgid "20 frames/sec"
 msgstr "20 fotogrammi/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:375
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "Correzione rosso %f, correzione blu %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
-msgid "No manual focus selection"
-msgstr "Nessuna seleziona manuale del fuoco"
-
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:383
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f metri"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:385
+msgid "No manual focus selection"
+msgstr "Nessuna seleziona manuale del fuoco"
+
+#: libexif/olympus/mnote-olympus-entry.c:411
 msgid "AF position: center"
 msgstr "Posizione AF: centro"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:412
 msgid "AF position: top"
 msgstr "Posizione AF: alto"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:413
 msgid "AF position: bottom"
 msgstr "Posizione AF: basso"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:414
 msgid "AF position: left"
 msgstr "Posizione AF: sinistra"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:415
 msgid "AF position: right"
 msgstr "Posizione AF: destra"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:416
 msgid "AF position: upper-left"
 msgstr "Posizione AF: alto a sinistra"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:417
 msgid "AF position: upper-right"
 msgstr "Posizione AF: alto a destra"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: lower-left"
 msgstr "Posizione AF: basso a sinistra"
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: lower-right"
 msgstr "Posizione AF: basso a destra"
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: far left"
 msgstr "Posizione AF: lontano a sinistra"
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: far right"
 msgstr "Posizione AF: lontano a destra"
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "Unknown AF position"
 msgstr "Posizione AF sconosciuta"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:433
+#: libexif/olympus/mnote-olympus-entry.c:503
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Errore interno (valore %hi sconosciuto)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:441
+#: libexif/olympus/mnote-olympus-entry.c:511
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Valore sconosciuto %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:536
+#: libexif/olympus/mnote-olympus-entry.c:556
 #, fuzzy, c-format
 msgid "Unknown %hu"
 msgstr "Sconosciuto"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:553
 msgid "2 sec."
 msgstr "2 sec."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:592
 msgid "Fast"
 msgstr "Veloce"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:696
 msgid "Automatic"
 msgstr "Automatico"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:726
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:729
 msgid "Manual: unknown"
 msgstr "Manuale: sconosciuto"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:735
 msgid "One-touch"
 msgstr "One-touch"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:791
+#: libexif/olympus/mnote-olympus-entry.c:801
 msgid "Infinite"
 msgstr "Infinito"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:809
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i byte di dati sconosciuti: "
@@ -5048,10 +4283,6 @@ msgstr "Impostazioni ISO"
 msgid "Preview Image IFD"
 msgstr "Anteprima immagine IFD"
 
-#: libexif/olympus/mnote-olympus-tag.c:50
-msgid "Offset of the preview image directory (IFD) inside the file."
-msgstr ""
-
 #: libexif/olympus/mnote-olympus-tag.c:51
 msgid "Exposurediff ?"
 msgstr "Differenza di esposizione?"
@@ -5871,12 +5102,6 @@ msgstr "Fine"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
-#~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr "L'etichetta UserComment non rispetta lo standard, ma contiene dati."
-
-#~ msgid "%.02lf EV"
-#~ msgstr "%.02lf EV"
-
 #~ msgid "On + Red-eye reduction"
 #~ msgstr "Acceso + riduzione occhi rossi"
 
diff --git a/po/ja.gmo b/po/ja.gmo
deleted file mode 100644
index a094e1d..0000000
--- a/po/ja.gmo
+++ /dev/null
diff --git a/po/ja.po b/po/ja.po
index 8c283a4..b90a062 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.20-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2010-02-05 16:15-0800\n"
 "PO-Revision-Date: 2010-02-17 11:48+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
-"Language: ja\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,20 +28,18 @@ msgstr "「%sã€�ã�®å½¢å¼�ã�Œæ­£ã�—ã��ã�‚ã‚Šã�¾ã�›ã‚“。「%sã€�を期待ã�—ã�¾ã�
 #: libexif/pentax/mnote-pentax-entry.c:51
 #, c-format
 msgid "Invalid number of components (%i, expected %i)."
-msgstr ""
-"コン�ー�ント�番��正���り��ん (%i ����%i を期待����)。"
+msgstr "コン�ー�ント�番��正���り��ん (%i ����%i を期待����)。"
 
 #: libexif/canon/mnote-canon-entry.c:61
 #: libexif/olympus/mnote-olympus-entry.c:72
 #: libexif/pentax/mnote-pentax-entry.c:61
 #, c-format
 msgid "Invalid number of components (%i, expected %i or %i)."
-msgstr ""
-"コン�ー�ント�番��正���り��ん (%i ����%i � %i を期待����)。"
+msgstr "コン�ー�ント�番��正���り��ん (%i ����%i � %i を期待����)。"
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
-#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:797
+#: libexif/olympus/mnote-olympus-entry.c:196
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
 #: libexif/pentax/mnote-pentax-entry.c:209
@@ -51,14 +49,14 @@ msgstr "マクロ"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
-#: libexif/olympus/mnote-olympus-entry.c:121
-#: libexif/olympus/mnote-olympus-entry.c:198
-#: libexif/olympus/mnote-olympus-entry.c:206
-#: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:675
+#: libexif/exif-entry.c:678 libexif/exif-entry.c:679 libexif/exif-entry.c:680
+#: libexif/exif-entry.c:746 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:213
+#: libexif/olympus/mnote-olympus-entry.c:586
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -83,33 +81,33 @@ msgstr "RAW"
 msgid "Superfine"
 msgstr "スーパー ファイン"
 
-#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
-#: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
-#: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
-#: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:301
+#: libexif/canon/mnote-canon-entry.c:304 libexif/canon/mnote-canon-entry.c:312
+#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:357
+#: libexif/canon/mnote-canon-entry.c:370 libexif/canon/mnote-canon-entry.c:372
+#: libexif/canon/mnote-canon-entry.c:574 libexif/canon/mnote-canon-entry.c:671
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
-#: libexif/olympus/mnote-olympus-entry.c:181
-#: libexif/olympus/mnote-olympus-entry.c:189
-#: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:178
+#: libexif/olympus/mnote-olympus-entry.c:186
+#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:530
+#: libexif/olympus/mnote-olympus-entry.c:547
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
 msgstr "オフ"
 
 #: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
-#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
-#: libexif/canon/mnote-canon-entry.c:403 libexif/fuji/mnote-fuji-entry.c:73
+#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:328
+#: libexif/canon/mnote-canon-entry.c:400 libexif/fuji/mnote-fuji-entry.c:73
 #: libexif/fuji/mnote-fuji-entry.c:101 libexif/fuji/mnote-fuji-entry.c:111
 #: libexif/fuji/mnote-fuji-entry.c:119
-#: libexif/olympus/mnote-olympus-entry.c:134
-#: libexif/olympus/mnote-olympus-entry.c:186
-#: libexif/olympus/mnote-olympus-entry.c:202
-#: libexif/olympus/mnote-olympus-entry.c:247
+#: libexif/olympus/mnote-olympus-entry.c:131
+#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/olympus/mnote-olympus-entry.c:244
 #: libexif/pentax/mnote-pentax-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:88
 #: libexif/pentax/mnote-pentax-entry.c:91
@@ -121,21 +119,21 @@ msgstr "オフ"
 msgid "Auto"
 msgstr "オート"
 
-#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
-#: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
-#: libexif/canon/mnote-canon-entry.c:374 libexif/fuji/mnote-fuji-entry.c:102
+#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:302
+#: libexif/canon/mnote-canon-entry.c:347 libexif/canon/mnote-canon-entry.c:361
+#: libexif/canon/mnote-canon-entry.c:371 libexif/fuji/mnote-fuji-entry.c:102
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
-#: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:179
+#: libexif/olympus/mnote-olympus-entry.c:533
+#: libexif/olympus/mnote-olympus-entry.c:550
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
 msgstr "オン"
 
 #: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
-#: libexif/olympus/mnote-olympus-entry.c:187
+#: libexif/olympus/mnote-olympus-entry.c:184
 #: libexif/pentax/mnote-pentax-entry.c:94
 msgid "Red-eye reduction"
 msgstr "赤目軽減"
@@ -158,12 +156,12 @@ msgid "External flash"
 msgstr "外部フラッシュ"
 
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
-#: libexif/canon/mnote-canon-entry.c:297
+#: libexif/canon/mnote-canon-entry.c:294
 msgid "Single"
 msgstr "シングル"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
-#: libexif/canon/mnote-canon-entry.c:298
+#: libexif/canon/mnote-canon-entry.c:295
 msgid "Continuous"
 msgstr "連射"
 
@@ -270,11 +268,11 @@ msgid "Full auto"
 msgstr "フル オート"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
-#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
+#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:285
+#: libexif/canon/mnote-canon-entry.c:392 libexif/exif-entry.c:745
 #: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
-#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:90
+#: libexif/olympus/mnote-olympus-entry.c:200
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
 #: libexif/pentax/mnote-pentax-entry.c:133
@@ -284,8 +282,8 @@ msgstr "フル オート"
 msgid "Manual"
 msgstr "マニュアル"
 
-#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:430
+#: libexif/exif-entry.c:672 libexif/exif-entry.c:756
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -300,7 +298,7 @@ msgid "Slow shutter"
 msgstr "低速シャッター"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
-#: libexif/olympus/mnote-olympus-entry.c:257
+#: libexif/olympus/mnote-olympus-entry.c:254
 msgid "Night"
 msgstr "夜"
 
@@ -308,13 +306,13 @@ msgstr "夜"
 msgid "Grayscale"
 msgstr "グレイ スケール"
 
-#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
+#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:308
 #: libexif/pentax/mnote-pentax-entry.c:128
 msgid "Sepia"
 msgstr "セピア"
 
-#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:429
+#: libexif/exif-entry.c:672 libexif/exif-entry.c:754
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -326,18 +324,18 @@ msgstr "横"
 msgid "Sports"
 msgstr "ス�ーツ"
 
-#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
-#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
+#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:309
+#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
 #: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
 msgid "Black & white"
 msgstr "白黒"
 
-#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
+#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:305
 msgid "Vivid"
 msgstr "ビビッド"
 
-#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
-#: libexif/canon/mnote-canon-entry.c:434
+#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:306
+#: libexif/canon/mnote-canon-entry.c:431
 msgid "Neutral"
 msgstr "ニュートラル"
 
@@ -351,7 +349,7 @@ msgid "Long shutter"
 msgstr "ロング シャッター"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
-#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:171
 msgid "Super macro"
 msgstr "スーパー マクロ"
 
@@ -372,8 +370,8 @@ msgstr "花�"
 msgid "Beach"
 msgstr "海辺"
 
-#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
-#: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:344
+#: libexif/canon/mnote-canon-entry.c:416 libexif/fuji/mnote-fuji-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
@@ -420,11 +418,11 @@ msgstr "水�館"
 msgid "ISO 3200"
 msgstr "ISO 3200"
 
-#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
-#: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
-#: libexif/olympus/mnote-olympus-entry.c:192
-#: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:348
+#: libexif/canon/mnote-canon-entry.c:365 libexif/canon/mnote-canon-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:189
+#: libexif/olympus/mnote-olympus-entry.c:226
+#: libexif/olympus/mnote-olympus-entry.c:451
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "��"
@@ -437,20 +435,20 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:703
+#: libexif/exif-entry.c:733
 msgid "Other"
 msgstr "��他"
 
 #: libexif/canon/mnote-canon-entry.c:158 libexif/canon/mnote-canon-entry.c:161
-#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:401
+#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:398
 #: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
 #: libexif/pentax/mnote-pentax-entry.c:117
 msgid "High"
 msgstr "高�"
 
 #: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
-#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
+#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:396
 #: libexif/pentax/mnote-pentax-entry.c:111
 #: libexif/pentax/mnote-pentax-entry.c:116
 msgid "Low"
@@ -488,11 +486,11 @@ msgstr "800"
 msgid "Default"
 msgstr "�期値"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:699
 msgid "Spot"
 msgstr "ス�ット"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:697
 msgid "Average"
 msgstr "平�"
 
@@ -500,11 +498,11 @@ msgstr "平�"
 msgid "Evaluative"
 msgstr "評価"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:702
 msgid "Partial"
 msgstr "部分"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:698
 msgid "Center-weighted average"
 msgstr "中央�����る平�"
 
@@ -516,7 +514,7 @@ msgstr "�明"
 msgid "Very close"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:798
 msgid "Close"
 msgstr ""
 
@@ -537,7 +535,7 @@ msgstr "無�"
 msgid "Manual AF point selection"
 msgstr "マニュアル AF �イント��択"
 
-#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
+#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:349
 msgid "None (MF)"
 msgstr "�� (MF)"
 
@@ -545,19 +543,19 @@ msgstr "�� (MF)"
 msgid "Auto-selected"
 msgstr "自動�択"
 
-#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
+#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:224
 #: libexif/pentax/mnote-pentax-entry.c:238
 msgid "Right"
 msgstr "�"
 
-#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
+#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:351
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
 msgid "Center"
 msgstr "中央"
 
-#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
+#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:220
 #: libexif/pentax/mnote-pentax-entry.c:236
 msgid "Left"
@@ -653,444 +651,429 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 ��� Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
-msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
-
-#: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
 msgstr "Canon EF 75-300mm f/4-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:221
+#: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 28-80mm f/3.5-5.6"
 msgstr "Canon EF 28-80mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:222
+#: libexif/canon/mnote-canon-entry.c:221
 msgid "Canon EF 28-105mm f/4-5.6"
 msgstr "Canon EF 28-105mm f/4-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:223
+#: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
-msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
-
-#: libexif/canon/mnote-canon-entry.c:225
+#: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 msgstr "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 
-#: libexif/canon/mnote-canon-entry.c:226
+#: libexif/canon/mnote-canon-entry.c:224
 msgid "Canon TS-E 24mm f/3.5L"
 msgstr "Canon TS-E 24mm f/3.5L"
 
-#: libexif/canon/mnote-canon-entry.c:227
+#: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon TS-E 45mm f/2.8"
 msgstr "Canon TS-E 45mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:228
+#: libexif/canon/mnote-canon-entry.c:226
 msgid "Canon TS-E 90mm f/2.8"
 msgstr "Canon TS-E 90mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:229
+#: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon EF 50mm f/1.0L"
 msgstr "Canon EF 50mm f/1.0L"
 
-#: libexif/canon/mnote-canon-entry.c:230
+#: libexif/canon/mnote-canon-entry.c:228
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 msgstr "シグマ 17-35mm f2.8-4 EX Aspherical HSM"
 
-#: libexif/canon/mnote-canon-entry.c:231
+#: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 600mm f/4L IS"
 msgstr "Canon EF 600mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:232
+#: libexif/canon/mnote-canon-entry.c:230
 msgid "Canon EF 200mm f/1.8L"
 msgstr "Canon EF 200mm f/1.8L"
 
-#: libexif/canon/mnote-canon-entry.c:233
+#: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 300mm f/2.8L"
 msgstr "Canon EF 300mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:234
+#: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 85mm f/1.2L"
 msgstr "Canon EF 85mm f/1.2L"
 
-#: libexif/canon/mnote-canon-entry.c:235
+#: libexif/canon/mnote-canon-entry.c:233
 msgid "Canon EF 400mm f/2.8L"
 msgstr "Canon EF 400mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:236
+#: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 500mm f/4.5L"
 msgstr "Canon EF 500mm f/4.5L"
 
-#: libexif/canon/mnote-canon-entry.c:237
+#: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 300mm f/2.8L IS"
 msgstr "Canon EF 300mm f/2.8L IS"
 
-#: libexif/canon/mnote-canon-entry.c:238
+#: libexif/canon/mnote-canon-entry.c:236
 msgid "Canon EF 500mm f/4L IS"
 msgstr "Canon EF 500mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:239
+#: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 100mm f/2"
 msgstr "Canon EF 100mm f/2"
 
-#: libexif/canon/mnote-canon-entry.c:240
+#: libexif/canon/mnote-canon-entry.c:238
 msgid "Sigma 20mm EX f/1.8"
 msgstr "Sigma 20mm EX f/1.8"
 
-#: libexif/canon/mnote-canon-entry.c:241
+#: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 200mm f/2.8L"
 msgstr "Canon EF 200mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:242
+#: libexif/canon/mnote-canon-entry.c:240
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
 msgstr "Sigma 10-20mm F4-5.6 ��� 12-24mm f/4.5-5.6 ��� 14mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:243
+#: libexif/canon/mnote-canon-entry.c:241
 msgid "Canon EF 35-350mm f/3.5-5.6L"
 msgstr "Canon EF 35-350mm f/3.5-5.6L"
 
-#: libexif/canon/mnote-canon-entry.c:244
+#: libexif/canon/mnote-canon-entry.c:242
 msgid "Canon EF 85mm f/1.8 USM"
 msgstr "Canon EF 85mm f/1.8 USM"
 
-#: libexif/canon/mnote-canon-entry.c:245
+#: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 28-105mm f/3.5-4.5 USM"
 msgstr "Canon EF 28-105mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:246
+#: libexif/canon/mnote-canon-entry.c:244
 msgid "Canon EF 20-35mm f/3.5-4.5 USM"
 msgstr "Canon EF 20-35mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:247
+#: libexif/canon/mnote-canon-entry.c:245
 msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
 msgstr "Canon EF 28-70mm f/2.8L ��� Sigma 24-70mm EX f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:248
+#: libexif/canon/mnote-canon-entry.c:246
 msgid "Canon EF 70-200mm f/2.8 L"
 msgstr "Canon EF 70-200mm f/2.8 L"
 
-#: libexif/canon/mnote-canon-entry.c:249
+#: libexif/canon/mnote-canon-entry.c:247
 msgid "Canon EF 70-200mm f/2.8 L + x1.4"
 msgstr "Canon EF 70-200mm f/2.8 L + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:250
+#: libexif/canon/mnote-canon-entry.c:248
 msgid "Canon EF 70-200mm f/2.8 L + x2"
 msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
-#: libexif/canon/mnote-canon-entry.c:251
+#: libexif/canon/mnote-canon-entry.c:249
 msgid "Canon EF 28mm f/1.8 USM"
 msgstr "Canon EF 28mm f/1.8 USM"
 
-#: libexif/canon/mnote-canon-entry.c:252
+#: libexif/canon/mnote-canon-entry.c:250
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
 msgstr "シグマ 15-30mm f/3.5-4.5 EX DG Aspherical"
 
-#: libexif/canon/mnote-canon-entry.c:253
+#: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 200mm f/2.8L II"
 msgstr "Canon EF 200mm f/2.8L II"
 
-#: libexif/canon/mnote-canon-entry.c:254
+#: libexif/canon/mnote-canon-entry.c:252
 msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
 msgstr "Canon EF 180mm Macro f/3.5L ��� Sigma 180mm EX HSM Macro f/3.5"
 
-#: libexif/canon/mnote-canon-entry.c:255
+#: libexif/canon/mnote-canon-entry.c:253
 msgid "Canon EF 135mm f/2L"
 msgstr "Canon EF 135mm f/2L"
 
-#: libexif/canon/mnote-canon-entry.c:256
+#: libexif/canon/mnote-canon-entry.c:254
 msgid "Canon EF 24-85mm f/3.5-4.5 USM"
 msgstr "Canon EF 24-85mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:257
+#: libexif/canon/mnote-canon-entry.c:255
 msgid "Canon EF 300mm f/4L IS"
 msgstr "Canon EF 300mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:258
+#: libexif/canon/mnote-canon-entry.c:256
 msgid "Canon EF 28-135mm f/3.5-5.6 IS"
 msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
 
-#: libexif/canon/mnote-canon-entry.c:259
+#: libexif/canon/mnote-canon-entry.c:257
 msgid "Canon EF 35mm f/1.4L"
 msgstr "Canon EF 35mm f/1.4L"
 
-#: libexif/canon/mnote-canon-entry.c:260
+#: libexif/canon/mnote-canon-entry.c:258
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:261
+#: libexif/canon/mnote-canon-entry.c:259
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 
-#: libexif/canon/mnote-canon-entry.c:262
+#: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
 
-#: libexif/canon/mnote-canon-entry.c:263
+#: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 400mm f/2.8L + x2"
 msgstr "Canon EF 400mm f/2.8L + x2"
 
-#: libexif/canon/mnote-canon-entry.c:264
+#: libexif/canon/mnote-canon-entry.c:262
 msgid "Canon EF 70-200mm f/4L"
 msgstr "Canon EF 70-200mm f/4L"
 
-#: libexif/canon/mnote-canon-entry.c:265
+#: libexif/canon/mnote-canon-entry.c:263
 msgid "Canon EF 100mm f/2.8 Macro"
 msgstr "Canon EF 100mm f/2.8 Macro"
 
-#: libexif/canon/mnote-canon-entry.c:266
+#: libexif/canon/mnote-canon-entry.c:264
 msgid "Canon EF 400mm f/4 DO IS"
 msgstr "Canon EF 400mm f/4 DO IS"
 
-#: libexif/canon/mnote-canon-entry.c:267
+#: libexif/canon/mnote-canon-entry.c:265
 msgid "Canon EF 75-300mm f/4-5.6 IS"
 msgstr "Canon EF 75-300mm f/4-5.6 IS"
 
-#: libexif/canon/mnote-canon-entry.c:268
+#: libexif/canon/mnote-canon-entry.c:266
 msgid "Canon EF 50mm f/1.4"
 msgstr "Canon EF 50mm f/1.4"
 
-#: libexif/canon/mnote-canon-entry.c:269
+#: libexif/canon/mnote-canon-entry.c:267
 msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
 msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
-#: libexif/canon/mnote-canon-entry.c:270
+#: libexif/canon/mnote-canon-entry.c:268
 msgid "Canon EF 28-200mm f/3.5-5.6"
 msgstr "Canon EF 28-200mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:271
+#: libexif/canon/mnote-canon-entry.c:269
 msgid "Canon EF 90-300mm f/4.5-5.6"
 msgstr "Canon EF 90-300mm f/4.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:272
+#: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
 msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:273
+#: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 70-200mm f/2.8L IS USM"
 msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:274
+#: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:275
+#: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
 msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
-#: libexif/canon/mnote-canon-entry.c:276
+#: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 16-35mm f/2.8L"
 msgstr "Canon EF 16-35mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:277
+#: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 24-70mm f/2.8L"
 msgstr "Canon EF 24-70mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:278
+#: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 17-40mm f/4L"
 msgstr "Canon EF 17-40mm f/4L"
 
-#: libexif/canon/mnote-canon-entry.c:279
+#: libexif/canon/mnote-canon-entry.c:277
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:280
+#: libexif/canon/mnote-canon-entry.c:278
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
 msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:281
+#: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
 msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:282
+#: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S60mm F2.8 Macro USM"
 msgstr "Canon EF-S60mm F2.8 Macro USM"
 
-#: libexif/canon/mnote-canon-entry.c:283
+#: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF 24-105mm f/4L IS"
 msgstr "Canon EF 24-105mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:284
+#: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
 msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:285
+#: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 50mm F1.2L USM"
 msgstr "Canon EF 50mm F1.2L USM"
 
-#: libexif/canon/mnote-canon-entry.c:286
+#: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
-msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
-
-#: libexif/canon/mnote-canon-entry.c:289
+#: libexif/canon/mnote-canon-entry.c:286
 msgid "TTL"
 msgstr "TTL"
 
-#: libexif/canon/mnote-canon-entry.c:290
+#: libexif/canon/mnote-canon-entry.c:287
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: libexif/canon/mnote-canon-entry.c:291
+#: libexif/canon/mnote-canon-entry.c:288
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/canon/mnote-canon-entry.c:289
 msgid "FP sync enabled"
 msgstr "FP �期有効"
 
-#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/canon/mnote-canon-entry.c:290
 msgid "2nd-curtain sync used"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:294
+#: libexif/canon/mnote-canon-entry.c:291
 msgid "FP sync used"
 msgstr "FP �期使用"
 
-#: libexif/canon/mnote-canon-entry.c:295
-#: libexif/olympus/mnote-olympus-entry.c:193
+#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/olympus/mnote-olympus-entry.c:190
 msgid "Internal"
 msgstr "内部"
 
-#: libexif/canon/mnote-canon-entry.c:296
-#: libexif/olympus/mnote-olympus-entry.c:194
+#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/olympus/mnote-olympus-entry.c:191
 msgid "External"
 msgstr "外部"
 
-#: libexif/canon/mnote-canon-entry.c:299
+#: libexif/canon/mnote-canon-entry.c:296
 msgid "Normal AE"
 msgstr "通常 AE"
 
-#: libexif/canon/mnote-canon-entry.c:300
+#: libexif/canon/mnote-canon-entry.c:297
 msgid "Exposure compensation"
 msgstr "露出補正"
 
-#: libexif/canon/mnote-canon-entry.c:301
+#: libexif/canon/mnote-canon-entry.c:298
 msgid "AE lock"
 msgstr "AE ロック"
 
-#: libexif/canon/mnote-canon-entry.c:302
+#: libexif/canon/mnote-canon-entry.c:299
 msgid "AE lock + exposure compensation"
 msgstr "AE ロック + 露出補正"
 
-#: libexif/canon/mnote-canon-entry.c:303
+#: libexif/canon/mnote-canon-entry.c:300
 msgid "No AE"
 msgstr "AE ��"
 
-#: libexif/canon/mnote-canon-entry.c:306
+#: libexif/canon/mnote-canon-entry.c:303
 msgid "On, shot only"
 msgstr "オン�撮影��"
 
-#: libexif/canon/mnote-canon-entry.c:310
+#: libexif/canon/mnote-canon-entry.c:307
 msgid "Smooth"
 msgstr "スムーズ"
 
-#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
-#: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
+#: libexif/canon/mnote-canon-entry.c:310 libexif/canon/mnote-canon-entry.c:334
+#: libexif/canon/mnote-canon-entry.c:393 libexif/canon/mnote-canon-entry.c:406
 #: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
 msgid "Custom"
 msgstr "カスタム"
 
-#: libexif/canon/mnote-canon-entry.c:314
+#: libexif/canon/mnote-canon-entry.c:311
 msgid "My color data"
 msgstr "自分�色データ"
 
-#: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
+#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:375
 #: libexif/pentax/mnote-pentax-entry.c:126
 #: libexif/pentax/mnote-pentax-entry.c:145
 msgid "Full"
 msgstr "フル"
 
-#: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
+#: libexif/canon/mnote-canon-entry.c:314 libexif/canon/mnote-canon-entry.c:374
 msgid "2/3"
 msgstr "2/3"
 
-#: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
+#: libexif/canon/mnote-canon-entry.c:315 libexif/canon/mnote-canon-entry.c:373
 msgid "1/3"
 msgstr "1/3"
 
-#: libexif/canon/mnote-canon-entry.c:324
+#: libexif/canon/mnote-canon-entry.c:321
 msgid "Fixed"
 msgstr "固定"
 
-#: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
+#: libexif/canon/mnote-canon-entry.c:322 libexif/pentax/mnote-pentax-tag.c:44
 msgid "Zoom"
 msgstr "ズーム"
 
-#: libexif/canon/mnote-canon-entry.c:332
+#: libexif/canon/mnote-canon-entry.c:329
 msgid "Sunny"
 msgstr "晴天"
 
-#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
-#: libexif/olympus/mnote-olympus-entry.c:139
+#: libexif/canon/mnote-canon-entry.c:330 libexif/canon/mnote-canon-entry.c:402
+#: libexif/exif-entry.c:720 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "曇天"
 
-#: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/canon/mnote-canon-entry.c:331 libexif/canon/mnote-canon-entry.c:403
+#: libexif/exif-entry.c:717 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/canon/mnote-canon-entry.c:332 libexif/canon/mnote-canon-entry.c:404
+#: libexif/exif-entry.c:716 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "�光�"
 
-#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
+#: libexif/exif-entry.c:718 libexif/exif-entry.c:760 libexif/exif-tag.c:577
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "フラッシュ"
 
-#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
+#: libexif/exif-entry.c:721 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "å½±"
 
-#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
+#: libexif/canon/mnote-canon-entry.c:337 libexif/canon/mnote-canon-entry.c:409
 msgid "Manual temperature (Kelvin)"
 msgstr "マニュアル温度 (Kelvin)"
 
-#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
 msgid "PC set 1"
 msgstr "PC 設定 1"
 
-#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
+#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
 msgid "PC set 2"
 msgstr "PC 設定 2"
 
-#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
+#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "PC set 3"
 msgstr "PC 設定 3"
 
-#: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+#: libexif/exif-entry.c:722 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "日光��光"
 
-#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
+#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "Custom 1"
 msgstr "カスタム 1"
 
-#: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
+#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "Custom 2"
 msgstr "カスタム 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:346 libexif/exif-entry.c:673
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1098,184 +1081,184 @@ msgstr "カスタム 2"
 msgid "Night scene"
 msgstr "ナイト シーン"
 
-#: libexif/canon/mnote-canon-entry.c:355
+#: libexif/canon/mnote-canon-entry.c:352
 msgid "Center-right"
 msgstr "中央-�"
 
-#: libexif/canon/mnote-canon-entry.c:357
+#: libexif/canon/mnote-canon-entry.c:354
 msgid "Left-right"
 msgstr "左-�"
 
-#: libexif/canon/mnote-canon-entry.c:358
+#: libexif/canon/mnote-canon-entry.c:355
 msgid "Left-center"
 msgstr "左-中央"
 
-#: libexif/canon/mnote-canon-entry.c:359
+#: libexif/canon/mnote-canon-entry.c:356
 msgid "All"
 msgstr "���"
 
-#: libexif/canon/mnote-canon-entry.c:361
+#: libexif/canon/mnote-canon-entry.c:358
 msgid "On (shot 1)"
 msgstr "オン (ショット 1)"
 
-#: libexif/canon/mnote-canon-entry.c:362
+#: libexif/canon/mnote-canon-entry.c:359
 msgid "On (shot 2)"
 msgstr "オン (ショット 2)"
 
-#: libexif/canon/mnote-canon-entry.c:363
+#: libexif/canon/mnote-canon-entry.c:360
 msgid "On (shot 3)"
 msgstr "オン (ショット 3)"
 
-#: libexif/canon/mnote-canon-entry.c:365
+#: libexif/canon/mnote-canon-entry.c:362
 msgid "EOS high-end"
 msgstr "EOS �イエンド"
 
-#: libexif/canon/mnote-canon-entry.c:366
+#: libexif/canon/mnote-canon-entry.c:363
 msgid "Compact"
 msgstr "コンパクト"
 
-#: libexif/canon/mnote-canon-entry.c:367
+#: libexif/canon/mnote-canon-entry.c:364
 msgid "EOS mid-range"
 msgstr "EOS ミッドレンジ"
 
-#: libexif/canon/mnote-canon-entry.c:369
+#: libexif/canon/mnote-canon-entry.c:366
 msgid "Rotate 90 CW"
 msgstr "90 度回転 (時計回り)"
 
-#: libexif/canon/mnote-canon-entry.c:370
+#: libexif/canon/mnote-canon-entry.c:367
 msgid "Rotate 180"
 msgstr "180 度回転"
 
-#: libexif/canon/mnote-canon-entry.c:371
+#: libexif/canon/mnote-canon-entry.c:368
 msgid "Rotate 270 CW"
 msgstr "270 度回転 (時計回り)"
 
-#: libexif/canon/mnote-canon-entry.c:372
+#: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotated by software"
 msgstr "ソフトウェア�よる回転"
 
-#: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/canon/mnote-canon-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:606
 msgid "Left to right"
 msgstr "左�ら�"
 
-#: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/canon/mnote-canon-entry.c:382
+#: libexif/olympus/mnote-olympus-entry.c:609
 msgid "Right to left"
 msgstr "��ら左"
 
-#: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/canon/mnote-canon-entry.c:383
+#: libexif/olympus/mnote-olympus-entry.c:612
 msgid "Bottom to top"
 msgstr "下�ら上"
 
-#: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/canon/mnote-canon-entry.c:384
+#: libexif/olympus/mnote-olympus-entry.c:615
 msgid "Top to bottom"
 msgstr "上�ら下"
 
-#: libexif/canon/mnote-canon-entry.c:388
+#: libexif/canon/mnote-canon-entry.c:385
 msgid "2x2 matrix (clockwise)"
 msgstr "2×2 マトリクス (時計回り)"
 
-#: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
-#: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/canon/mnote-canon-entry.c:391 libexif/canon/mnote-canon-entry.c:397
+#: libexif/canon/mnote-canon-entry.c:418 libexif/canon/mnote-canon-entry.c:428
+#: libexif/exif-entry.c:672 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
-#: libexif/olympus/mnote-olympus-entry.c:230
+#: libexif/olympus/mnote-olympus-entry.c:227
 msgid "Standard"
 msgstr "標準"
 
-#: libexif/canon/mnote-canon-entry.c:397
+#: libexif/canon/mnote-canon-entry.c:394
 msgid "N/A"
 msgstr "N/A"
 
-#: libexif/canon/mnote-canon-entry.c:398
+#: libexif/canon/mnote-canon-entry.c:395
 msgid "Lowest"
 msgstr "より低�"
 
-#: libexif/canon/mnote-canon-entry.c:402
+#: libexif/canon/mnote-canon-entry.c:399
 msgid "Highest"
 msgstr "より高�"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
+#: libexif/canon/mnote-canon-entry.c:401 libexif/exif-entry.c:715
 #: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/olympus/mnote-olympus-entry.c:133
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
 msgstr "日光"
 
-#: libexif/canon/mnote-canon-entry.c:422
+#: libexif/canon/mnote-canon-entry.c:419
 msgid "Set 1"
 msgstr "設定 1"
 
-#: libexif/canon/mnote-canon-entry.c:423
+#: libexif/canon/mnote-canon-entry.c:420
 msgid "Set 2"
 msgstr "設定 2"
 
-#: libexif/canon/mnote-canon-entry.c:424
+#: libexif/canon/mnote-canon-entry.c:421
 msgid "Set 3"
 msgstr "設定 3"
 
-#: libexif/canon/mnote-canon-entry.c:425
+#: libexif/canon/mnote-canon-entry.c:422
 msgid "User def. 1"
 msgstr "ユーザー定義 1"
 
-#: libexif/canon/mnote-canon-entry.c:426
+#: libexif/canon/mnote-canon-entry.c:423
 msgid "User def. 2"
 msgstr "ユーザー定義 2"
 
-#: libexif/canon/mnote-canon-entry.c:427
+#: libexif/canon/mnote-canon-entry.c:424
 msgid "User def. 3"
 msgstr "ユーザー定義 3"
 
-#: libexif/canon/mnote-canon-entry.c:428
+#: libexif/canon/mnote-canon-entry.c:425
 msgid "External 1"
 msgstr "外部 1"
 
-#: libexif/canon/mnote-canon-entry.c:429
+#: libexif/canon/mnote-canon-entry.c:426
 msgid "External 2"
 msgstr "外部 2"
 
-#: libexif/canon/mnote-canon-entry.c:430
+#: libexif/canon/mnote-canon-entry.c:427
 msgid "External 3"
 msgstr "外部 3"
 
-#: libexif/canon/mnote-canon-entry.c:435
+#: libexif/canon/mnote-canon-entry.c:432
 msgid "Faithful"
 msgstr "正確"
 
-#: libexif/canon/mnote-canon-entry.c:436
-#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/canon/mnote-canon-entry.c:433
+#: libexif/olympus/mnote-olympus-entry.c:115
 msgid "Monochrome"
 msgstr "モノクロ"
 
-#: libexif/canon/mnote-canon-entry.c:494
+#: libexif/canon/mnote-canon-entry.c:491
 msgid ", "
 msgstr "�"
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ミリ秒)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:621
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:645
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:655 libexif/exif-entry.c:1065
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:667
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
@@ -1294,7 +1277,7 @@ msgid "Settings (Second Part)"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/olympus/mnote-olympus-entry.c:595
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "パノラマ"
@@ -1387,20 +1370,20 @@ msgstr "簡�撮影�モード"
 msgid "Digital Zoom"
 msgstr "デジタル ズーム"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:829
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:833
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "彩度"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:837
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1423,7 +1406,7 @@ msgstr "フォーカス レンジ"
 msgid "AF Point"
 msgstr "AF �イント"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:796
 msgid "Exposure Mode"
 msgstr "露出�モード"
 
@@ -1530,7 +1513,7 @@ msgid "Exposure Compensation"
 msgstr "露出補正"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:801 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1623,696 +1606,671 @@ msgstr "モトローラ"
 msgid "Intel"
 msgstr "インテル"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:826
 msgid "Size of data too small to allow for EXIF data."
 msgstr "データ�大��� EXIF データ�許容より������。"
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:887
 msgid "EXIF marker not found."
 msgstr "EXIF マーカー�見��り��ん。"
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:914
 msgid "EXIF header not found."
 msgstr "EXIF ヘッダー�見��り��ん。"
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:930
 msgid "Unknown encoding."
 msgstr "�明�エンコーディング��。"
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1214
 msgid "Ignore unknown tags"
 msgstr "�明�タグを無効��る"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1215
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "EXIF データ読�込�時��明�タグを無効��る"
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1216
 msgid "Follow specification"
 msgstr ""
 
-#: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
+#: libexif/exif-data.c:1217
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
 msgstr ""
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1219
 msgid "Do not change maker note"
 msgstr "マーカー�注釈を変更���"
 
-#: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
+#: libexif/exif-data.c:1220
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
 msgstr ""
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
 msgstr ""
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
 msgstr ""
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
-"タグ「UserComment���正�形�「%s���。形�を「undefined��設定���"
-"�。"
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "タグ「UserComment���正�形�「%s���。形�を「undefined��設定����。"
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
 msgstr ""
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
-"タグ「UserComment��空����も���形��識別��開始�����ん。�れを"
-"修正����。"
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "タグ「UserComment��空����も���形��識別��開始�����ん。�れを修正����。"
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
-"タグ「UserComment��形��識別��開始�����ん。�れを修正����。"
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "タグ「UserComment��形��識別��開始�����ん。�れを修正����。"
 
 #: libexif/exif-entry.c:462
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i �イト�未定義データ"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:590
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i �イト�サ�ート���データ�種類"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:623
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr "タグ「%s�を�む�正�形��データ(「%s��「%s�を期待����)。"
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:636
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr ""
-"タグ「%s�を�む�正�コン�ー�ント番�(「%i��「%i�を期待����)。"
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "タグ「%s�を�む�正�コン�ー�ント番�(「%i��「%i�を期待����)。"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:650
 msgid "Chunky format"
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:650
 msgid "Planar format"
 msgstr "パノラマ形�"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
+#: libexif/exif-entry.c:652 libexif/exif-entry.c:744
 #: test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "未定義"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:652
 msgid "One-chip color area sensor"
 msgstr "1 �ップ�色エリア センサー"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:653
 msgid "Two-chip color area sensor"
 msgstr "2 �ップ�色エリア センサー"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:653
 msgid "Three-chip color area sensor"
 msgstr "3 �ップ�色エリア センサー"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:654
 msgid "Color sequential area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:654
 msgid "Trilinear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:655
 msgid "Color sequential linear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "左上"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "�上"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "�下"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:658 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "左下"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:658
 msgid "Left-top"
 msgstr "左上"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:658
 msgid "Right-top"
 msgstr "�上"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:659
 msgid "Right-bottom"
 msgstr "�下"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:659
 msgid "Left-bottom"
 msgstr "左下"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:661
 msgid "Centered"
 msgstr "中央"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:661
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Reversed mono"
 msgstr "�転白黒"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Normal mono"
 msgstr "通常�白黒"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Palette"
 msgstr "パレット"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:666
 msgid "Normal process"
 msgstr "通常処�"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:666
 msgid "Custom process"
 msgstr "カスタム処�"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:668
 msgid "Auto exposure"
 msgstr "自動露出"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:668 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "マニュアル露出"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:668
 msgid "Auto bracket"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:670
 msgid "Auto white balance"
 msgstr "自動ホワイト �ランス"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:670
 msgid "Manual white balance"
 msgstr "マニュアルホワイト �ランス"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:675
 msgid "Low gain up"
 msgstr "ロー ゲインを上�る"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:675
 msgid "High gain up"
 msgstr "�イ ゲインを上�る"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:676
 msgid "Low gain down"
 msgstr "ロー ゲインを下�る"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:676
 msgid "High gain down"
 msgstr "�イ ゲインを下�る"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:678
 msgid "Low saturation"
 msgstr "低彩度"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:678 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "高彩度"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:679 libexif/exif-entry.c:680
 #: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
-#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:205
+#: libexif/olympus/mnote-olympus-entry.c:214
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "ソフト"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:679 libexif/exif-entry.c:680
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
-#: libexif/olympus/mnote-olympus-entry.c:207
-#: libexif/olympus/mnote-olympus-entry.c:215
+#: libexif/olympus/mnote-olympus-entry.c:204
+#: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/pentax/mnote-pentax-entry.c:107
 msgid "Hard"
 msgstr "�ード"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:714 libexif/exif-entry.c:796
+#: libexif/olympus/mnote-olympus-entry.c:589
+#: libexif/olympus/mnote-olympus-entry.c:683
+#: libexif/olympus/mnote-olympus-entry.c:738
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "�明"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:697
 msgid "Avg"
 msgstr "平�"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:698
 msgid "Center-weight"
 msgstr ""
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:700
 msgid "Multi spot"
 msgstr "複数ス�ット"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:701
 msgid "Pattern"
 msgstr "パターン"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:706
 msgid "Uncompressed"
 msgstr "未圧縮"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:707
 msgid "LZW compression"
 msgstr "LZW 圧縮"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:708 libexif/exif-entry.c:709
 msgid "JPEG compression"
 msgstr "JPEG 圧縮"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:710
 msgid "Deflate/ZIP compression"
 msgstr "Deflate/ZIP 圧縮"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:711
 msgid "PackBits compression"
 msgstr "PackBits 圧縮"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:717
 msgid "Tungsten incandescent light"
 msgstr ""
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:719
 msgid "Fine weather"
 msgstr "晴天"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:720
 msgid "Cloudy weather"
 msgstr "曇天"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:723 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "昼白色�光�"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:724
 msgid "Cool white fluorescent"
 msgstr "冷白色�光�"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:725 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "白色�光�"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:726
 msgid "Standard light A"
 msgstr "標準ライト A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:727
 msgid "Standard light B"
 msgstr "標準ライト B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:728
 msgid "Standard light C"
 msgstr "標準ライト C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:729
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:730
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:731
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:732
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "Inch"
 msgstr "イン�"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "in"
 msgstr ""
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:741
 msgid "Centimeter"
 msgstr "セン� メートル"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:741
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:746
 msgid "Normal program"
 msgstr "通常プログラム"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:747
 msgid "Aperture priority"
 msgstr "開�優先"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:747 libexif/exif-tag.c:550
 msgid "Aperture"
 msgstr "開�"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:748
 msgid "Shutter priority"
 msgstr "シャッター優先"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:748
 msgid "Shutter"
 msgstr "シャッター"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:749
 msgid "Creative program (biased toward depth of field)"
 msgstr ""
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:750
 msgid "Creative"
 msgstr ""
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:751
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr ""
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:752
 msgid "Action"
 msgstr "�作"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:753
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:755
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
-#: libexif/olympus/mnote-olympus-entry.c:100
+#: libexif/exif-entry.c:759 libexif/exif-entry.c:764
+#: libexif/olympus/mnote-olympus-entry.c:97
 msgid "Flash did not fire"
 msgstr "フラッシュを焚�����ん"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:759
 msgid "No flash"
 msgstr "フラッシュ��"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:760
 msgid "Flash fired"
 msgstr "フラッシュを焚��"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
-#: libexif/olympus/mnote-olympus-entry.c:178
-#: libexif/olympus/mnote-olympus-entry.c:212
-#: libexif/olympus/mnote-olympus-entry.c:221
-#: libexif/olympus/mnote-olympus-entry.c:244
+#: libexif/exif-entry.c:760 libexif/olympus/mnote-olympus-entry.c:170
+#: libexif/olympus/mnote-olympus-entry.c:175
+#: libexif/olympus/mnote-olympus-entry.c:209
+#: libexif/olympus/mnote-olympus-entry.c:218
+#: libexif/olympus/mnote-olympus-entry.c:241
 msgid "Yes"
 msgstr "��"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:761
 msgid "Strobe return light not detected"
 msgstr "ストロボ�返光�未検出��"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:761
 msgid "Without strobe"
 msgstr "ストロボ��"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:763
 msgid "Strobe return light detected"
 msgstr "ストロボ�返光検出����"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:763
 msgid "With strobe"
 msgstr "ストロボ�り"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:765
 msgid "Flash fired, compulsory flash mode"
 msgstr "フラッシュ�り�強制フラッシュ モード"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:766
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr "フラッシュ�り�強制フラッシュモード�光�返り検出��"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:768
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr "フラッシュ�り�強制フラッシュモード�光�返り検出�り"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:770
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "フラッシュ���強制フラッシュ モード"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:771
 msgid "Flash did not fire, auto mode"
 msgstr "フラッシュ���自動モード"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:772
 msgid "Flash fired, auto mode"
 msgstr "フラッシュ�り�自動モード"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:773
 msgid "Flash fired, auto mode, return light not detected"
 msgstr "フラッシュ�り�自動モード�光�返り検出��"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:775
 msgid "Flash fired, auto mode, return light detected"
 msgstr "フラッシュ�り�自動モード�光�返り検出�り"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:776
 msgid "No flash function"
 msgstr "フラッシュ機能��"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:777
 msgid "Flash fired, red-eye reduction mode"
 msgstr "フラッシュ�り�赤目軽減�り"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:778
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr "フラッシュ�り�赤目軽減�り�光�返り検出��"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:780
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr "フラッシュ�り�赤目軽減�り�光�返り検出�り"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:782
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "フラッシュ�り�強制フラッシュ モード�赤目軽減モード"
 
-#: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"フラッシュ�り�強制フラッシュ モード�赤目軽減モード�光�返り検出��"
+#: libexif/exif-entry.c:784
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "フラッシュ�り�強制フラッシュ モード�赤目軽減モード�光�返り検出��"
 
-#: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"フラッシュ�り�強制フラッシュ モード�赤目軽減モード�光�返り検出�り"
+#: libexif/exif-entry.c:786
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "フラッシュ�り�強制フラッシュ モード�赤目軽減モード�光�返り検出�り"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr "フラッシュ���自動モード�赤目軽減モード"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:789
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "フラッシュモード�自動モード�赤目軽減モード"
 
-#: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
+#: libexif/exif-entry.c:790
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr "フラッシュ�り�自動モード�光�返り検出���赤目軽減モード"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:792
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr "フラッシュ�り�自動モード�光�返り検出�り�赤目軽減モード"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:796
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:798
 msgid "Close view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:799
 msgid "Distant view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:799
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:802
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:803
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:804
 msgid "Uncalibrated"
 msgstr ""
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:858
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:891
 msgid "Unsupported UNICODE string"
 msgstr "サ�ート��� UNICODE 文字列"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:899
 msgid "Unsupported JIS string"
 msgstr "サ�ート��� JIS 文字列"
 
-#: libexif/exif-entry.c:935
-msgid "Tag UserComment contains data but is against specification."
+#: libexif/exif-entry.c:915
+msgid "Tag UserComment does not comply with standard but contains data."
 msgstr ""
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:919
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr ""
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:928
 msgid "Unknown Exif Version"
 msgstr "�明� EXIF �ージョン"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:932
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "EXIF �ージョン %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:943
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix �ージョン 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:945
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix �ージョン 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:947
 msgid "Unknown FlashPix Version"
 msgstr "�明� FlashPix ��ージョン"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:960 libexif/exif-entry.c:973 libexif/exif-entry.c:1629
+#: libexif/exif-entry.c:1634 libexif/exif-entry.c:1638
+#: libexif/exif-entry.c:1643 libexif/exif-entry.c:1644
 msgid "[None]"
 msgstr "[��]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:962
 msgid "(Photographer)"
 msgstr "[写真家]"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:976
 msgid "(Editor)"
 msgstr "[編集者]"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1000
 #, c-format
-msgid "%.02f EV"
-msgstr "%.02f EV"
+msgid "%.02lf EV"
+msgstr "%.02lf EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1001
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1035
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr ""
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1068 libexif/exif-entry.c:1069
 msgid " sec."
 msgstr " 秒"
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1080 libexif/exif-entry.c:1097
+#: libexif/exif-entry.c:1141
+#, c-format
+msgid "%.02f EV"
+msgstr "%.02f EV"
+
+#: libexif/exif-entry.c:1083
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d 秒)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1085
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d 秒)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1098
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1108
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
+#: libexif/exif-entry.c:1110 libexif/exif-entry.c:1150
+#: libexif/exif-entry.c:1237 libexif/exif-entry.c:1288
+#: libexif/exif-entry.c:1297 libexif/exif-entry.c:1333
 #: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
 #: libexif/pentax/mnote-pentax-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:359
@@ -2320,74 +2278,74 @@ msgstr "DSC"
 msgid "Internal error (unknown value %i)"
 msgstr "内部エラー (�明�値 %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1118
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1119
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1120
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1121
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1122
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1123
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1124
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1125
 msgid "Reserved"
 msgstr ""
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1148
 msgid "Directly photographed"
 msgstr ""
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1161
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1163
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1180
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1189
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1195
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr ""
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1233
 msgid "Sea level"
 msgstr ""
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1235
 msgid "Sea level reference"
 msgstr ""
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1343
 #, c-format
 msgid "Unknown value %i"
 msgstr "�明�値 %i"
@@ -2478,11 +2436,7 @@ msgid "GPS Tag Version"
 msgstr "GPS タグ��ージョン"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
 #: libexif/exif-tag.c:69
@@ -2490,11 +2444,7 @@ msgid "Interoperability Index"
 msgstr ""
 
 #: libexif/exif-tag.c:70
-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."
+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 ""
 
 #: libexif/exif-tag.c:76
@@ -2502,9 +2452,7 @@ msgid "North or South Latitude"
 msgstr ""
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
 #: libexif/exif-tag.c:81
@@ -2516,12 +2464,7 @@ msgid "Latitude"
 msgstr ""
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:91
@@ -2529,9 +2472,7 @@ msgid "East or West Longitude"
 msgstr ""
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
 #: libexif/exif-tag.c:95
@@ -2539,12 +2480,7 @@ msgid "Longitude"
 msgstr ""
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:103
@@ -2552,12 +2488,7 @@ msgid "Altitude Reference"
 msgstr ""
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
+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 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."
 msgstr ""
 
 #: libexif/exif-tag.c:110
@@ -2565,9 +2496,7 @@ msgid "Altitude"
 msgstr ""
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
 #: libexif/exif-tag.c:114
@@ -2575,9 +2504,7 @@ msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
 #: libexif/exif-tag.c:118
@@ -2586,12 +2513,7 @@ msgid "GPS Satellites"
 msgstr "GPS �日付"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
+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, 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 shall be set to NULL."
 msgstr ""
 
 #: libexif/exif-tag.c:125
@@ -2599,10 +2521,7 @@ msgid "GPS Receiver Status"
 msgstr "GPS レシー�ー�状態"
 
 #: libexif/exif-tag.c:126
-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."
+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 ""
 
 #: libexif/exif-tag.c:129
@@ -2610,9 +2529,7 @@ msgid "GPS Measurement Mode"
 msgstr "GPS 測定モード"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
 #: libexif/exif-tag.c:133
@@ -2620,10 +2537,7 @@ msgid "Measurement Precision"
 msgstr ""
 
 #: libexif/exif-tag.c:134
-msgid ""
-"Indicates the GPS DOP (data degree of precision). An HDOP value is written "
-"during two-dimensional measurement, and PDOP during three-dimensional "
-"measurement."
+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 ""
 
 #: libexif/exif-tag.c:137
@@ -2631,9 +2545,7 @@ msgid "Speed Unit"
 msgstr "速度���"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 
 #: libexif/exif-tag.c:141
@@ -2649,9 +2561,7 @@ msgid "Reference for direction of movement"
 msgstr ""
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
 #: libexif/exif-tag.c:147
@@ -2659,9 +2569,7 @@ msgid "Direction of Movement"
 msgstr ""
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
 msgstr ""
 
 #: libexif/exif-tag.c:150
@@ -2669,9 +2577,7 @@ msgid "GPS Image Direction Reference"
 msgstr ""
 
 #: libexif/exif-tag.c:151
-msgid ""
-"Indicates the reference for giving the direction of the image when it is "
-"captured. 'T' denotes true direction and 'M' is magnetic direction."
+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 ""
 
 #: libexif/exif-tag.c:153
@@ -2679,9 +2585,7 @@ msgid "GPS Image Direction"
 msgstr "GPS 画��方�"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
 msgstr ""
 
 #: libexif/exif-tag.c:156
@@ -2689,11 +2593,7 @@ msgid "Geodetic Survey Data Used"
 msgstr ""
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
 msgstr ""
 
 #: libexif/exif-tag.c:161
@@ -2701,10 +2601,7 @@ msgid "Reference For Latitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:162
-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."
+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 ""
 
 #: libexif/exif-tag.c:165
@@ -2712,13 +2609,7 @@ msgid "Latitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:173
@@ -2726,9 +2617,7 @@ msgid "Reference for Longitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:174
-msgid ""
-"Indicates whether the longitude of the destination point is east or west "
-"longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+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 ""
 
 #: libexif/exif-tag.c:177
@@ -2736,13 +2625,7 @@ msgid "Longitude of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:186
@@ -2750,9 +2633,7 @@ msgid "Reference for Bearing of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
 #: libexif/exif-tag.c:190
@@ -2760,9 +2641,7 @@ msgid "Bearing of Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
 msgstr ""
 
 #: libexif/exif-tag.c:193
@@ -2770,9 +2649,7 @@ msgid "Reference for Distance to Destination"
 msgstr ""
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and knots."
 msgstr ""
 
 #: libexif/exif-tag.c:197
@@ -2789,11 +2666,7 @@ msgid "Name of GPS Processing Method"
 msgstr "GPS 処�方法���"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
+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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
 #: libexif/exif-tag.c:205
@@ -2801,10 +2674,7 @@ msgid "Name of GPS Area"
 msgstr "GPS エリア���"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
+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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
 #: libexif/exif-tag.c:210
@@ -2812,10 +2682,7 @@ msgid "GPS Date"
 msgstr "GPS �日付"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
 msgstr ""
 
 #: libexif/exif-tag.c:215
@@ -2823,11 +2690,20 @@ msgid "GPS Differential Correction"
 msgstr ""
 
 #: libexif/exif-tag.c:216
-msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+msgid "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
@@ -2840,9 +2716,7 @@ msgid "Image Width"
 msgstr "画�幅"
 
 #: libexif/exif-tag.c:223
-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."
+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 ""
 
 #: libexif/exif-tag.c:227
@@ -2850,9 +2724,7 @@ msgid "Image Length"
 msgstr "画�長"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
 
 #: libexif/exif-tag.c:231
@@ -2860,11 +2732,7 @@ msgid "Bits per Sample"
 msgstr "サンプル毎ビット"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
 
 #: libexif/exif-tag.c:237
@@ -2872,10 +2740,7 @@ msgid "Compression"
 msgstr "圧縮"
 
 #: libexif/exif-tag.c:238
-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."
+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 ""
 
 #: libexif/exif-tag.c:244
@@ -2883,9 +2748,7 @@ msgid "Photometric Interpretation"
 msgstr ""
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
 
 #: libexif/exif-tag.c:249
@@ -2901,11 +2764,7 @@ msgid "Image Description"
 msgstr "画��説明"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
 msgstr ""
 
 #: libexif/exif-tag.c:260
@@ -2913,10 +2772,7 @@ msgid "Manufacturer"
 msgstr "製造"
 
 #: libexif/exif-tag.c:261
-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."
+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 ""
 
 #: libexif/exif-tag.c:267
@@ -2924,10 +2780,7 @@ msgid "Model"
 msgstr "モデル"
 
 #: libexif/exif-tag.c:268
-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."
+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 ""
 
 #: libexif/exif-tag.c:273
@@ -2935,11 +2788,7 @@ msgid "Strip Offsets"
 msgstr ""
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
 #: libexif/exif-tag.c:280
@@ -2955,10 +2804,7 @@ msgid "Samples per Pixel"
 msgstr ""
 
 #: libexif/exif-tag.c:285
-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."
+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 ""
 
 #: libexif/exif-tag.c:290
@@ -2966,11 +2812,7 @@ msgid "Rows per Strip"
 msgstr ""
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
 msgstr ""
 
 #: libexif/exif-tag.c:297
@@ -2978,9 +2820,7 @@ msgid "Strip Byte Count"
 msgstr ""
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
 msgstr ""
 
 #: libexif/exif-tag.c:301
@@ -2988,9 +2828,7 @@ msgid "X-Resolution"
 msgstr "X 解�度"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
 #: libexif/exif-tag.c:306
@@ -2998,9 +2836,7 @@ msgid "Y-Resolution"
 msgstr "Y 解�度"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
 msgstr ""
 
 #: libexif/exif-tag.c:311
@@ -3008,10 +2844,7 @@ msgid "Planar Configuration"
 msgstr "プランナー設定"
 
 #: libexif/exif-tag.c:312
-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."
+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 ""
 
 #: libexif/exif-tag.c:317
@@ -3019,10 +2852,7 @@ msgid "Resolution Unit"
 msgstr "解�度���"
 
 #: libexif/exif-tag.c:318
-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."
+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 ""
 
 #: libexif/exif-tag.c:323
@@ -3030,10 +2860,7 @@ msgid "Transfer Function"
 msgstr ""
 
 #: libexif/exif-tag.c:324
-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>)."
+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 ""
 
 #: libexif/exif-tag.c:328
@@ -3041,11 +2868,7 @@ msgid "Software"
 msgstr "ソフトウェア"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
+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 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."
 msgstr ""
 
 #: libexif/exif-tag.c:336
@@ -3053,9 +2876,7 @@ msgid "Date and Time"
 msgstr "日時"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
 msgstr ""
 
 #: libexif/exif-tag.c:340
@@ -3063,11 +2884,7 @@ msgid "Artist"
 msgstr "アーティスト"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
@@ -3075,10 +2892,7 @@ msgid "White Point"
 msgstr ""
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
 msgstr ""
 
 #: libexif/exif-tag.c:353
@@ -3086,10 +2900,7 @@ msgid "Primary Chromaticities"
 msgstr ""
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
 msgstr ""
 
 #: libexif/exif-tag.c:359
@@ -3105,9 +2916,7 @@ msgid "JPEG Interchange Format"
 msgstr ""
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
 msgstr ""
 
 #: libexif/exif-tag.c:372
@@ -3115,12 +2924,7 @@ msgid "JPEG Interchange Format Length"
 msgstr ""
 
 #: libexif/exif-tag.c:373
-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."
+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 ""
 
 #: libexif/exif-tag.c:382
@@ -3128,12 +2932,7 @@ msgid "YCbCr Coefficients"
 msgstr ""
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
 msgstr ""
 
 #: libexif/exif-tag.c:392
@@ -3141,9 +2940,7 @@ msgid "YCbCr Sub-Sampling"
 msgstr ""
 
 #: libexif/exif-tag.c:393
-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."
+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 ""
 
 #: libexif/exif-tag.c:398
@@ -3151,18 +2948,7 @@ msgid "YCbCr Positioning"
 msgstr ""
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: libexif/exif-tag.c:414
@@ -3170,12 +2956,7 @@ msgid "Reference Black/White"
 msgstr ""
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
+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 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."
 msgstr ""
 
 #: libexif/exif-tag.c:423
@@ -3186,15 +2967,12 @@ msgstr "XML パケット"
 msgid "XMP Metadata"
 msgstr "XMP メタデータ"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:438 libexif/exif-tag.c:785
 msgid "CFA Pattern"
 msgstr "CFA パターン"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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."
+#: libexif/exif-tag.c:439 libexif/exif-tag.c:786
+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 ""
 
 #: libexif/exif-tag.c:443
@@ -3206,22 +2984,7 @@ msgid "Copyright"
 msgstr "Copyright"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
 msgstr ""
 
 #: libexif/exif-tag.c:467
@@ -3241,10 +3004,7 @@ msgid "Image Resources Block"
 msgstr "画�リソース�ブロック"
 
 #: libexif/exif-tag.c:477
-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."
+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 ""
 
 #: libexif/exif-tag.c:485
@@ -3252,9 +3012,7 @@ msgid "Exposure Program"
 msgstr "露出プログラム"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
 msgstr ""
 
 #: libexif/exif-tag.c:490
@@ -3262,10 +3020,7 @@ msgid "Spectral Sensitivity"
 msgstr ""
 
 #: libexif/exif-tag.c:491
-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."
+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 ""
 
 #: libexif/exif-tag.c:496
@@ -3273,9 +3028,7 @@ msgid "GPS Info IFD Pointer"
 msgstr ""
 
 #: libexif/exif-tag.c:497
-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."
+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 ""
 
 #: libexif/exif-tag.c:503
@@ -3283,9 +3036,7 @@ msgid "ISO Speed Ratings"
 msgstr "ISO 速度評価"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
 msgstr ""
 
 #: libexif/exif-tag.c:507
@@ -3293,10 +3044,7 @@ msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
 msgstr ""
 
 #: libexif/exif-tag.c:513
@@ -3312,9 +3060,7 @@ msgid "Exif Version"
 msgstr "EXIF �ージョン"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
 msgstr ""
 
 #: libexif/exif-tag.c:520
@@ -3322,9 +3068,7 @@ msgid "Date and Time (Original)"
 msgstr "日時 (オリジナル)"
 
 #: libexif/exif-tag.c:521
-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."
+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 ""
 
 #: libexif/exif-tag.c:526
@@ -3340,13 +3084,7 @@ msgid "Components Configuration"
 msgstr "コン�ー�ント設定"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
+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 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."
 msgstr ""
 
 #: libexif/exif-tag.c:541
@@ -3354,9 +3092,7 @@ msgid "Compressed Bits per Pixel"
 msgstr "ピクセル毎�圧縮ビット"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
 msgstr ""
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
@@ -3364,9 +3100,7 @@ msgid "Shutter Speed"
 msgstr "シャッター スピード"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
 msgstr ""
 
 #: libexif/exif-tag.c:551
@@ -3378,9 +3112,7 @@ msgid "Brightness"
 msgstr "ブライト�ス"
 
 #: libexif/exif-tag.c:554
-msgid ""
-"The value of brightness. The unit is the APEX value. Ordinarily it is given "
-"in the range of -99.99 to 99.99."
+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 ""
 
 #: libexif/exif-tag.c:558
@@ -3388,9 +3120,7 @@ msgid "Exposure Bias"
 msgstr "露出�イアス"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
 msgstr ""
 
 #: libexif/exif-tag.c:562
@@ -3398,9 +3128,7 @@ msgid "Maximum Aperture Value"
 msgstr ""
 
 #: libexif/exif-tag.c:563
-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."
+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 ""
 
 #: libexif/exif-tag.c:568
@@ -3424,14 +3152,11 @@ msgid "The kind of light source."
 msgstr ""
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
 #: libexif/exif-tag.c:582
-msgid ""
-"The actual focal length of the lens, in mm. Conversion is not made to the "
-"focal length of a 35 mm film camera."
+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 ""
 
 #: libexif/exif-tag.c:585
@@ -3439,9 +3164,7 @@ msgid "Subject Area"
 msgstr ""
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
+msgid "This tag indicates the location and area of the main subject in the overall scene."
 msgstr ""
 
 #: libexif/exif-tag.c:590
@@ -3453,9 +3176,7 @@ msgid "Maker Note"
 msgstr "メーカー�注釈"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
 msgstr ""
 
 #: libexif/exif-tag.c:595
@@ -3463,25 +3184,7 @@ msgid "User Comment"
 msgstr "ユーザー�コメント"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
 msgstr ""
 
 #: libexif/exif-tag.c:619
@@ -3498,8 +3201,7 @@ msgid "Sub-second Time (Original)"
 msgstr "日時 (オリジナル)"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
 #: libexif/exif-tag.c:629
@@ -3507,8 +3209,7 @@ msgid "Sub-second Time (Digitized)"
 msgstr ""
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
 #: libexif/exif-tag.c:634
@@ -3524,8 +3225,7 @@ msgid "XP Comment"
 msgstr "XP �コメント"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
 #: libexif/exif-tag.c:644
@@ -3533,9 +3233,7 @@ msgid "XP Author"
 msgstr "XP �著者"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
 msgstr ""
 
 #: libexif/exif-tag.c:649
@@ -3543,9 +3241,7 @@ msgid "XP Keywords"
 msgstr "XP �キーワード"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
 msgstr ""
 
 #: libexif/exif-tag.c:654
@@ -3565,12 +3261,7 @@ msgid "Color Space"
 msgstr "色空間"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
 #: libexif/exif-tag.c:670
@@ -3578,11 +3269,7 @@ msgid "Pixel X Dimension"
 msgstr ""
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
 msgstr ""
 
 #: libexif/exif-tag.c:677
@@ -3590,13 +3277,7 @@ msgid "Pixel Y Dimension"
 msgstr ""
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
+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, 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."
 msgstr ""
 
 #: libexif/exif-tag.c:688
@@ -3604,285 +3285,206 @@ msgid "Related Sound File"
 msgstr ""
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
-
-#: libexif/exif-tag.c:719
-msgid "Interoperability IFD Pointer"
+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. Stipulations on audio and file naming conventions are defined in the specification. 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 be recorded in conformance to the Exif audio format. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
 msgstr ""
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
+msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:721
+msgid "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."
+msgstr ""
+
+#: libexif/exif-tag.c:730
 msgid "Flash Energy"
 msgstr "フラッシュ エ�ルギー"
 
-#: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
+#: libexif/exif-tag.c:731
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:735
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
-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."
+#: libexif/exif-tag.c:736
+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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:742
 #, fuzzy
 msgid "Focal Plane X-Resolution"
 msgstr "X 解�度"
 
-#: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
+#: libexif/exif-tag.c:743
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:747
 #, fuzzy
 msgid "Focal Plane Y-Resolution"
 msgstr "X 解�度"
 
-#: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
+#: libexif/exif-tag.c:748
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:752
 msgid "Focal Plane Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+#: libexif/exif-tag.c:753
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:758
 msgid "Subject Location"
 msgstr ""
 
-#: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
+#: libexif/exif-tag.c:759
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:766
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
+#: libexif/exif-tag.c:767
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:770
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:771
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:774 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr ""
 
-#: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
+#: libexif/exif-tag.c:775
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:779
 msgid "Scene Type"
 msgstr "シーン�種類"
 
-#: libexif/exif-tag.c:779
-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."
+#: libexif/exif-tag.c:780
+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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:790
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:790
-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."
+#: libexif/exif-tag.c:791
+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 ""
 
-#: libexif/exif-tag.c:796
-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."
+#: libexif/exif-tag.c:797
+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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:802
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:806
 msgid "Digital Zoom Ratio"
 msgstr "デジタル ズーム率"
 
-#: libexif/exif-tag.c:806
-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."
+#: libexif/exif-tag.c:807
+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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:812
 #, fuzzy
 msgid "Focal Length in 35mm Film"
 msgstr "フォーカス長"
 
-#: libexif/exif-tag.c:812
-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."
+#: libexif/exif-tag.c:813
+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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:819
 msgid "Scene Capture Type"
 msgstr ""
 
-#: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
+#: libexif/exif-tag.c:820
+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 scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:825
 msgid "Gain Control"
 msgstr "ゲイン制御"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:826
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
+#: libexif/exif-tag.c:830
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
+#: libexif/exif-tag.c:834
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
+#: libexif/exif-tag.c:838
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:842
 msgid "Device Setting Description"
 msgstr "デ�イス設定�説明"
 
-#: libexif/exif-tag.c:842
-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."
+#: libexif/exif-tag.c:843
+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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:849
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:850
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:852
 msgid "Image Unique ID"
 msgstr "画��一� ID"
 
-#: libexif/exif-tag.c:852
-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."
+#: libexif/exif-tag.c:853
+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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:858
 msgid "Gamma"
 msgstr "ガンマ"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:859
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:861
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:862
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:864
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
+#: libexif/exif-tag.c:865
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
 msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:62
@@ -4167,447 +3769,447 @@ msgstr "フレーム番�"
 msgid "Invalid format '%s', expected '%s' or '%s'."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:92
+#: libexif/olympus/mnote-olympus-entry.c:89
 msgid "AF non D lens"
 msgstr "AF-D ��� AF-S レンズ"
 
-#: libexif/olympus/mnote-olympus-entry.c:94
+#: libexif/olympus/mnote-olympus-entry.c:91
 msgid "AF-D or AF-S lens"
 msgstr "AF-D ��� AF-S レンズ"
 
-#: libexif/olympus/mnote-olympus-entry.c:95
+#: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF-D G lens"
 msgstr "AF-D G レンズ"
 
-#: libexif/olympus/mnote-olympus-entry.c:96
+#: libexif/olympus/mnote-olympus-entry.c:93
 msgid "AF-D VR lens"
 msgstr "AF-D VR レンズ"
 
-#: libexif/olympus/mnote-olympus-entry.c:97
+#: libexif/olympus/mnote-olympus-entry.c:94
 #, fuzzy
 msgid "AF-D G VR lens"
 msgstr "AF-D VR レンズ"
 
-#: libexif/olympus/mnote-olympus-entry.c:101
+#: libexif/olympus/mnote-olympus-entry.c:98
 msgid "Flash unit unknown"
 msgstr "�明�フラッシュ ユニット"
 
-#: libexif/olympus/mnote-olympus-entry.c:102
+#: libexif/olympus/mnote-olympus-entry.c:99
 msgid "Flash is external"
 msgstr "外部フラッシュ"
 
-#: libexif/olympus/mnote-olympus-entry.c:103
+#: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash is on camera"
 msgstr "カメラ内蔵フラッシュ"
 
-#: libexif/olympus/mnote-olympus-entry.c:106
+#: libexif/olympus/mnote-olympus-entry.c:103
 msgid "VGA basic"
 msgstr "VGA 基本"
 
-#: libexif/olympus/mnote-olympus-entry.c:107
+#: libexif/olympus/mnote-olympus-entry.c:104
 msgid "VGA normal"
 msgstr "VGA 通常"
 
-#: libexif/olympus/mnote-olympus-entry.c:108
+#: libexif/olympus/mnote-olympus-entry.c:105
 msgid "VGA fine"
 msgstr "VGA ファイン"
 
-#: libexif/olympus/mnote-olympus-entry.c:109
+#: libexif/olympus/mnote-olympus-entry.c:106
 msgid "SXGA basic"
 msgstr "SXGA 基本"
 
-#: libexif/olympus/mnote-olympus-entry.c:110
+#: libexif/olympus/mnote-olympus-entry.c:107
 msgid "SXGA normal"
 msgstr "SXGA 通常"
 
-#: libexif/olympus/mnote-olympus-entry.c:111
+#: libexif/olympus/mnote-olympus-entry.c:108
 msgid "SXGA fine"
 msgstr "SXGA ファイン"
 
-#: libexif/olympus/mnote-olympus-entry.c:112
+#: libexif/olympus/mnote-olympus-entry.c:109
 msgid "2 Mpixel basic"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:113
+#: libexif/olympus/mnote-olympus-entry.c:110
 msgid "2 Mpixel normal"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:114
+#: libexif/olympus/mnote-olympus-entry.c:111
 msgid "2 Mpixel fine"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:117
+#: libexif/olympus/mnote-olympus-entry.c:114
 msgid "Color"
 msgstr "色"
 
-#: libexif/olympus/mnote-olympus-entry.c:122
+#: libexif/olympus/mnote-olympus-entry.c:119
 msgid "Bright+"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:123
+#: libexif/olympus/mnote-olympus-entry.c:120
 msgid "Bright-"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:124
+#: libexif/olympus/mnote-olympus-entry.c:121
 msgid "Contrast+"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:125
+#: libexif/olympus/mnote-olympus-entry.c:122
 msgid "Contrast-"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:125
 msgid "ISO 80"
 msgstr "ISO 80"
 
-#: libexif/olympus/mnote-olympus-entry.c:129
+#: libexif/olympus/mnote-olympus-entry.c:126
 msgid "ISO 160"
 msgstr "ISO 160"
 
-#: libexif/olympus/mnote-olympus-entry.c:130
+#: libexif/olympus/mnote-olympus-entry.c:127
 msgid "ISO 320"
 msgstr "ISO 320"
 
-#: libexif/olympus/mnote-olympus-entry.c:131
-#: libexif/olympus/mnote-olympus-entry.c:249
+#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:246
 msgid "ISO 100"
 msgstr "ISO 100"
 
-#: libexif/olympus/mnote-olympus-entry.c:135
+#: libexif/olympus/mnote-olympus-entry.c:132
 msgid "Preset"
 msgstr "プリセット"
 
-#: libexif/olympus/mnote-olympus-entry.c:137
+#: libexif/olympus/mnote-olympus-entry.c:134
 msgid "Incandescence"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:138
+#: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Fluorescence"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:140
+#: libexif/olympus/mnote-olympus-entry.c:137
 msgid "SpeedLight"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:143
+#: libexif/olympus/mnote-olympus-entry.c:140
 #, fuzzy
 msgid "No fisheye"
 msgstr "魚眼��"
 
-#: libexif/olympus/mnote-olympus-entry.c:144
+#: libexif/olympus/mnote-olympus-entry.c:141
 #, fuzzy
 msgid "Fisheye on"
 msgstr "魚眼オン"
 
-#: libexif/olympus/mnote-olympus-entry.c:147
+#: libexif/olympus/mnote-olympus-entry.c:144
 msgid "Normal, SQ"
 msgstr "通常�SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:148
+#: libexif/olympus/mnote-olympus-entry.c:145
 msgid "Normal, HQ"
 msgstr "通常�HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:149
+#: libexif/olympus/mnote-olympus-entry.c:146
 msgid "Normal, SHQ"
 msgstr "通常�SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:150
+#: libexif/olympus/mnote-olympus-entry.c:147
 msgid "Normal, RAW"
 msgstr "通常�RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:151
+#: libexif/olympus/mnote-olympus-entry.c:148
 msgid "Normal, SQ1"
 msgstr "通常�SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:152
+#: libexif/olympus/mnote-olympus-entry.c:149
 msgid "Normal, SQ2"
 msgstr "通常�SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:153
+#: libexif/olympus/mnote-olympus-entry.c:150
 msgid "Normal, super high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:154
+#: libexif/olympus/mnote-olympus-entry.c:151
 msgid "Normal, standard"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:155
+#: libexif/olympus/mnote-olympus-entry.c:152
 msgid "Fine, SQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:156
+#: libexif/olympus/mnote-olympus-entry.c:153
 msgid "Fine, HQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:157
+#: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Fine, SHQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:158
+#: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, RAW"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:159
+#: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, SQ1"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:160
+#: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SQ2"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:161
+#: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, super high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:162
+#: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Super fine, SQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:163
+#: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Super fine, HQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:164
+#: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Super fine, SHQ"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:165
+#: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, RAW"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:166
+#: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, SQ1"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:167
+#: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SQ2"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:168
+#: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, super high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, high"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:172
-#: libexif/olympus/mnote-olympus-entry.c:177
-#: libexif/olympus/mnote-olympus-entry.c:211
-#: libexif/olympus/mnote-olympus-entry.c:220
-#: libexif/olympus/mnote-olympus-entry.c:243
+#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:240
 msgid "No"
 msgstr "���"
 
-#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:180
 msgid "On (Preset)"
 msgstr "オン (プリセット)"
 
-#: libexif/olympus/mnote-olympus-entry.c:188
+#: libexif/olympus/mnote-olympus-entry.c:185
 msgid "Fill"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:192
 msgid "Internal + external"
 msgstr "内部 + 外部"
 
-#: libexif/olympus/mnote-olympus-entry.c:224
+#: libexif/olympus/mnote-olympus-entry.c:221
 msgid "Interlaced"
 msgstr "インターレース"
 
-#: libexif/olympus/mnote-olympus-entry.c:225
+#: libexif/olympus/mnote-olympus-entry.c:222
 msgid "Progressive"
 msgstr "プログレッシブ"
 
-#: libexif/olympus/mnote-olympus-entry.c:231
+#: libexif/olympus/mnote-olympus-entry.c:228
 #: libexif/pentax/mnote-pentax-entry.c:85
 #: libexif/pentax/mnote-pentax-entry.c:139
 msgid "Best"
 msgstr "ベスト"
 
-#: libexif/olympus/mnote-olympus-entry.c:232
+#: libexif/olympus/mnote-olympus-entry.c:229
 msgid "Adjust exposure"
 msgstr "露出調整"
 
-#: libexif/olympus/mnote-olympus-entry.c:235
+#: libexif/olympus/mnote-olympus-entry.c:232
 #, fuzzy
 msgid "Spot focus"
 msgstr "ス�ット フォーカス"
 
-#: libexif/olympus/mnote-olympus-entry.c:236
+#: libexif/olympus/mnote-olympus-entry.c:233
 msgid "Normal focus"
 msgstr "通常フォーカス"
 
-#: libexif/olympus/mnote-olympus-entry.c:239
+#: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Record while down"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:240
+#: libexif/olympus/mnote-olympus-entry.c:237
 msgid "Press start, press stop"
 msgstr "押��開始�押���止"
 
-#: libexif/olympus/mnote-olympus-entry.c:248
+#: libexif/olympus/mnote-olympus-entry.c:245
 msgid "ISO 50"
 msgstr "ISO 50"
 
-#: libexif/olympus/mnote-olympus-entry.c:250
+#: libexif/olympus/mnote-olympus-entry.c:247
 msgid "ISO 200"
 msgstr "ISO 200"
 
-#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 400"
 msgstr "ISO 400"
 
-#: libexif/olympus/mnote-olympus-entry.c:255
+#: libexif/olympus/mnote-olympus-entry.c:252
 #: libexif/pentax/mnote-pentax-entry.c:168
 msgid "Sport"
 msgstr "ス�ーツ"
 
-#: libexif/olympus/mnote-olympus-entry.c:256
+#: libexif/olympus/mnote-olympus-entry.c:253
 msgid "TV"
 msgstr "TV"
 
-#: libexif/olympus/mnote-olympus-entry.c:258
+#: libexif/olympus/mnote-olympus-entry.c:255
 msgid "User 1"
 msgstr "ユーザー 1"
 
-#: libexif/olympus/mnote-olympus-entry.c:259
+#: libexif/olympus/mnote-olympus-entry.c:256
 msgid "User 2"
 msgstr "ユーザー 2"
 
-#: libexif/olympus/mnote-olympus-entry.c:260
+#: libexif/olympus/mnote-olympus-entry.c:257
 msgid "Lamp"
 msgstr "ランプ"
 
-#: libexif/olympus/mnote-olympus-entry.c:263
+#: libexif/olympus/mnote-olympus-entry.c:260
 msgid "5 frames/sec"
 msgstr "5 フレーム/秒"
 
-#: libexif/olympus/mnote-olympus-entry.c:264
+#: libexif/olympus/mnote-olympus-entry.c:261
 msgid "10 frames/sec"
 msgstr "10 フレーム/秒"
 
-#: libexif/olympus/mnote-olympus-entry.c:265
+#: libexif/olympus/mnote-olympus-entry.c:262
 msgid "15 frames/sec"
 msgstr "15 フレーム/秒"
 
-#: libexif/olympus/mnote-olympus-entry.c:266
+#: libexif/olympus/mnote-olympus-entry.c:263
 msgid "20 frames/sec"
 msgstr "20 フレーム/秒"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:375
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
-msgid "No manual focus selection"
-msgstr "手動フォーカス��択��"
-
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:383
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f メーター"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:385
+msgid "No manual focus selection"
+msgstr "手動フォーカス��択��"
+
+#: libexif/olympus/mnote-olympus-entry.c:411
 msgid "AF position: center"
 msgstr "AF �置: 中央"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:412
 msgid "AF position: top"
 msgstr "AF �置: 上"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:413
 msgid "AF position: bottom"
 msgstr "AF �置: 下"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:414
 msgid "AF position: left"
 msgstr "AF �置: 左"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:415
 msgid "AF position: right"
 msgstr "AF �置: �"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:416
 msgid "AF position: upper-left"
 msgstr "AF �置: 左上"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:417
 msgid "AF position: upper-right"
 msgstr "AF �置: �上"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: lower-left"
 msgstr "AF �置: 左下"
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: lower-right"
 msgstr "AF �置: �下"
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:420
 #, fuzzy
 msgid "AF position: far left"
 msgstr "AF �置: 左"
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:421
 #, fuzzy
 msgid "AF position: far right"
 msgstr "AF �置: �"
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "Unknown AF position"
 msgstr "�明� AF �置"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:433
+#: libexif/olympus/mnote-olympus-entry.c:503
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "内部エラー (�明�値 %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:441
+#: libexif/olympus/mnote-olympus-entry.c:511
 #, c-format
 msgid "Unknown value %hi"
 msgstr "�明�値 %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:536
+#: libexif/olympus/mnote-olympus-entry.c:556
 #, c-format
 msgid "Unknown %hu"
 msgstr "�明� %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:553
 msgid "2 sec."
 msgstr "2 秒��。"
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:592
 msgid "Fast"
 msgstr "早�"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:696
 msgid "Automatic"
 msgstr "自動"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:726
 #, c-format
 msgid "Manual: %liK"
 msgstr "マニュアル: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:729
 msgid "Manual: unknown"
 msgstr "マニュアル: �明"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:735
 msgid "One-touch"
 msgstr "ワンタッ�"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:791
+#: libexif/olympus/mnote-olympus-entry.c:801
 msgid "Infinite"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:809
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i �イト��明�データ: "
@@ -4645,10 +4247,6 @@ msgstr "ISO �択"
 msgid "Preview Image IFD"
 msgstr "プレビュー画� IFD"
 
-#: libexif/olympus/mnote-olympus-tag.c:50
-msgid "Offset of the preview image directory (IFD) inside the file."
-msgstr ""
-
 #: libexif/olympus/mnote-olympus-tag.c:51
 msgid "Exposurediff ?"
 msgstr ""
@@ -5452,9 +5050,6 @@ msgstr ""
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr ""
 
-#~ msgid "%.02lf EV"
-#~ msgstr "%.02lf EV"
-
 #~ msgid "Left + Right"
 #~ msgstr "左 + �"
 
diff --git a/po/libexif-12.pot b/po/ms.po
index af7603e..d2ecae2 100644
--- a/po/libexif-12.pot
+++ b/po/ms.po
@@ -1,104 +1,105 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Lutz Mueller and others
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Malay translation for libexif
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the libexif package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
+"PO-Revision-Date: 2016-01-03 04:51+0000\n"
+"Last-Translator: abuyop <Unknown>\n"
+"Language-Team: Malay <ms@li.org>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2016-09-01 20:32+0000\n"
+"X-Generator: Launchpad (build 18179)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
 #: libexif/pentax/mnote-pentax-entry.c:39
 #, c-format
 msgid "Invalid format '%s', expected '%s'."
-msgstr ""
+msgstr "Format '%s' tidak sah, menjangkakan '%s'."
 
 #: libexif/canon/mnote-canon-entry.c:52 libexif/fuji/mnote-fuji-entry.c:47
 #: libexif/olympus/mnote-olympus-entry.c:62
 #: libexif/pentax/mnote-pentax-entry.c:51
 #, c-format
 msgid "Invalid number of components (%i, expected %i)."
-msgstr ""
+msgstr "Bilangan komponen tidak sah (%i, sepatutnya %i)."
 
 #: libexif/canon/mnote-canon-entry.c:61
 #: libexif/olympus/mnote-olympus-entry.c:72
 #: libexif/pentax/mnote-pentax-entry.c:61
 #, c-format
 msgid "Invalid number of components (%i, expected %i or %i)."
-msgstr ""
+msgstr "Bilangan komponen tidak sah (%i, sepatutnya %i atau %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
 #: libexif/pentax/mnote-pentax-entry.c:209
 #: libexif/pentax/mnote-pentax-entry.c:297
 msgid "Macro"
-msgstr ""
+msgstr "Makro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
 #: libexif/pentax/mnote-pentax-entry.c:208
 msgid "Normal"
-msgstr ""
+msgstr "Biasa"
 
 #: libexif/canon/mnote-canon-entry.c:78
 msgid "Economy"
-msgstr ""
+msgstr "Ekonomi"
 
 #: libexif/canon/mnote-canon-entry.c:80
 msgid "Fine"
-msgstr ""
+msgstr "Halus"
 
 #: libexif/canon/mnote-canon-entry.c:81 libexif/fuji/mnote-fuji-entry.c:178
 #: libexif/pentax/mnote-pentax-entry.c:141
 msgid "RAW"
-msgstr ""
+msgstr "RAW"
 
 #: libexif/canon/mnote-canon-entry.c:82
 msgid "Superfine"
-msgstr ""
+msgstr "Sangat-halus"
 
 #: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
-msgstr ""
+msgstr "Dimatikan"
 
 #: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
 #: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
@@ -118,7 +119,7 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:245
 #: libexif/pentax/mnote-pentax-entry.c:290
 msgid "Auto"
-msgstr ""
+msgstr "Oto"
 
 #: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
 #: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
@@ -126,153 +127,151 @@ msgstr ""
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
-msgstr ""
+msgstr "Dihidupkan"
 
 #: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
 #: libexif/olympus/mnote-olympus-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:94
 msgid "Red-eye reduction"
-msgstr ""
+msgstr "Pengurangan mata-merah"
 
 #: libexif/canon/mnote-canon-entry.c:87
 msgid "Slow synchro"
-msgstr ""
+msgstr "Segerak perlahan"
 
 #: libexif/canon/mnote-canon-entry.c:88
 msgid "Auto, red-eye reduction"
-msgstr ""
+msgstr "Oto, Pengurangan mata-merah"
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
-msgstr ""
+msgstr "Aktif, pengurangan mata merah"
 
 #: libexif/canon/mnote-canon-entry.c:90
 msgid "External flash"
-msgstr ""
+msgstr "denyar luaran"
 
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
 #: libexif/canon/mnote-canon-entry.c:297
 msgid "Single"
-msgstr ""
+msgstr "Tunggal"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
 #: libexif/canon/mnote-canon-entry.c:298
 msgid "Continuous"
-msgstr ""
+msgstr "Berterusan"
 
 #: libexif/canon/mnote-canon-entry.c:93
 msgid "Movie"
-msgstr ""
+msgstr "Cereka"
 
 #: libexif/canon/mnote-canon-entry.c:94
 msgid "Continuous, speed priority"
-msgstr ""
+msgstr "Berterusan, keutamaan kelajuan"
 
 #: libexif/canon/mnote-canon-entry.c:95
 msgid "Continuous, low"
-msgstr ""
+msgstr "Berterusan, rendah"
 
 #: libexif/canon/mnote-canon-entry.c:96
 msgid "Continuous, high"
-msgstr ""
+msgstr "Berterusan, tinggi"
 
 #: libexif/canon/mnote-canon-entry.c:97
 msgid "One-shot AF"
-msgstr ""
+msgstr "AF Satu-syot"
 
 #: libexif/canon/mnote-canon-entry.c:98
 msgid "AI servo AF"
-msgstr ""
+msgstr "AI servo AF"
 
 #: libexif/canon/mnote-canon-entry.c:99
 msgid "AI focus AF"
-msgstr ""
+msgstr "AI fokus AF"
 
 #: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103
 msgid "Manual focus"
-msgstr ""
+msgstr "Fokus manual"
 
 #: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:132
 #: libexif/canon/mnote-canon-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:212
 msgid "Pan focus"
-msgstr ""
+msgstr "Fokus pan"
 
 #: libexif/canon/mnote-canon-entry.c:105
 msgid "JPEG"
-msgstr ""
+msgstr "JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:106
 msgid "CRW+THM"
-msgstr ""
+msgstr "CRW+THM"
 
 #: libexif/canon/mnote-canon-entry.c:107
 msgid "AVI+THM"
-msgstr ""
+msgstr "AVI+THM"
 
 #: libexif/canon/mnote-canon-entry.c:108
 msgid "TIF"
-msgstr ""
+msgstr "TIF"
 
 #: libexif/canon/mnote-canon-entry.c:109
 msgid "TIF+JPEG"
-msgstr ""
+msgstr "TIF+JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:110
 msgid "CR2"
-msgstr ""
+msgstr "CR2"
 
 #: libexif/canon/mnote-canon-entry.c:111
 msgid "CR2+JPEG"
-msgstr ""
+msgstr "CR2+JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:112
 msgid "Large"
-msgstr ""
+msgstr "Besar"
 
 #: libexif/canon/mnote-canon-entry.c:113
 msgid "Medium"
-msgstr ""
+msgstr "Sederhana"
 
 #: libexif/canon/mnote-canon-entry.c:114
 msgid "Small"
-msgstr ""
+msgstr "Kecil"
 
 #: libexif/canon/mnote-canon-entry.c:115
 msgid "Medium 1"
-msgstr ""
+msgstr "Sederhana 1"
 
 #: libexif/canon/mnote-canon-entry.c:116
 msgid "Medium 2"
-msgstr ""
+msgstr "Sederhana 2"
 
 #: libexif/canon/mnote-canon-entry.c:117
 msgid "Medium 3"
-msgstr ""
+msgstr "Sederhana 3"
 
 #: libexif/canon/mnote-canon-entry.c:118
 msgid "Postcard"
-msgstr ""
+msgstr "Poskad"
 
 #: libexif/canon/mnote-canon-entry.c:119
 msgid "Widescreen"
-msgstr ""
+msgstr "Skrin Lebar"
 
 #: libexif/canon/mnote-canon-entry.c:120
 msgid "Full auto"
-msgstr ""
+msgstr "Auto penuh"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -281,95 +280,94 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:211
 #: libexif/pentax/mnote-pentax-entry.c:250
 msgid "Manual"
-msgstr ""
+msgstr "Secara Manual"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
-msgstr ""
+msgstr "Landskap"
 
 #: libexif/canon/mnote-canon-entry.c:123
 msgid "Fast shutter"
-msgstr ""
+msgstr "Pengatup pantas"
 
 #: libexif/canon/mnote-canon-entry.c:124
 msgid "Slow shutter"
-msgstr ""
+msgstr "Pengatup perlahan"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
 #: libexif/olympus/mnote-olympus-entry.c:257
 msgid "Night"
-msgstr ""
+msgstr "Malam"
 
 #: libexif/canon/mnote-canon-entry.c:126
 msgid "Grayscale"
-msgstr ""
+msgstr "Skala kelabu"
 
 #: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
 #: libexif/pentax/mnote-pentax-entry.c:128
 msgid "Sepia"
-msgstr ""
+msgstr "Sepia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
 #: libexif/pentax/mnote-pentax-entry.c:300
 msgid "Portrait"
-msgstr ""
+msgstr "Potret"
 
 #: libexif/canon/mnote-canon-entry.c:129 libexif/fuji/mnote-fuji-entry.c:122
 msgid "Sports"
-msgstr ""
+msgstr "Sukan"
 
 #: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
 #: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
 #: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
 msgid "Black & white"
-msgstr ""
+msgstr "Hitam & putih"
 
 #: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
 msgid "Vivid"
-msgstr ""
+msgstr "Terang"
 
 #: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
 #: libexif/canon/mnote-canon-entry.c:434
 msgid "Neutral"
-msgstr ""
+msgstr "Neutral"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
-msgstr ""
+msgstr "Denyar dimatikan"
 
 #: libexif/canon/mnote-canon-entry.c:136
 msgid "Long shutter"
-msgstr ""
+msgstr "Pengatup panjang"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
 #: libexif/olympus/mnote-olympus-entry.c:174
 msgid "Super macro"
-msgstr ""
+msgstr "Makro super"
 
 #: libexif/canon/mnote-canon-entry.c:138
 msgid "Foliage"
-msgstr ""
+msgstr "Dedaun"
 
 #: libexif/canon/mnote-canon-entry.c:139
 msgid "Indoor"
-msgstr ""
+msgstr "Dalam bangunan"
 
 #: libexif/canon/mnote-canon-entry.c:140 libexif/fuji/mnote-fuji-entry.c:135
 #: libexif/pentax/mnote-pentax-entry.c:175
 msgid "Fireworks"
-msgstr ""
+msgstr "Bunga Api"
 
 #: libexif/canon/mnote-canon-entry.c:141 libexif/fuji/mnote-fuji-entry.c:133
 msgid "Beach"
-msgstr ""
+msgstr "Pantai"
 
 #: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
 #: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
@@ -377,1287 +375,1293 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
 msgid "Underwater"
-msgstr ""
+msgstr "Dalam air"
 
 #: libexif/canon/mnote-canon-entry.c:143 libexif/fuji/mnote-fuji-entry.c:134
 msgid "Snow"
-msgstr ""
+msgstr "Salji"
 
 #: libexif/canon/mnote-canon-entry.c:144
 msgid "Kids & pets"
-msgstr ""
+msgstr "Kanak-kanak & haiwan peliharaan"
 
 #: libexif/canon/mnote-canon-entry.c:145
 msgid "Night snapshot"
-msgstr ""
+msgstr "Petikan malam"
 
 #: libexif/canon/mnote-canon-entry.c:146
 msgid "Digital macro"
-msgstr ""
+msgstr "Makro digital"
 
 #: libexif/canon/mnote-canon-entry.c:147
 msgid "My colors"
-msgstr ""
+msgstr "Warna saya"
 
 #: libexif/canon/mnote-canon-entry.c:148
 msgid "Still image"
-msgstr ""
+msgstr "Imej Kaku"
 
 #: libexif/canon/mnote-canon-entry.c:149
 msgid "Color accent"
-msgstr ""
+msgstr "Aksen warna"
 
 #: libexif/canon/mnote-canon-entry.c:150
 msgid "Color swap"
-msgstr ""
+msgstr "Silih warna"
 
 #: libexif/canon/mnote-canon-entry.c:151
 msgid "Aquarium"
-msgstr ""
+msgstr "Akuarium"
 
 #: libexif/canon/mnote-canon-entry.c:152
 msgid "ISO 3200"
-msgstr ""
+msgstr "ISO 3200"
 
 #: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
-msgstr ""
+msgstr "Tiada"
 
 #: libexif/canon/mnote-canon-entry.c:154
 msgid "2x"
-msgstr ""
+msgstr "2x"
 
 #: libexif/canon/mnote-canon-entry.c:155
 msgid "4x"
-msgstr ""
+msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
-msgstr ""
+msgstr "Lain-lain"
 
 #: libexif/canon/mnote-canon-entry.c:158 libexif/canon/mnote-canon-entry.c:161
 #: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:401
 #: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
 #: libexif/pentax/mnote-pentax-entry.c:117
 msgid "High"
-msgstr ""
+msgstr "Tinggi"
 
 #: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
 #: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
 #: libexif/pentax/mnote-pentax-entry.c:111
 #: libexif/pentax/mnote-pentax-entry.c:116
 msgid "Low"
-msgstr ""
+msgstr "Rendah"
 
 #: libexif/canon/mnote-canon-entry.c:166
 msgid "Auto high"
-msgstr ""
+msgstr "Auto tinggi"
 
 #: libexif/canon/mnote-canon-entry.c:168
 msgid "50"
-msgstr ""
+msgstr "50"
 
 #: libexif/canon/mnote-canon-entry.c:169
 #: libexif/pentax/mnote-pentax-entry.c:120
 #: libexif/pentax/mnote-pentax-entry.c:122
 msgid "100"
-msgstr ""
+msgstr "100"
 
 #: libexif/canon/mnote-canon-entry.c:170
 #: libexif/pentax/mnote-pentax-entry.c:121
 #: libexif/pentax/mnote-pentax-entry.c:123
 msgid "200"
-msgstr ""
+msgstr "200"
 
 #: libexif/canon/mnote-canon-entry.c:171
 msgid "400"
-msgstr ""
+msgstr "400"
 
 #: libexif/canon/mnote-canon-entry.c:172
 msgid "800"
-msgstr ""
+msgstr "800"
 
 #: libexif/canon/mnote-canon-entry.c:173
 msgid "Default"
-msgstr ""
+msgstr "Asalan"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
-msgstr ""
+msgstr "Titik"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
-msgstr ""
+msgstr "Purata"
 
 #: libexif/canon/mnote-canon-entry.c:176
 msgid "Evaluative"
-msgstr ""
+msgstr "Penilaian"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
-msgstr ""
+msgstr "Separa"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
-msgstr ""
+msgstr "Purata pemberat-pusat"
 
 #: libexif/canon/mnote-canon-entry.c:181
 msgid "Not known"
-msgstr ""
+msgstr "Tidak diketahui"
 
 #: libexif/canon/mnote-canon-entry.c:183
 msgid "Very close"
-msgstr ""
+msgstr "Sangat dekat"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
-msgstr ""
+msgstr "Tutup"
 
 #: libexif/canon/mnote-canon-entry.c:185
 msgid "Middle range"
-msgstr ""
+msgstr "Julat sederhana"
 
 #: libexif/canon/mnote-canon-entry.c:186
 msgid "Far range"
-msgstr ""
+msgstr "Julat jauh"
 
 #: libexif/canon/mnote-canon-entry.c:189
 #: libexif/pentax/mnote-pentax-entry.c:210
 msgid "Infinity"
-msgstr ""
+msgstr "Infiniti"
 
 #: libexif/canon/mnote-canon-entry.c:190
 msgid "Manual AF point selection"
-msgstr ""
+msgstr "Pemilihan titik AF manual"
 
 #: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
 msgid "None (MF)"
-msgstr ""
+msgstr "Tiada (MF)"
 
 #: libexif/canon/mnote-canon-entry.c:192
 msgid "Auto-selected"
-msgstr ""
+msgstr "Dipilih-sendiri"
 
 #: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:224
 #: libexif/pentax/mnote-pentax-entry.c:238
 msgid "Right"
-msgstr ""
+msgstr "Kanan"
 
 #: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
 msgid "Center"
-msgstr ""
+msgstr "Tengah"
 
 #: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
 #: libexif/pentax/mnote-pentax-entry.c:220
 #: libexif/pentax/mnote-pentax-entry.c:236
 msgid "Left"
-msgstr ""
+msgstr "Kiri"
 
 #: libexif/canon/mnote-canon-entry.c:196
 msgid "Auto AF point selection"
-msgstr ""
+msgstr "Pemilihan titik AF sendiri"
 
 #: libexif/canon/mnote-canon-entry.c:197
 msgid "Easy shooting"
-msgstr ""
+msgstr "Penangkapan mudah"
 
 #: libexif/canon/mnote-canon-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:163
 msgid "Program"
-msgstr ""
+msgstr "Program"
 
 #: libexif/canon/mnote-canon-entry.c:199
 msgid "Tv-priority"
-msgstr ""
+msgstr "Keutamaan-Tv"
 
 #: libexif/canon/mnote-canon-entry.c:200
 msgid "Av-priority"
-msgstr ""
+msgstr "Keutamaan-Av"
 
 #: libexif/canon/mnote-canon-entry.c:202
 msgid "A-DEP"
-msgstr ""
+msgstr "A-DEP"
 
 #: libexif/canon/mnote-canon-entry.c:203
 msgid "M-DEP"
-msgstr ""
+msgstr "M-DEP"
 
 #: libexif/canon/mnote-canon-entry.c:204
 msgid "Canon EF 50mm f/1.8"
-msgstr ""
+msgstr "Canon EF 50mm f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:205
 msgid "Canon EF 28mm f/2.8"
-msgstr ""
+msgstr "Canon EF 28mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:206
 msgid "Sigma UC Zoom 35-135mm f/4-5.6"
-msgstr ""
+msgstr "Sigma UC Zoom 35-135mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:207
 msgid "Tokina AF193-2 19-35mm f/3.5-4.5"
-msgstr ""
+msgstr "Tokina AF193-2 19-35mm f/3.5-4.5"
 
 #: libexif/canon/mnote-canon-entry.c:208
 msgid "Canon EF 100-300mm F5.6L"
-msgstr ""
+msgstr "Canon EF 100-300mm F5.6L"
 
 #: libexif/canon/mnote-canon-entry.c:209
 msgid "Sigma 50mm f/2.8 EX or 28mm f/1.8"
-msgstr ""
+msgstr "Sigma 50mm f/2.8 EX or 28mm f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:210
 msgid "Canon EF 35mm f/2"
-msgstr ""
+msgstr "Canon EF 35mm f/2"
 
 #: libexif/canon/mnote-canon-entry.c:211
 msgid "Canon EF 15mm f/2.8"
-msgstr ""
+msgstr "Canon EF 15mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:212
 msgid "Canon EF 80-200mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 80-200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:213
 msgid "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
-msgstr ""
+msgstr "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
 
 #: libexif/canon/mnote-canon-entry.c:214
 msgid "Cosina 100mm f/3.5 Macro AF"
-msgstr ""
+msgstr "Cosina 100mm f/3.5 Macro AF"
 
 #: libexif/canon/mnote-canon-entry.c:215
 msgid "Tamron AF Aspherical 28-200mm f/3.8-5.6"
-msgstr ""
+msgstr "Tamron AF Aspherical 28-200mm f/3.8-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:216
 msgid "Canon EF 50mm f/1.8 MkII"
-msgstr ""
+msgstr "Canon EF 50mm f/1.8 MkII"
 
 #: libexif/canon/mnote-canon-entry.c:217
 msgid "Tamron SP AF 300mm f/2.8 LD IF"
-msgstr ""
+msgstr "Tamron SP AF 300mm f/2.8 LD IF"
 
 #: libexif/canon/mnote-canon-entry.c:218
 msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
-msgstr ""
+msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 75-300mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:221
 msgid "Canon EF 28-80mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF 28-80mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF 28-105mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 28-105mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
-msgstr ""
+msgstr "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 
 #: libexif/canon/mnote-canon-entry.c:226
 msgid "Canon TS-E 24mm f/3.5L"
-msgstr ""
+msgstr "Canon TS-E 24mm f/3.5L"
 
 #: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon TS-E 45mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 45mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:228
 msgid "Canon TS-E 90mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 90mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 50mm f/1.0L"
-msgstr ""
+msgstr "Canon EF 50mm f/1.0L"
 
 #: libexif/canon/mnote-canon-entry.c:230
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
-msgstr ""
+msgstr "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 
 #: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 600mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 600mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 200mm f/1.8L"
-msgstr ""
+msgstr "Canon EF 200mm f/1.8L"
 
 #: libexif/canon/mnote-canon-entry.c:233
 msgid "Canon EF 300mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 300mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 85mm f/1.2L"
-msgstr ""
+msgstr "Canon EF 85mm f/1.2L"
 
 #: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 400mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 400mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:236
 msgid "Canon EF 500mm f/4.5L"
-msgstr ""
+msgstr "Canon EF 500mm f/4.5L"
 
 #: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 300mm f/2.8L IS"
-msgstr ""
+msgstr "Canon EF 300mm f/2.8L IS"
 
 #: libexif/canon/mnote-canon-entry.c:238
 msgid "Canon EF 500mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 500mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 100mm f/2"
-msgstr ""
+msgstr "Canon EF 100mm f/2"
 
 #: libexif/canon/mnote-canon-entry.c:240
 msgid "Sigma 20mm EX f/1.8"
-msgstr ""
+msgstr "Sigma 20mm EX f/1.8"
 
 #: libexif/canon/mnote-canon-entry.c:241
 msgid "Canon EF 200mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:242
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
-msgstr ""
+msgstr "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 35-350mm f/3.5-5.6L"
-msgstr ""
+msgstr "Canon EF 35-350mm f/3.5-5.6L"
 
 #: libexif/canon/mnote-canon-entry.c:244
 msgid "Canon EF 85mm f/1.8 USM"
-msgstr ""
+msgstr "Canon EF 85mm f/1.8 USM"
 
 #: libexif/canon/mnote-canon-entry.c:245
 msgid "Canon EF 28-105mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 28-105mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:246
 msgid "Canon EF 20-35mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 20-35mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:247
 msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
-msgstr ""
+msgstr "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:248
 msgid "Canon EF 70-200mm f/2.8 L"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L"
 
 #: libexif/canon/mnote-canon-entry.c:249
 msgid "Canon EF 70-200mm f/2.8 L + x1.4"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:250
 msgid "Canon EF 70-200mm f/2.8 L + x2"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 28mm f/1.8 USM"
-msgstr ""
+msgstr "Canon EF 28mm f/1.8 USM"
 
 #: libexif/canon/mnote-canon-entry.c:252
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
-msgstr ""
+msgstr "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
 
 #: libexif/canon/mnote-canon-entry.c:253
 msgid "Canon EF 200mm f/2.8L II"
-msgstr ""
+msgstr "Canon EF 200mm f/2.8L II"
 
 #: libexif/canon/mnote-canon-entry.c:254
 msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
-msgstr ""
+msgstr "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
 
 #: libexif/canon/mnote-canon-entry.c:255
 msgid "Canon EF 135mm f/2L"
-msgstr ""
+msgstr "Canon EF 135mm f/2L"
 
 #: libexif/canon/mnote-canon-entry.c:256
 msgid "Canon EF 24-85mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF 24-85mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:257
 msgid "Canon EF 300mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 300mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:258
 msgid "Canon EF 28-135mm f/3.5-5.6 IS"
-msgstr ""
+msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
 
 #: libexif/canon/mnote-canon-entry.c:259
 msgid "Canon EF 35mm f/1.4L"
-msgstr ""
+msgstr "Canon EF 35mm f/1.4L"
 
 #: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 
 #: libexif/canon/mnote-canon-entry.c:262
 msgid "Canon EF 100-400mm f/4.5-5.6L IS"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
 
 #: libexif/canon/mnote-canon-entry.c:263
 msgid "Canon EF 400mm f/2.8L + x2"
-msgstr ""
+msgstr "Canon EF 400mm f/2.8L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:264
 msgid "Canon EF 70-200mm f/4L"
-msgstr ""
+msgstr "Canon EF 70-200mm f/4L"
 
 #: libexif/canon/mnote-canon-entry.c:265
 msgid "Canon EF 100mm f/2.8 Macro"
-msgstr ""
+msgstr "Canon EF 100mm f/2.8 Macro"
 
 #: libexif/canon/mnote-canon-entry.c:266
 msgid "Canon EF 400mm f/4 DO IS"
-msgstr ""
+msgstr "Canon EF 400mm f/4 DO IS"
 
 #: libexif/canon/mnote-canon-entry.c:267
 msgid "Canon EF 75-300mm f/4-5.6 IS"
-msgstr ""
+msgstr "Canon EF 75-300mm f/4-5.6 IS"
 
 #: libexif/canon/mnote-canon-entry.c:268
 msgid "Canon EF 50mm f/1.4"
-msgstr ""
+msgstr "Canon EF 50mm f/1.4"
 
 #: libexif/canon/mnote-canon-entry.c:269
 msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
-msgstr ""
+msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
 #: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF 28-200mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF 28-200mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 90-300mm f/4.5-5.6"
-msgstr ""
+msgstr "Canon EF 90-300mm f/4.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
 #: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 16-35mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 16-35mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:277
 msgid "Canon EF 24-70mm f/2.8L"
-msgstr ""
+msgstr "Canon EF 24-70mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:278
 msgid "Canon EF 17-40mm f/4L"
-msgstr ""
+msgstr "Canon EF 17-40mm f/4L"
 
 #: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF-S60mm F2.8 Macro USM"
-msgstr ""
+msgstr "Canon EF-S60mm F2.8 Macro USM"
 
 #: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 24-105mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 24-105mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:285
 msgid "Canon EF 50mm F1.2L USM"
-msgstr ""
+msgstr "Canon EF 50mm F1.2L USM"
 
 #: libexif/canon/mnote-canon-entry.c:286
 msgid "Canon EF 70-200mm f/4L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
-msgstr ""
+msgstr "TTL"
 
 #: libexif/canon/mnote-canon-entry.c:290
 msgid "A-TTL"
-msgstr ""
+msgstr "A-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:291
 msgid "E-TTL"
-msgstr ""
+msgstr "E-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:292
 msgid "FP sync enabled"
-msgstr ""
+msgstr "Segerak FP dibenarkan"
 
 #: libexif/canon/mnote-canon-entry.c:293
 msgid "2nd-curtain sync used"
-msgstr ""
+msgstr "Segerak langsir-kedua digunakan"
 
 #: libexif/canon/mnote-canon-entry.c:294
 msgid "FP sync used"
-msgstr ""
+msgstr "Segerak FP digunakan"
 
 #: libexif/canon/mnote-canon-entry.c:295
 #: libexif/olympus/mnote-olympus-entry.c:193
 msgid "Internal"
-msgstr ""
+msgstr "Dalaman"
 
 #: libexif/canon/mnote-canon-entry.c:296
 #: libexif/olympus/mnote-olympus-entry.c:194
 msgid "External"
-msgstr ""
+msgstr "Luaran"
 
 #: libexif/canon/mnote-canon-entry.c:299
 msgid "Normal AE"
-msgstr ""
+msgstr "AE Biasa"
 
 #: libexif/canon/mnote-canon-entry.c:300
 msgid "Exposure compensation"
-msgstr ""
+msgstr "Imbangan dedahan"
 
 #: libexif/canon/mnote-canon-entry.c:301
 msgid "AE lock"
-msgstr ""
+msgstr "Kunci AE"
 
 #: libexif/canon/mnote-canon-entry.c:302
 msgid "AE lock + exposure compensation"
-msgstr ""
+msgstr "Kunci AE + imbangan dedahan"
 
 #: libexif/canon/mnote-canon-entry.c:303
 msgid "No AE"
-msgstr ""
+msgstr "Tiada AE"
 
 #: libexif/canon/mnote-canon-entry.c:306
 msgid "On, shot only"
-msgstr ""
+msgstr "On, syot sahaja"
 
 #: libexif/canon/mnote-canon-entry.c:310
 msgid "Smooth"
-msgstr ""
+msgstr "Lancar"
 
 #: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
 #: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
 #: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
 msgid "Custom"
-msgstr ""
+msgstr "Tersendiri"
 
 #: libexif/canon/mnote-canon-entry.c:314
 msgid "My color data"
-msgstr ""
+msgstr "Data warna saya"
 
 #: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
 #: libexif/pentax/mnote-pentax-entry.c:126
 #: libexif/pentax/mnote-pentax-entry.c:145
 msgid "Full"
-msgstr ""
+msgstr "Penuh"
 
 #: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
 msgid "2/3"
-msgstr ""
+msgstr "2/3"
 
 #: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
 msgid "1/3"
-msgstr ""
+msgstr "1/3"
 
 #: libexif/canon/mnote-canon-entry.c:324
 msgid "Fixed"
-msgstr ""
+msgstr "Tetap"
 
 #: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
 msgid "Zoom"
-msgstr ""
+msgstr "Perbesar"
 
 #: libexif/canon/mnote-canon-entry.c:332
 msgid "Sunny"
-msgstr ""
+msgstr "Cerah"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
-msgstr ""
+msgstr "Mendung"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
-msgstr ""
+msgstr "Tungsten"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
-msgstr ""
+msgstr "Pendarflour"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
-msgstr ""
+msgstr "Denyar"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
-msgstr ""
+msgstr "Lorek"
 
 #: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "Manual temperature (Kelvin)"
-msgstr ""
+msgstr "Suhu Manual (Kelvin)"
 
 #: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
 msgid "PC set 1"
-msgstr ""
+msgstr "PC set 1"
 
 #: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "PC set 2"
-msgstr ""
+msgstr "PC set 2"
 
 #: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "PC set 3"
-msgstr ""
+msgstr "PC set 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
-msgstr ""
+msgstr "Pendaflor Siang"
 
 #: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
 msgid "Custom 1"
-msgstr ""
+msgstr "Tersendiri"
 
 #: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
 msgid "Custom 2"
-msgstr ""
+msgstr "Tersendiri 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
 #: libexif/pentax/mnote-pentax-entry.c:295
 msgid "Night scene"
-msgstr ""
+msgstr "Adegan malam"
 
 #: libexif/canon/mnote-canon-entry.c:355
 msgid "Center-right"
-msgstr ""
+msgstr "Kanan-tengah"
 
 #: libexif/canon/mnote-canon-entry.c:357
 msgid "Left-right"
-msgstr ""
+msgstr "Kanan-kiri"
 
 #: libexif/canon/mnote-canon-entry.c:358
 msgid "Left-center"
-msgstr ""
+msgstr "Tengah-kiri"
 
 #: libexif/canon/mnote-canon-entry.c:359
 msgid "All"
-msgstr ""
+msgstr "Semua"
 
 #: libexif/canon/mnote-canon-entry.c:361
 msgid "On (shot 1)"
-msgstr ""
+msgstr "Hidup (syot 1)"
 
 #: libexif/canon/mnote-canon-entry.c:362
 msgid "On (shot 2)"
-msgstr ""
+msgstr "Hidup (syot 2)"
 
 #: libexif/canon/mnote-canon-entry.c:363
 msgid "On (shot 3)"
-msgstr ""
+msgstr "On (syot 3)"
 
 #: libexif/canon/mnote-canon-entry.c:365
 msgid "EOS high-end"
-msgstr ""
+msgstr "EOS atasan"
 
 #: libexif/canon/mnote-canon-entry.c:366
 msgid "Compact"
-msgstr ""
+msgstr "Padat"
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
-msgstr ""
+msgstr "EOS pertengahan"
 
 #: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotate 90 CW"
-msgstr ""
+msgstr "Putar 90 IJ"
 
 #: libexif/canon/mnote-canon-entry.c:370
 msgid "Rotate 180"
-msgstr ""
+msgstr "Putar 180"
 
 #: libexif/canon/mnote-canon-entry.c:371
 msgid "Rotate 270 CW"
-msgstr ""
+msgstr "Putar 270 IJ"
 
 #: libexif/canon/mnote-canon-entry.c:372
 msgid "Rotated by software"
-msgstr ""
+msgstr "Diputar menggunakan perisian"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
-msgstr ""
+msgstr "Kiri ke kanan"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
-msgstr ""
+msgstr "Kanan ke kiri"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
-msgstr ""
+msgstr "Bawah ke atas"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
-msgstr ""
+msgstr "Atas ke bawah"
 
 #: libexif/canon/mnote-canon-entry.c:388
 msgid "2x2 matrix (clockwise)"
-msgstr ""
+msgstr "matriks 2x2 (arah jam)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
-msgstr ""
+msgstr "Piawai"
 
 #: libexif/canon/mnote-canon-entry.c:397
 msgid "N/A"
-msgstr ""
+msgstr "Tidak tersedia"
 
 #: libexif/canon/mnote-canon-entry.c:398
 msgid "Lowest"
-msgstr ""
+msgstr "Terendah"
 
 #: libexif/canon/mnote-canon-entry.c:402
 msgid "Highest"
-msgstr ""
+msgstr "Tertinggi"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
-msgstr ""
+msgstr "Cahaya Siang"
 
 #: libexif/canon/mnote-canon-entry.c:422
 msgid "Set 1"
-msgstr ""
+msgstr "Set 1"
 
 #: libexif/canon/mnote-canon-entry.c:423
 msgid "Set 2"
-msgstr ""
+msgstr "Set 2"
 
 #: libexif/canon/mnote-canon-entry.c:424
 msgid "Set 3"
-msgstr ""
+msgstr "Set 3"
 
 #: libexif/canon/mnote-canon-entry.c:425
 msgid "User def. 1"
-msgstr ""
+msgstr "Takr. Pengguna 1"
 
 #: libexif/canon/mnote-canon-entry.c:426
 msgid "User def. 2"
-msgstr ""
+msgstr "Takr. Pengguna 2"
 
 #: libexif/canon/mnote-canon-entry.c:427
 msgid "User def. 3"
-msgstr ""
+msgstr "Takr. Pengguna 3"
 
 #: libexif/canon/mnote-canon-entry.c:428
 msgid "External 1"
-msgstr ""
+msgstr "Luaran 1"
 
 #: libexif/canon/mnote-canon-entry.c:429
 msgid "External 2"
-msgstr ""
+msgstr "Luaran 2"
 
 #: libexif/canon/mnote-canon-entry.c:430
 msgid "External 3"
-msgstr ""
+msgstr "Luaran 3"
 
 #: libexif/canon/mnote-canon-entry.c:435
 msgid "Faithful"
-msgstr ""
+msgstr "Kepercayaan"
 
 #: libexif/canon/mnote-canon-entry.c:436
 #: libexif/olympus/mnote-olympus-entry.c:118
 msgid "Monochrome"
-msgstr ""
+msgstr "Monokrom"
 
 #: libexif/canon/mnote-canon-entry.c:494
 msgid ", "
-msgstr ""
+msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
-msgstr ""
+msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
-msgstr ""
+msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
-msgstr ""
+msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
-msgstr ""
+msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
+msgstr "%u mm"
+
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
-msgstr ""
+msgstr "Tetapan (Bahagian Pertama)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
-msgstr ""
+msgstr "Jarak Fokus"
 
 #: libexif/canon/mnote-canon-tag.c:37
 msgid "Settings (Second Part)"
-msgstr ""
+msgstr "Tetapan (Bahagian Kedua)"
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
-msgstr ""
+msgstr "Panorama"
 
 #: libexif/canon/mnote-canon-tag.c:39
 msgid "Image Type"
-msgstr ""
+msgstr "Jenis Imej"
 
 #: libexif/canon/mnote-canon-tag.c:40 libexif/olympus/mnote-olympus-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:113
 msgid "Firmware Version"
-msgstr ""
+msgstr "Versi Perisian Tegar"
 
 #: libexif/canon/mnote-canon-tag.c:41
 msgid "Image Number"
-msgstr ""
+msgstr "Nombor Imej"
 
 #: libexif/canon/mnote-canon-tag.c:42
 msgid "Owner Name"
-msgstr ""
+msgstr "Nama Pemilik"
 
 #: libexif/canon/mnote-canon-tag.c:43
 msgid "Color Information"
-msgstr ""
+msgstr "Maklumat Warna"
 
 #: libexif/canon/mnote-canon-tag.c:44 libexif/fuji/mnote-fuji-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:81
 #: libexif/olympus/mnote-olympus-tag.c:146
 msgid "Serial Number"
-msgstr ""
+msgstr "Nombor Siri"
 
 #: libexif/canon/mnote-canon-tag.c:45
 msgid "Custom Functions"
-msgstr ""
+msgstr "Fungsi Suai"
 
 #: libexif/canon/mnote-canon-tag.c:56 libexif/fuji/mnote-fuji-tag.c:45
 msgid "Macro Mode"
-msgstr ""
+msgstr "Mod Makro"
 
 #: libexif/canon/mnote-canon-tag.c:57 libexif/canon/mnote-canon-tag.c:117
 #: libexif/olympus/mnote-olympus-tag.c:175
 #: libexif/pentax/mnote-pentax-tag.c:128
 msgid "Self-timer"
-msgstr ""
+msgstr "Pemasa-kendiri"
 
 #: libexif/canon/mnote-canon-tag.c:58 libexif/fuji/mnote-fuji-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:94
 #: libexif/olympus/mnote-olympus-tag.c:107
 msgid "Quality"
-msgstr ""
+msgstr "Kualiti"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
-msgstr ""
+msgstr "Mod Denyar"
 
 #: libexif/canon/mnote-canon-tag.c:60 libexif/pentax/mnote-pentax-tag.c:101
 msgid "Drive Mode"
-msgstr ""
+msgstr "Mod Pacu"
 
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
-msgstr ""
+msgstr "Mod Fokus"
 
 #: libexif/canon/mnote-canon-tag.c:62 libexif/pentax/mnote-pentax-tag.c:127
 msgid "Record Mode"
-msgstr ""
+msgstr "Mod Rakaman"
 
 #: libexif/canon/mnote-canon-tag.c:63 libexif/pentax/mnote-pentax-tag.c:71
 msgid "Image Size"
-msgstr ""
+msgstr "Saiz Imej"
 
 #: libexif/canon/mnote-canon-tag.c:64
 msgid "Easy Shooting Mode"
-msgstr ""
+msgstr "Mod Pengambilan Mudah"
 
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
-msgstr ""
+msgstr "Zum Digital"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
-msgstr ""
+msgstr "Beza jelas"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
-msgstr ""
+msgstr "Penepuan"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
-msgstr ""
+msgstr "Kejelasan"
 
 #: libexif/canon/mnote-canon-tag.c:69
 msgid "ISO"
-msgstr ""
+msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
-msgstr ""
+msgstr "Mod Pemeteran"
 
 #: libexif/canon/mnote-canon-tag.c:71 libexif/olympus/mnote-olympus-tag.c:133
 msgid "Focus Range"
-msgstr ""
+msgstr "Julat Fokus"
 
 #: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
 msgid "AF Point"
-msgstr ""
+msgstr "Titik AF"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
-msgstr ""
+msgstr "Mod Dedahan"
 
 #: libexif/canon/mnote-canon-tag.c:74 libexif/olympus/mnote-olympus-tag.c:61
 #: libexif/pentax/mnote-pentax-tag.c:106
 msgid "Lens Type"
-msgstr ""
+msgstr "Jenis Kanta"
 
 #: libexif/canon/mnote-canon-tag.c:75
 msgid "Long Focal Length of Lens"
-msgstr ""
+msgstr "Panjang Fokus Panjang Kanta"
 
 #: libexif/canon/mnote-canon-tag.c:76
 msgid "Short Focal Length of Lens"
-msgstr ""
+msgstr "Panjang Fokus Pendek Kanta"
 
 #: libexif/canon/mnote-canon-tag.c:77
 msgid "Focal Units per mm"
-msgstr ""
+msgstr "Unit Fokus per mm"
 
 #: libexif/canon/mnote-canon-tag.c:78
 msgid "Maximal Aperture"
-msgstr ""
+msgstr "Bukaan Maksimum"
 
 #: libexif/canon/mnote-canon-tag.c:79
 msgid "Minimal Aperture"
-msgstr ""
+msgstr "Bukaan Minimum"
 
 #: libexif/canon/mnote-canon-tag.c:80
 msgid "Flash Activity"
-msgstr ""
+msgstr "Aktiviti Denyar"
 
 #: libexif/canon/mnote-canon-tag.c:81
 msgid "Flash Details"
-msgstr ""
+msgstr "Perincian Denyar"
 
 #: libexif/canon/mnote-canon-tag.c:83
 msgid "AE Setting"
-msgstr ""
+msgstr "Tetapan AE"
 
 #: libexif/canon/mnote-canon-tag.c:84
 msgid "Image Stabilization"
-msgstr ""
+msgstr "Penstabilan Imej"
 
 #: libexif/canon/mnote-canon-tag.c:85
 msgid "Display Aperture"
-msgstr ""
+msgstr "Bukaan Paparan"
 
 #: libexif/canon/mnote-canon-tag.c:86
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Lebar Sumber Zum"
 
 #: libexif/canon/mnote-canon-tag.c:87
 msgid "Zoom Target Width"
-msgstr ""
+msgstr "Lebar Sasaran Zum"
 
 #: libexif/canon/mnote-canon-tag.c:88
 msgid "Photo Effect"
-msgstr ""
+msgstr "Kesan Foto"
 
 #: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
 msgid "Manual Flash Output"
-msgstr ""
+msgstr "Output Denyar Manual"
 
 #: libexif/canon/mnote-canon-tag.c:90
 msgid "Color Tone"
-msgstr ""
+msgstr "Ton Warna"
 
 #: libexif/canon/mnote-canon-tag.c:91
 msgid "Focal Type"
-msgstr ""
+msgstr "Jenis Muka"
 
 #: libexif/canon/mnote-canon-tag.c:93
 msgid "Focal Plane X Size"
-msgstr ""
+msgstr "Saiz Satah Fokus X"
 
 #: libexif/canon/mnote-canon-tag.c:94
 msgid "Focal Plane Y Size"
-msgstr ""
+msgstr "Saiz Satah Fokus Y"
 
 #: libexif/canon/mnote-canon-tag.c:95
 msgid "Auto ISO"
-msgstr ""
+msgstr "ISO Automatik"
 
 #: libexif/canon/mnote-canon-tag.c:96
 msgid "Shot ISO"
-msgstr ""
+msgstr "Shot ISO"
 
 #: libexif/canon/mnote-canon-tag.c:97
 msgid "Measured EV"
-msgstr ""
+msgstr "EV Terukur"
 
 #: libexif/canon/mnote-canon-tag.c:98
 msgid "Target Aperture"
-msgstr ""
+msgstr "Bukaan Sasaran"
 
 #: libexif/canon/mnote-canon-tag.c:99
 msgid "Target Exposure Time"
-msgstr ""
+msgstr "Masa Dedahan Sasaran"
 
 #: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
 #: libexif/pentax/mnote-pentax-tag.c:81
 msgid "Exposure Compensation"
-msgstr ""
+msgstr "Pemampasan Dedahan"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
 msgid "White Balance"
-msgstr ""
+msgstr "Imbangan Putih"
 
 #: libexif/canon/mnote-canon-tag.c:102
 msgid "Slow Shutter"
-msgstr ""
+msgstr "Slow Shutter"
 
 #: libexif/canon/mnote-canon-tag.c:103
 msgid "Sequence Number"
-msgstr ""
+msgstr "Bilangan Jujukan"
 
 #: libexif/canon/mnote-canon-tag.c:104
 msgid "Flash Guide Number"
-msgstr ""
+msgstr "Flash Guide Number"
 
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
 msgid "Flash Exposure Compensation"
-msgstr ""
+msgstr "Flash Exposure Compensation"
 
 #: libexif/canon/mnote-canon-tag.c:107
 msgid "AE Bracketing"
-msgstr ""
+msgstr "Pendakapan AE"
 
 #: libexif/canon/mnote-canon-tag.c:108
 msgid "AE Bracket Value"
-msgstr ""
+msgstr "Nilai Pendakap AE"
 
 #: libexif/canon/mnote-canon-tag.c:109
 msgid "Focus Distance Upper"
-msgstr ""
+msgstr "Jarak Fokus Atas"
 
 #: libexif/canon/mnote-canon-tag.c:110
 msgid "Focus Distance Lower"
-msgstr ""
+msgstr "Jarak Fokus Bawah"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
-msgstr ""
+msgstr "Masa Dedahan"
 
 #: libexif/canon/mnote-canon-tag.c:113
 msgid "Bulb Duration"
-msgstr ""
+msgstr "Jangka Hayat Mentol"
 
 #: libexif/canon/mnote-canon-tag.c:114
 msgid "Camera Type"
-msgstr ""
+msgstr "Jenis Kamera"
 
 #: libexif/canon/mnote-canon-tag.c:115
 msgid "Auto Rotate"
-msgstr ""
+msgstr "Putar Sendiri"
 
 #: libexif/canon/mnote-canon-tag.c:116
 msgid "ND Filter"
-msgstr ""
+msgstr "Penapis ND"
 
 #: libexif/canon/mnote-canon-tag.c:119
 msgid "Panorama Frame"
-msgstr ""
+msgstr "Bingkai Panorama"
 
 #: libexif/canon/mnote-canon-tag.c:120
 msgid "Panorama Direction"
-msgstr ""
+msgstr "Arah Panorama"
 
 #: libexif/canon/mnote-canon-tag.c:121
 msgid "Tone Curve"
-msgstr ""
+msgstr "Lengkuk Tona"
 
 #: libexif/canon/mnote-canon-tag.c:122
 msgid "Sharpness Frequency"
-msgstr ""
+msgstr "Frekuensi Kejelasan"
 
 #: libexif/canon/mnote-canon-tag.c:124
 msgid "Picture Style"
-msgstr ""
+msgstr "Gaya Gambar"
 
 #: libexif/exif-byte-order.c:33
 msgid "Motorola"
-msgstr ""
+msgstr "Motorola"
 
 #: libexif/exif-byte-order.c:35
 msgid "Intel"
-msgstr ""
+msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
-msgstr ""
+msgstr "Saiz data terlalu kecil untuk membenarkan data EXIF."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
-msgstr ""
+msgstr "Penanda EXIF tidak dijumpai"
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
-msgstr ""
+msgstr "Kepala EXIF tidak dijumpai"
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
-msgstr ""
+msgstr "Pengekodan tidak diketahui."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
-msgstr ""
+msgstr "Abai tag yang tidak diketahui"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
-msgstr ""
+msgstr "Abai tag yang tidak diketahui bila memuatkan data EXIF."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
-msgstr ""
+msgstr "Ikut spesifikasi"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 msgstr ""
+"Tambah, betul dan buang masukan untuk dapatkan data EXIF yang mengikuti "
+"spesifikasi."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
-msgstr ""
+msgstr "Jangan ubah nota pembuat"
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1702,691 +1706,688 @@ msgid ""
 "fixed."
 msgstr ""
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
-msgstr ""
+msgstr "%i bait data tidak ditakrif"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
-msgstr ""
+msgstr "%i bait jenis data tidak disokong"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
+msgstr "Tag '%s' mengandungi data berformat tidak sah ('%s', dijangka '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
-msgstr ""
+msgstr "Format berdempak"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
-msgstr ""
+msgstr "Format planar"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
-msgstr ""
+msgstr "Tak Ditakrifkan"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
-msgstr ""
+msgstr "Penderia kawasan warna satu-cip"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
-msgstr ""
+msgstr "Penderia kawasan warna dua-cip"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
-msgstr ""
+msgstr "Penderia kawasan warna tiga-cip"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
-msgstr ""
+msgstr "Penderia kawasan jujukan berwarna"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
-msgstr ""
+msgstr "Penderia trilinear"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
-msgstr ""
+msgstr "Penderia linear jujukan berwarna"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
-msgstr ""
+msgstr "Kiri-atas"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
-msgstr ""
+msgstr "Kanan-atas"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
-msgstr ""
+msgstr "Kanan-bawah"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
-msgstr ""
+msgstr "Kiri-bawah"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
-msgstr ""
+msgstr "Kiri-atas"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
-msgstr ""
+msgstr "Kanan-atas"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
-msgstr ""
+msgstr "Kanan-bawah"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
-msgstr ""
+msgstr "Kiri-bawah"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
-msgstr ""
+msgstr "Ditengahkan"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
-msgstr ""
+msgstr "Laman-bersama"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
-msgstr ""
+msgstr "Mono terbalik"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
-msgstr ""
+msgstr "Mono Normal"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
-msgstr ""
+msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
-msgstr ""
+msgstr "Palet"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
-msgstr ""
+msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
-msgstr ""
+msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
-msgstr ""
+msgstr "Proses biasa"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
-msgstr ""
+msgstr "Proses suai"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
-msgstr ""
+msgstr "Dedahan Oto"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
-msgstr ""
+msgstr "Dedahan Manual"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
-msgstr ""
+msgstr "Pendakap Oto"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
-msgstr ""
+msgstr "Imbangan putih auto"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
-msgstr ""
+msgstr "Imbangan putih manual"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
-msgstr ""
+msgstr "Gandaan rendah naik"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
-msgstr ""
+msgstr "Gandaan tinggi naik"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
-msgstr ""
+msgstr "Gandaan rendah turun"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
-msgstr ""
+msgstr "Gandaan tinggi turun"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
-msgstr ""
+msgstr "Kepekatan rendah"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
-msgstr ""
+msgstr "Kepekatan tinggi"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
-msgstr ""
+msgstr "Lembut"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
 #: libexif/pentax/mnote-pentax-entry.c:107
 msgid "Hard"
-msgstr ""
+msgstr "Keras"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
-msgstr ""
+msgstr "Tidak Diketahui"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
-msgstr ""
+msgstr "Avg"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr ""
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
-msgstr ""
+msgstr "Bintik berbilang"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
-msgstr ""
+msgstr "Corak"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
-msgstr ""
+msgstr "Tidak dimampatkan"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
-msgstr ""
+msgstr "Pemampatan LZW"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
-msgstr ""
+msgstr "Pemampatan JPEG"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
-msgstr ""
+msgstr "Pemampatan Deflate/ZIP"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
-msgstr ""
+msgstr "Pemampatan PackBits"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr ""
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
-msgstr ""
+msgstr "Cuaca baik"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
-msgstr ""
+msgstr "Cuaca mendung"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
-msgstr ""
+msgstr "Pendaflor Putih Menyejuk"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
-msgstr ""
+msgstr "Pendaflor Putih"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
-msgstr ""
+msgstr "Cahaya piawai A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
-msgstr ""
+msgstr "Cahaya piawai B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
-msgstr ""
+msgstr "Cahaya piawai C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
-msgstr ""
+msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
-msgstr ""
+msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
-msgstr ""
+msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
-msgstr ""
+msgstr "ISO studio tungsten"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
-msgstr ""
+msgstr "Inci"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
-msgstr ""
+msgstr "dalam"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
-msgstr ""
+msgstr "Sentimeter"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
-msgstr ""
+msgstr "Program Normal"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
-msgstr ""
+msgstr "Keutamaan bukaan"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
-msgstr ""
+msgstr "Bukaan"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
-msgstr ""
+msgstr "Keutamaan pengatup"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
-msgstr ""
+msgstr "Shutter"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr ""
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
-msgstr ""
+msgstr "Kreatif"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr ""
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
-msgstr ""
+msgstr "Tindakan"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
-msgstr ""
+msgstr "Denyar tidak dinyalakan"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
-msgstr ""
+msgstr "Tanpa denyar"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
-msgstr ""
+msgstr "Denyar dipancarkan"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
 #: libexif/olympus/mnote-olympus-entry.c:244
 msgid "Yes"
-msgstr ""
+msgstr "Ya"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
-msgstr ""
+msgstr "Tanpa strobe"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
-msgstr ""
+msgstr "Dengan strobe"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
-msgstr ""
+msgstr "Denyar tidak dinyalakan, mod auto"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
-msgstr ""
+msgstr "Denyar dinyalakan, mod auto"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
+msgstr "Denyar dinyalakan, mod auto, cahaya kembali tidak dikesan"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
-msgstr ""
+msgstr "Denyar dinyalakan, mod auto, cahaya kembali dikesan"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
-msgstr ""
+msgstr "Tiada fingsi denyar"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
-msgstr ""
+msgstr "Denyar dinyalakan, mod pengurangan mata-merah"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
+"Denyar dinyalakan, mod pengurangan mata-merah, cahaya kembali tidak dikesan"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
+msgstr "Denyar dinyalakan, mod pengurangan mata-merah, cahaya kembali dikesan"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "Denyar tidak dinyalakan, mod auto, mod pengurangan mata-merah"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "Denyar dinyalakan, mod auto, mod pengurangan mata-merah"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
-msgstr ""
+msgstr "Paparan dekat"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
-msgstr ""
+msgstr "Paparan jauh"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
-msgstr ""
+msgstr "Jauh"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
-msgstr ""
+msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
-msgstr ""
+msgstr "RGB Adobe"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
-msgstr ""
+msgstr "Tidak ditentukur"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
-msgstr ""
+msgstr "Rentetan UNIKOD tidak disokong"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
-msgstr ""
+msgstr "Rentetan JIS tidak disokong"
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr ""
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
-msgstr ""
+msgstr "Versi Exif tidak diketahui"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
-msgstr ""
+msgstr "Versi Exif %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
-msgstr ""
+msgstr "FlashPix Versi 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
-msgstr ""
+msgstr "FlashPix Versi 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
-msgstr ""
+msgstr "FlashPix Versi Tidak Diketahui"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr ""
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr ""
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
-msgstr ""
+msgstr "(Editor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
-msgstr ""
+msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
-msgstr ""
+msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr ""
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr ""
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr ""
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
-msgstr ""
+msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr ""
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
-msgstr ""
+msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
-msgstr ""
+msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
-msgstr ""
+msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
-msgstr ""
+msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
-msgstr ""
+msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
-msgstr ""
+msgstr "Simpanan"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
-msgstr ""
+msgstr "Difoto secara langsung"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr ""
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr ""
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr ""
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
-msgstr ""
+msgstr "Aras laut"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
-msgstr ""
+msgstr "Rujukan Aras laut"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr ""
 
 #: libexif/exif-format.c:37
 msgid "Short"
-msgstr ""
+msgstr "Pendek"
 
 #: libexif/exif-format.c:38
 msgid "Rational"
-msgstr ""
+msgstr "Rasional"
 
 #: libexif/exif-format.c:39
 msgid "SRational"
@@ -2398,15 +2399,15 @@ msgstr ""
 
 #: libexif/exif-format.c:41
 msgid "ASCII"
-msgstr ""
+msgstr "ASCII"
 
 #: libexif/exif-format.c:42
 msgid "Long"
-msgstr ""
+msgstr "Panjang"
 
 #: libexif/exif-format.c:43
 msgid "Byte"
-msgstr ""
+msgstr "Bait"
 
 #: libexif/exif-format.c:44
 msgid "SByte"
@@ -2422,7 +2423,7 @@ msgstr ""
 
 #: libexif/exif-format.c:47
 msgid "Float"
-msgstr ""
+msgstr "Float"
 
 #: libexif/exif-format.c:48
 msgid "Double"
@@ -2439,15 +2440,15 @@ msgstr ""
 
 #: libexif/exif-log.c:43
 msgid "Debugging information"
-msgstr ""
+msgstr "Maklumat nyahpijat"
 
 #: libexif/exif-log.c:44
 msgid "Debugging information is available."
-msgstr ""
+msgstr "Maklumat nyahpijat disediakan"
 
 #: libexif/exif-log.c:45
 msgid "Not enough memory"
-msgstr ""
+msgstr "Ingatan tidak mencukupi"
 
 #: libexif/exif-log.c:46
 msgid "The system cannot provide enough memory."
@@ -2461,11 +2462,11 @@ msgstr ""
 msgid "The data provided does not follow the specification."
 msgstr ""
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr ""
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2473,11 +2474,11 @@ msgid ""
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr ""
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2485,25 +2486,25 @@ msgid ""
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr ""
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2512,21 +2513,21 @@ msgid ""
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2535,44 +2536,44 @@ msgid ""
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr ""
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr ""
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2581,101 +2582,101 @@ msgid ""
 "the tag shall be set to NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr ""
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr ""
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr ""
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr ""
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr ""
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr ""
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr ""
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr ""
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2683,22 +2684,22 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 ""
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2708,21 +2709,21 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2732,49 +2733,49 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2782,70 +2783,80 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr ""
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr ""
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr ""
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr ""
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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 ""
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr ""
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr ""
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2853,40 +2864,40 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr ""
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 ""
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr ""
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr ""
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr ""
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr ""
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2894,33 +2905,33 @@ msgid ""
 "is to be used."
 msgstr ""
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr ""
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 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 ""
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr ""
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 ""
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr ""
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2928,30 +2939,30 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr ""
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr ""
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 ""
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr ""
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -2959,74 +2970,74 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr ""
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 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 ""
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr ""
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 ""
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr ""
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3034,21 +3045,21 @@ msgid ""
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr ""
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 msgstr ""
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr ""
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3056,51 +3067,51 @@ msgid ""
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr ""
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr ""
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr ""
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr ""
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3109,11 +3120,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr ""
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3122,21 +3133,21 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr ""
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3151,11 +3162,11 @@ msgid ""
 "both centered and co-sited positioning."
 msgstr ""
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr ""
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3164,34 +3175,34 @@ msgid ""
 "Interoperability these conditions."
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr ""
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr ""
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 ""
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr ""
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr ""
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3210,122 +3221,118 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr ""
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr ""
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr ""
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr ""
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr ""
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr ""
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr ""
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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 ""
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3335,120 +3342,120 @@ msgid ""
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr ""
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr ""
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 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 ""
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr ""
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr ""
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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 ""
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr ""
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr ""
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr ""
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr ""
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr ""
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 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 ""
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr ""
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr ""
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3470,86 +3477,86 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr ""
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr ""
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr ""
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr ""
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3558,11 +3565,11 @@ msgid ""
 "be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3570,11 +3577,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3584,11 +3591,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3613,11 +3620,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3626,62 +3633,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr ""
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr ""
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3690,176 +3697,176 @@ msgid ""
 "number."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr ""
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr ""
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr ""
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr ""
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr ""
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr ""
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr ""
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr ""
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4037,17 +4044,11 @@ msgstr ""
 msgid "Wide2 (400%)"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr ""
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr ""
@@ -4473,117 +4474,117 @@ msgstr ""
 msgid "20 frames/sec"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr ""
@@ -4685,8 +4686,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr ""
 
@@ -4858,13 +4858,11 @@ msgstr ""
 msgid "White Balance Setting"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr ""
 
@@ -5212,10 +5210,20 @@ msgstr ""
 msgid "Digital filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:385
 #, c-format
-msgid "Internal error (unknown value %i %i)"
+msgid "Internal error (unknown value %hi %hi)"
 msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
@@ -5418,3 +5426,6 @@ msgstr ""
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr ""
+
+#~ msgid "FNumber"
+#~ msgstr "Nombor F"
diff --git a/po/nl.gmo b/po/nl.gmo
deleted file mode 100644
index 53001b3..0000000
--- a/po/nl.gmo
+++ /dev/null
diff --git a/po/nl.po b/po/nl.po
index 2a17d51..6f66aa4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif-0.6.20\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2010-12-15 22:14-0800\n"
 "PO-Revision-Date: 2010-12-16 15:50+0100\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
-"Language: nl\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,8 +41,8 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Ongeldig aantal componenten (%i, verwacht %i of %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
-#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:796
+#: libexif/olympus/mnote-olympus-entry.c:196
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
 #: libexif/pentax/mnote-pentax-entry.c:209
@@ -52,14 +52,14 @@ msgstr "Macro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
-#: libexif/olympus/mnote-olympus-entry.c:121
-#: libexif/olympus/mnote-olympus-entry.c:198
-#: libexif/olympus/mnote-olympus-entry.c:206
-#: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:674
+#: libexif/exif-entry.c:677 libexif/exif-entry.c:678 libexif/exif-entry.c:679
+#: libexif/exif-entry.c:745 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:213
+#: libexif/olympus/mnote-olympus-entry.c:586
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -84,33 +84,33 @@ msgstr "RAW"
 msgid "Superfine"
 msgstr "Zeer fijn"
 
-#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
-#: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
-#: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
-#: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:301
+#: libexif/canon/mnote-canon-entry.c:304 libexif/canon/mnote-canon-entry.c:312
+#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:357
+#: libexif/canon/mnote-canon-entry.c:370 libexif/canon/mnote-canon-entry.c:372
+#: libexif/canon/mnote-canon-entry.c:574 libexif/canon/mnote-canon-entry.c:671
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
-#: libexif/olympus/mnote-olympus-entry.c:181
-#: libexif/olympus/mnote-olympus-entry.c:189
-#: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:178
+#: libexif/olympus/mnote-olympus-entry.c:186
+#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:530
+#: libexif/olympus/mnote-olympus-entry.c:547
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
 msgstr "Uitgeschakeld"
 
 #: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
-#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
-#: libexif/canon/mnote-canon-entry.c:403 libexif/fuji/mnote-fuji-entry.c:73
+#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:328
+#: libexif/canon/mnote-canon-entry.c:400 libexif/fuji/mnote-fuji-entry.c:73
 #: libexif/fuji/mnote-fuji-entry.c:101 libexif/fuji/mnote-fuji-entry.c:111
 #: libexif/fuji/mnote-fuji-entry.c:119
-#: libexif/olympus/mnote-olympus-entry.c:134
-#: libexif/olympus/mnote-olympus-entry.c:186
-#: libexif/olympus/mnote-olympus-entry.c:202
-#: libexif/olympus/mnote-olympus-entry.c:247
+#: libexif/olympus/mnote-olympus-entry.c:131
+#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/olympus/mnote-olympus-entry.c:244
 #: libexif/pentax/mnote-pentax-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:88
 #: libexif/pentax/mnote-pentax-entry.c:91
@@ -122,21 +122,21 @@ msgstr "Uitgeschakeld"
 msgid "Auto"
 msgstr "Automatisch"
 
-#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
-#: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
-#: libexif/canon/mnote-canon-entry.c:374 libexif/fuji/mnote-fuji-entry.c:102
+#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:302
+#: libexif/canon/mnote-canon-entry.c:347 libexif/canon/mnote-canon-entry.c:361
+#: libexif/canon/mnote-canon-entry.c:371 libexif/fuji/mnote-fuji-entry.c:102
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
-#: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:179
+#: libexif/olympus/mnote-olympus-entry.c:533
+#: libexif/olympus/mnote-olympus-entry.c:550
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
 msgstr "Ingeschakeld"
 
 #: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
-#: libexif/olympus/mnote-olympus-entry.c:187
+#: libexif/olympus/mnote-olympus-entry.c:184
 #: libexif/pentax/mnote-pentax-entry.c:94
 msgid "Red-eye reduction"
 msgstr "Rode-ogenreductie"
@@ -159,12 +159,12 @@ msgid "External flash"
 msgstr "Externe flitser"
 
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
-#: libexif/canon/mnote-canon-entry.c:297
+#: libexif/canon/mnote-canon-entry.c:294
 msgid "Single"
 msgstr "Enkel"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
-#: libexif/canon/mnote-canon-entry.c:298
+#: libexif/canon/mnote-canon-entry.c:295
 msgid "Continuous"
 msgstr "Continu"
 
@@ -252,7 +252,7 @@ msgstr "Middel 1"
 
 #: libexif/canon/mnote-canon-entry.c:116
 msgid "Medium 2"
-msgstr "Middel 2 "
+msgstr "Middel 2"
 
 #: libexif/canon/mnote-canon-entry.c:117
 msgid "Medium 3"
@@ -271,11 +271,11 @@ msgid "Full auto"
 msgstr "Volledig automatisch"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
-#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
+#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:285
+#: libexif/canon/mnote-canon-entry.c:392 libexif/exif-entry.c:744
 #: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
-#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:90
+#: libexif/olympus/mnote-olympus-entry.c:200
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
 #: libexif/pentax/mnote-pentax-entry.c:133
@@ -285,8 +285,8 @@ msgstr "Volledig automatisch"
 msgid "Manual"
 msgstr "Handmatig"
 
-#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:430
+#: libexif/exif-entry.c:671 libexif/exif-entry.c:755
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -301,7 +301,7 @@ msgid "Slow shutter"
 msgstr "Langzame sluitertijd"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
-#: libexif/olympus/mnote-olympus-entry.c:257
+#: libexif/olympus/mnote-olympus-entry.c:254
 msgid "Night"
 msgstr "Nacht"
 
@@ -309,13 +309,13 @@ msgstr "Nacht"
 msgid "Grayscale"
 msgstr "Grijsschaal"
 
-#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
+#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:308
 #: libexif/pentax/mnote-pentax-entry.c:128
 msgid "Sepia"
 msgstr "Sepia"
 
-#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:429
+#: libexif/exif-entry.c:671 libexif/exif-entry.c:753
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -327,18 +327,18 @@ msgstr "Portret"
 msgid "Sports"
 msgstr "Sport"
 
-#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
-#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
+#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:309
+#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
 #: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
 msgid "Black & white"
 msgstr "Zwart-wit"
 
-#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
+#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:305
 msgid "Vivid"
 msgstr "Levendig"
 
-#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
-#: libexif/canon/mnote-canon-entry.c:434
+#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:306
+#: libexif/canon/mnote-canon-entry.c:431
 msgid "Neutral"
 msgstr "Neutraal"
 
@@ -352,7 +352,7 @@ msgid "Long shutter"
 msgstr "Lange sluitertijd"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
-#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:171
 msgid "Super macro"
 msgstr "Supermacro"
 
@@ -373,8 +373,8 @@ msgstr "Vuurwerk"
 msgid "Beach"
 msgstr "Strand"
 
-#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
-#: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:344
+#: libexif/canon/mnote-canon-entry.c:416 libexif/fuji/mnote-fuji-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
@@ -421,11 +421,11 @@ msgstr "Aquarium"
 msgid "ISO 3200"
 msgstr "ISO 3200"
 
-#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
-#: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
-#: libexif/olympus/mnote-olympus-entry.c:192
-#: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:348
+#: libexif/canon/mnote-canon-entry.c:365 libexif/canon/mnote-canon-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:189
+#: libexif/olympus/mnote-olympus-entry.c:226
+#: libexif/olympus/mnote-olympus-entry.c:451
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Geen"
@@ -438,20 +438,20 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:702
+#: libexif/exif-entry.c:732
 msgid "Other"
 msgstr "Overige"
 
 #: libexif/canon/mnote-canon-entry.c:158 libexif/canon/mnote-canon-entry.c:161
-#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:401
+#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:398
 #: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
 #: libexif/pentax/mnote-pentax-entry.c:117
 msgid "High"
 msgstr "Hoog"
 
 #: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
-#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
+#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:396
 #: libexif/pentax/mnote-pentax-entry.c:111
 #: libexif/pentax/mnote-pentax-entry.c:116
 msgid "Low"
@@ -489,11 +489,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Standaard"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:698
 msgid "Spot"
 msgstr "Punt"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:696
 msgid "Average"
 msgstr "Gemiddelde"
 
@@ -501,11 +501,11 @@ msgstr "Gemiddelde"
 msgid "Evaluative"
 msgstr "Met beoordeling"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:701
 msgid "Partial"
 msgstr "Gedeeltelijk"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:697
 msgid "Center-weighted average"
 msgstr "Middelpunt-gewogen gemiddelde"
 
@@ -517,7 +517,7 @@ msgstr "Onbekend"
 msgid "Very close"
 msgstr "Zeer dichtbij"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:797
 msgid "Close"
 msgstr "Dichtbij"
 
@@ -538,7 +538,7 @@ msgstr "Oneindig"
 msgid "Manual AF point selection"
 msgstr "Handmatige keuze AF-punt"
 
-#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
+#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:349
 msgid "None (MF)"
 msgstr "Geen (MF)"
 
@@ -546,19 +546,19 @@ msgstr "Geen (MF)"
 msgid "Auto-selected"
 msgstr "Auto-keuze"
 
-#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
+#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:224
 #: libexif/pentax/mnote-pentax-entry.c:238
 msgid "Right"
 msgstr "Rechts"
 
-#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
+#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:351
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
 msgid "Center"
 msgstr "Midden"
 
-#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
+#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:220
 #: libexif/pentax/mnote-pentax-entry.c:236
 msgid "Left"
@@ -654,444 +654,429 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
-msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
-
-#: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
 msgstr "Canon EF 75-300mm f/4-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:221
+#: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 28-80mm f/3.5-5.6"
 msgstr "Canon EF 28-80mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:222
+#: libexif/canon/mnote-canon-entry.c:221
 msgid "Canon EF 28-105mm f/4-5.6"
 msgstr "Canon EF 28-105mm f/4-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:223
+#: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
-msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
-
-#: libexif/canon/mnote-canon-entry.c:225
+#: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 msgstr "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
 
-#: libexif/canon/mnote-canon-entry.c:226
+#: libexif/canon/mnote-canon-entry.c:224
 msgid "Canon TS-E 24mm f/3.5L"
 msgstr "Canon TS-E 24mm f/3.5L"
 
-#: libexif/canon/mnote-canon-entry.c:227
+#: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon TS-E 45mm f/2.8"
 msgstr "Canon TS-E 45mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:228
+#: libexif/canon/mnote-canon-entry.c:226
 msgid "Canon TS-E 90mm f/2.8"
 msgstr "Canon TS-E 90mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:229
+#: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon EF 50mm f/1.0L"
 msgstr "Canon EF 50mm f/1.0L"
 
-#: libexif/canon/mnote-canon-entry.c:230
+#: libexif/canon/mnote-canon-entry.c:228
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 msgstr "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 
-#: libexif/canon/mnote-canon-entry.c:231
+#: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 600mm f/4L IS"
 msgstr "Canon EF 600mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:232
+#: libexif/canon/mnote-canon-entry.c:230
 msgid "Canon EF 200mm f/1.8L"
 msgstr "Canon EF 200mm f/1.8L"
 
-#: libexif/canon/mnote-canon-entry.c:233
+#: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 300mm f/2.8L"
 msgstr "Canon EF 300mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:234
+#: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 85mm f/1.2L"
 msgstr "Canon EF 85mm f/1.2L"
 
-#: libexif/canon/mnote-canon-entry.c:235
+#: libexif/canon/mnote-canon-entry.c:233
 msgid "Canon EF 400mm f/2.8L"
 msgstr "Canon EF 400mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:236
+#: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 500mm f/4.5L"
 msgstr "Canon EF 500mm f/4.5L"
 
-#: libexif/canon/mnote-canon-entry.c:237
+#: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 300mm f/2.8L IS"
 msgstr "Canon EF 300mm f/2.8L IS"
 
-#: libexif/canon/mnote-canon-entry.c:238
+#: libexif/canon/mnote-canon-entry.c:236
 msgid "Canon EF 500mm f/4L IS"
 msgstr "Canon EF 500mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:239
+#: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 100mm f/2"
 msgstr "Canon EF 100mm f/2"
 
-#: libexif/canon/mnote-canon-entry.c:240
+#: libexif/canon/mnote-canon-entry.c:238
 msgid "Sigma 20mm EX f/1.8"
 msgstr "Sigma 20mm EX f/1.8"
 
-#: libexif/canon/mnote-canon-entry.c:241
+#: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 200mm f/2.8L"
 msgstr "Canon EF 200mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:242
+#: libexif/canon/mnote-canon-entry.c:240
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
 msgstr "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:243
+#: libexif/canon/mnote-canon-entry.c:241
 msgid "Canon EF 35-350mm f/3.5-5.6L"
 msgstr "Canon EF 35-350mm f/3.5-5.6L"
 
-#: libexif/canon/mnote-canon-entry.c:244
+#: libexif/canon/mnote-canon-entry.c:242
 msgid "Canon EF 85mm f/1.8 USM"
 msgstr "Canon EF 85mm f/1.8 USM"
 
-#: libexif/canon/mnote-canon-entry.c:245
+#: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 28-105mm f/3.5-4.5 USM"
 msgstr "Canon EF 28-105mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:246
+#: libexif/canon/mnote-canon-entry.c:244
 msgid "Canon EF 20-35mm f/3.5-4.5 USM"
 msgstr "Canon EF 20-35mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:247
+#: libexif/canon/mnote-canon-entry.c:245
 msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
 msgstr "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
 
-#: libexif/canon/mnote-canon-entry.c:248
+#: libexif/canon/mnote-canon-entry.c:246
 msgid "Canon EF 70-200mm f/2.8 L"
 msgstr "Canon EF 70-200mm f/2.8 L"
 
-#: libexif/canon/mnote-canon-entry.c:249
+#: libexif/canon/mnote-canon-entry.c:247
 msgid "Canon EF 70-200mm f/2.8 L + x1.4"
 msgstr "Canon EF 70-200mm f/2.8 L + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:250
+#: libexif/canon/mnote-canon-entry.c:248
 msgid "Canon EF 70-200mm f/2.8 L + x2"
 msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
-#: libexif/canon/mnote-canon-entry.c:251
+#: libexif/canon/mnote-canon-entry.c:249
 msgid "Canon EF 28mm f/1.8 USM"
 msgstr "Canon EF 28mm f/1.8 USM"
 
-#: libexif/canon/mnote-canon-entry.c:252
+#: libexif/canon/mnote-canon-entry.c:250
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
 msgstr "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
 
-#: libexif/canon/mnote-canon-entry.c:253
+#: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 200mm f/2.8L II"
 msgstr "Canon EF 200mm f/2.8L II"
 
-#: libexif/canon/mnote-canon-entry.c:254
+#: libexif/canon/mnote-canon-entry.c:252
 msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
 msgstr "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
 
-#: libexif/canon/mnote-canon-entry.c:255
+#: libexif/canon/mnote-canon-entry.c:253
 msgid "Canon EF 135mm f/2L"
 msgstr "Canon EF 135mm f/2L"
 
-#: libexif/canon/mnote-canon-entry.c:256
+#: libexif/canon/mnote-canon-entry.c:254
 msgid "Canon EF 24-85mm f/3.5-4.5 USM"
 msgstr "Canon EF 24-85mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:257
+#: libexif/canon/mnote-canon-entry.c:255
 msgid "Canon EF 300mm f/4L IS"
 msgstr "Canon EF 300mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:258
+#: libexif/canon/mnote-canon-entry.c:256
 msgid "Canon EF 28-135mm f/3.5-5.6 IS"
 msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
 
-#: libexif/canon/mnote-canon-entry.c:259
+#: libexif/canon/mnote-canon-entry.c:257
 msgid "Canon EF 35mm f/1.4L"
 msgstr "Canon EF 35mm f/1.4L"
 
-#: libexif/canon/mnote-canon-entry.c:260
+#: libexif/canon/mnote-canon-entry.c:258
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:261
+#: libexif/canon/mnote-canon-entry.c:259
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x2"
 
-#: libexif/canon/mnote-canon-entry.c:262
+#: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS"
 msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
 
-#: libexif/canon/mnote-canon-entry.c:263
+#: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 400mm f/2.8L + x2"
 msgstr "Canon EF 400mm f/2.8L + x2"
 
-#: libexif/canon/mnote-canon-entry.c:264
+#: libexif/canon/mnote-canon-entry.c:262
 msgid "Canon EF 70-200mm f/4L"
 msgstr "Canon EF 70-200mm f/4L"
 
-#: libexif/canon/mnote-canon-entry.c:265
+#: libexif/canon/mnote-canon-entry.c:263
 msgid "Canon EF 100mm f/2.8 Macro"
 msgstr "Canon EF 100mm f/2.8 Macro"
 
-#: libexif/canon/mnote-canon-entry.c:266
+#: libexif/canon/mnote-canon-entry.c:264
 msgid "Canon EF 400mm f/4 DO IS"
 msgstr "Canon EF 400mm f/4 DO IS"
 
-#: libexif/canon/mnote-canon-entry.c:267
+#: libexif/canon/mnote-canon-entry.c:265
 msgid "Canon EF 75-300mm f/4-5.6 IS"
 msgstr "Canon EF 75-300mm f/4-5.6 IS"
 
-#: libexif/canon/mnote-canon-entry.c:268
+#: libexif/canon/mnote-canon-entry.c:266
 msgid "Canon EF 50mm f/1.4"
 msgstr "Canon EF 50mm f/1.4"
 
-#: libexif/canon/mnote-canon-entry.c:269
+#: libexif/canon/mnote-canon-entry.c:267
 msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
 msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
-#: libexif/canon/mnote-canon-entry.c:270
+#: libexif/canon/mnote-canon-entry.c:268
 msgid "Canon EF 28-200mm f/3.5-5.6"
 msgstr "Canon EF 28-200mm f/3.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:271
+#: libexif/canon/mnote-canon-entry.c:269
 msgid "Canon EF 90-300mm f/4.5-5.6"
 msgstr "Canon EF 90-300mm f/4.5-5.6"
 
-#: libexif/canon/mnote-canon-entry.c:272
+#: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
 msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:273
+#: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 70-200mm f/2.8L IS USM"
 msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:274
+#: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
-#: libexif/canon/mnote-canon-entry.c:275
+#: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
 msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
-#: libexif/canon/mnote-canon-entry.c:276
+#: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 16-35mm f/2.8L"
 msgstr "Canon EF 16-35mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:277
+#: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 24-70mm f/2.8L"
 msgstr "Canon EF 24-70mm f/2.8L"
 
-#: libexif/canon/mnote-canon-entry.c:278
+#: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 17-40mm f/4L"
 msgstr "Canon EF 17-40mm f/4L"
 
-#: libexif/canon/mnote-canon-entry.c:279
+#: libexif/canon/mnote-canon-entry.c:277
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:280
+#: libexif/canon/mnote-canon-entry.c:278
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
 msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:281
+#: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
 msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
-#: libexif/canon/mnote-canon-entry.c:282
+#: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S60mm F2.8 Macro USM"
 msgstr "Canon EF-S60mm F2.8 Macro USM"
 
-#: libexif/canon/mnote-canon-entry.c:283
+#: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF 24-105mm f/4L IS"
 msgstr "Canon EF 24-105mm f/4L IS"
 
-#: libexif/canon/mnote-canon-entry.c:284
+#: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
 msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:285
+#: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 50mm F1.2L USM"
 msgstr "Canon EF 50mm F1.2L USM"
 
-#: libexif/canon/mnote-canon-entry.c:286
+#: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
-#: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
-msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
-
-#: libexif/canon/mnote-canon-entry.c:289
+#: libexif/canon/mnote-canon-entry.c:286
 msgid "TTL"
 msgstr "TTL"
 
-#: libexif/canon/mnote-canon-entry.c:290
+#: libexif/canon/mnote-canon-entry.c:287
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: libexif/canon/mnote-canon-entry.c:291
+#: libexif/canon/mnote-canon-entry.c:288
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/canon/mnote-canon-entry.c:289
 msgid "FP sync enabled"
 msgstr "FP-synchronisatie ingesteld"
 
-#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/canon/mnote-canon-entry.c:290
 msgid "2nd-curtain sync used"
 msgstr "2de gordijn synchronisatie gebruikt"
 
-#: libexif/canon/mnote-canon-entry.c:294
+#: libexif/canon/mnote-canon-entry.c:291
 msgid "FP sync used"
 msgstr "FP-synchronisatie gebruikt"
 
-#: libexif/canon/mnote-canon-entry.c:295
-#: libexif/olympus/mnote-olympus-entry.c:193
+#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/olympus/mnote-olympus-entry.c:190
 msgid "Internal"
 msgstr "Intern"
 
-#: libexif/canon/mnote-canon-entry.c:296
-#: libexif/olympus/mnote-olympus-entry.c:194
+#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/olympus/mnote-olympus-entry.c:191
 msgid "External"
 msgstr "Extern"
 
-#: libexif/canon/mnote-canon-entry.c:299
+#: libexif/canon/mnote-canon-entry.c:296
 msgid "Normal AE"
 msgstr "Normale AE"
 
-#: libexif/canon/mnote-canon-entry.c:300
+#: libexif/canon/mnote-canon-entry.c:297
 msgid "Exposure compensation"
 msgstr "Belichtingscompensatie"
 
-#: libexif/canon/mnote-canon-entry.c:301
+#: libexif/canon/mnote-canon-entry.c:298
 msgid "AE lock"
 msgstr "AE-blokkering"
 
-#: libexif/canon/mnote-canon-entry.c:302
+#: libexif/canon/mnote-canon-entry.c:299
 msgid "AE lock + exposure compensation"
 msgstr "AE-blokkering + belichtingscompensatie"
 
-#: libexif/canon/mnote-canon-entry.c:303
+#: libexif/canon/mnote-canon-entry.c:300
 msgid "No AE"
 msgstr "Geen AE"
 
-#: libexif/canon/mnote-canon-entry.c:306
+#: libexif/canon/mnote-canon-entry.c:303
 msgid "On, shot only"
 msgstr "Ingeschakeld, alleen opname"
 
-#: libexif/canon/mnote-canon-entry.c:310
+#: libexif/canon/mnote-canon-entry.c:307
 msgid "Smooth"
 msgstr "Geleidelijk"
 
-#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
-#: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
+#: libexif/canon/mnote-canon-entry.c:310 libexif/canon/mnote-canon-entry.c:334
+#: libexif/canon/mnote-canon-entry.c:393 libexif/canon/mnote-canon-entry.c:406
 #: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
 msgid "Custom"
 msgstr "Aangepast"
 
-#: libexif/canon/mnote-canon-entry.c:314
+#: libexif/canon/mnote-canon-entry.c:311
 msgid "My color data"
 msgstr "Mijn kleurgegevens"
 
-#: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
+#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:375
 #: libexif/pentax/mnote-pentax-entry.c:126
 #: libexif/pentax/mnote-pentax-entry.c:145
 msgid "Full"
 msgstr "Volledig"
 
-#: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
+#: libexif/canon/mnote-canon-entry.c:314 libexif/canon/mnote-canon-entry.c:374
 msgid "2/3"
 msgstr "2/3"
 
-#: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
+#: libexif/canon/mnote-canon-entry.c:315 libexif/canon/mnote-canon-entry.c:373
 msgid "1/3"
 msgstr "1/3"
 
-#: libexif/canon/mnote-canon-entry.c:324
+#: libexif/canon/mnote-canon-entry.c:321
 msgid "Fixed"
 msgstr "Vast"
 
-#: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
+#: libexif/canon/mnote-canon-entry.c:322 libexif/pentax/mnote-pentax-tag.c:44
 msgid "Zoom"
 msgstr "Zoom"
 
-#: libexif/canon/mnote-canon-entry.c:332
+#: libexif/canon/mnote-canon-entry.c:329
 msgid "Sunny"
 msgstr "Zonnig"
 
-#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
-#: libexif/olympus/mnote-olympus-entry.c:139
+#: libexif/canon/mnote-canon-entry.c:330 libexif/canon/mnote-canon-entry.c:402
+#: libexif/exif-entry.c:719 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Bewolkt"
 
-#: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/canon/mnote-canon-entry.c:331 libexif/canon/mnote-canon-entry.c:403
+#: libexif/exif-entry.c:716 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Wolfram"
 
-#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/canon/mnote-canon-entry.c:332 libexif/canon/mnote-canon-entry.c:404
+#: libexif/exif-entry.c:715 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "TL-licht"
 
-#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
+#: libexif/exif-entry.c:717 libexif/exif-entry.c:759 libexif/exif-tag.c:577
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Flits"
 
-#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
+#: libexif/exif-entry.c:720 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Schaduw"
 
-#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
+#: libexif/canon/mnote-canon-entry.c:337 libexif/canon/mnote-canon-entry.c:409
 msgid "Manual temperature (Kelvin)"
 msgstr "Handmatige temperatuur (Kelvin)"
 
-#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
 msgid "PC set 1"
 msgstr "PC set 1"
 
-#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
+#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
 msgid "PC set 2"
 msgstr "PC set 2"
 
-#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
+#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "PC set 3"
 msgstr "PC set 3"
 
-#: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+#: libexif/exif-entry.c:721 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Daglicht TL"
 
-#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
+#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "Custom 1"
 msgstr "Aangepast 1"
 
-#: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
+#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "Custom 2"
 msgstr "Aangepast 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:346 libexif/exif-entry.c:672
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1099,184 +1084,184 @@ msgstr "Aangepast 2"
 msgid "Night scene"
 msgstr "Nachtscène"
 
-#: libexif/canon/mnote-canon-entry.c:355
+#: libexif/canon/mnote-canon-entry.c:352
 msgid "Center-right"
 msgstr "Centraalgewogen"
 
-#: libexif/canon/mnote-canon-entry.c:357
+#: libexif/canon/mnote-canon-entry.c:354
 msgid "Left-right"
 msgstr "Links naar rechts"
 
-#: libexif/canon/mnote-canon-entry.c:358
+#: libexif/canon/mnote-canon-entry.c:355
 msgid "Left-center"
 msgstr "Links + Midden"
 
-#: libexif/canon/mnote-canon-entry.c:359
+#: libexif/canon/mnote-canon-entry.c:356
 msgid "All"
 msgstr "Alles"
 
-#: libexif/canon/mnote-canon-entry.c:361
+#: libexif/canon/mnote-canon-entry.c:358
 msgid "On (shot 1)"
 msgstr "Ingeschakeld (foto 1)"
 
-#: libexif/canon/mnote-canon-entry.c:362
+#: libexif/canon/mnote-canon-entry.c:359
 msgid "On (shot 2)"
 msgstr "Ingeschakeld (foto 2)"
 
-#: libexif/canon/mnote-canon-entry.c:363
+#: libexif/canon/mnote-canon-entry.c:360
 msgid "On (shot 3)"
 msgstr "Ingeschakeld (foto 3)"
 
-#: libexif/canon/mnote-canon-entry.c:365
+#: libexif/canon/mnote-canon-entry.c:362
 msgid "EOS high-end"
 msgstr "EOS high-end"
 
-#: libexif/canon/mnote-canon-entry.c:366
+#: libexif/canon/mnote-canon-entry.c:363
 msgid "Compact"
 msgstr "Compact"
 
-#: libexif/canon/mnote-canon-entry.c:367
+#: libexif/canon/mnote-canon-entry.c:364
 msgid "EOS mid-range"
 msgstr "EOS middengebied"
 
-#: libexif/canon/mnote-canon-entry.c:369
+#: libexif/canon/mnote-canon-entry.c:366
 msgid "Rotate 90 CW"
 msgstr "Draai 90 rechtsom"
 
-#: libexif/canon/mnote-canon-entry.c:370
+#: libexif/canon/mnote-canon-entry.c:367
 msgid "Rotate 180"
 msgstr "Draai 180"
 
-#: libexif/canon/mnote-canon-entry.c:371
+#: libexif/canon/mnote-canon-entry.c:368
 msgid "Rotate 270 CW"
 msgstr "Draai 270 rechtsom"
 
-#: libexif/canon/mnote-canon-entry.c:372
+#: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotated by software"
 msgstr "Gedraaid door programma"
 
-#: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/canon/mnote-canon-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:606
 msgid "Left to right"
 msgstr "Links naar rechts"
 
-#: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/canon/mnote-canon-entry.c:382
+#: libexif/olympus/mnote-olympus-entry.c:609
 msgid "Right to left"
 msgstr "Rechts naar links"
 
-#: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/canon/mnote-canon-entry.c:383
+#: libexif/olympus/mnote-olympus-entry.c:612
 msgid "Bottom to top"
 msgstr "Onderkant naar bovenkant"
 
-#: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/canon/mnote-canon-entry.c:384
+#: libexif/olympus/mnote-olympus-entry.c:615
 msgid "Top to bottom"
 msgstr "Bovenkant naar onderkant"
 
-#: libexif/canon/mnote-canon-entry.c:388
+#: libexif/canon/mnote-canon-entry.c:385
 msgid "2x2 matrix (clockwise)"
 msgstr "2x2 matrix (rechtsom)"
 
-#: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
-#: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/canon/mnote-canon-entry.c:391 libexif/canon/mnote-canon-entry.c:397
+#: libexif/canon/mnote-canon-entry.c:418 libexif/canon/mnote-canon-entry.c:428
+#: libexif/exif-entry.c:671 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
-#: libexif/olympus/mnote-olympus-entry.c:230
+#: libexif/olympus/mnote-olympus-entry.c:227
 msgid "Standard"
 msgstr "Standaard"
 
-#: libexif/canon/mnote-canon-entry.c:397
+#: libexif/canon/mnote-canon-entry.c:394
 msgid "N/A"
 msgstr "N.v.t."
 
-#: libexif/canon/mnote-canon-entry.c:398
+#: libexif/canon/mnote-canon-entry.c:395
 msgid "Lowest"
 msgstr "Laagst"
 
-#: libexif/canon/mnote-canon-entry.c:402
+#: libexif/canon/mnote-canon-entry.c:399
 msgid "Highest"
 msgstr "Hoogst"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
+#: libexif/canon/mnote-canon-entry.c:401 libexif/exif-entry.c:714
 #: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/olympus/mnote-olympus-entry.c:133
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
 msgstr "Daglicht"
 
-#: libexif/canon/mnote-canon-entry.c:422
+#: libexif/canon/mnote-canon-entry.c:419
 msgid "Set 1"
 msgstr "Set 1"
 
-#: libexif/canon/mnote-canon-entry.c:423
+#: libexif/canon/mnote-canon-entry.c:420
 msgid "Set 2"
 msgstr "Set 2"
 
-#: libexif/canon/mnote-canon-entry.c:424
+#: libexif/canon/mnote-canon-entry.c:421
 msgid "Set 3"
 msgstr "Set 3"
 
-#: libexif/canon/mnote-canon-entry.c:425
+#: libexif/canon/mnote-canon-entry.c:422
 msgid "User def. 1"
 msgstr "Gebr. gedef. 1"
 
-#: libexif/canon/mnote-canon-entry.c:426
+#: libexif/canon/mnote-canon-entry.c:423
 msgid "User def. 2"
 msgstr "Gebr. gedef. 2"
 
-#: libexif/canon/mnote-canon-entry.c:427
+#: libexif/canon/mnote-canon-entry.c:424
 msgid "User def. 3"
 msgstr "Gebr. gedef. 3"
 
-#: libexif/canon/mnote-canon-entry.c:428
+#: libexif/canon/mnote-canon-entry.c:425
 msgid "External 1"
 msgstr "Extern 1"
 
-#: libexif/canon/mnote-canon-entry.c:429
+#: libexif/canon/mnote-canon-entry.c:426
 msgid "External 2"
 msgstr "Extern 2"
 
-#: libexif/canon/mnote-canon-entry.c:430
+#: libexif/canon/mnote-canon-entry.c:427
 msgid "External 3"
 msgstr "Extern 3"
 
-#: libexif/canon/mnote-canon-entry.c:435
+#: libexif/canon/mnote-canon-entry.c:432
 msgid "Faithful"
 msgstr "Vol vertrouwen"
 
-#: libexif/canon/mnote-canon-entry.c:436
-#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/canon/mnote-canon-entry.c:433
+#: libexif/olympus/mnote-olympus-entry.c:115
 msgid "Monochrome"
 msgstr "Monochroom"
 
-#: libexif/canon/mnote-canon-entry.c:494
+#: libexif/canon/mnote-canon-entry.c:491
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:621
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:645
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:655 libexif/exif-entry.c:1064
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:667
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
@@ -1295,7 +1280,7 @@ msgid "Settings (Second Part)"
 msgstr "Instellingen (tweede deel)"
 
 #: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/olympus/mnote-olympus-entry.c:595
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1636,707 +1621,654 @@ msgstr "EXIF-markering niet gevonden."
 msgid "EXIF header not found."
 msgstr "EXIF-kop niet gevonden."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:884
 msgid "Unknown encoding."
 msgstr "Onbekende codering."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1168
 msgid "Ignore unknown tags"
 msgstr "Negeer onbekende tags"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1169
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Negeer onbekende tags bij het laden van EXIF-gegevens."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1170
 msgid "Follow specification"
 msgstr "Volg de specificatie"
 
-#: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
-"Voeg toe, corrigeer en verwijder items om EXIF-gegevens te verkrijgen "
-"volgens de specificatie."
+#: libexif/exif-data.c:1171
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Voeg toe, corrigeer en verwijder items om EXIF-gegevens te verkrijgen volgens de specificatie."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1173
 msgid "Do not change maker note"
 msgstr "Laat de fabrikantennotitie ongewijzigd"
 
-#: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
-"Laat bij het laden en opnieuw opslaan van EXIF-gegevens de "
-"fabrikantennotitie ongewijzigd. Wees u er van bewust dat de "
-"fabrikantennotitie beschadigd kan raken."
+#: libexif/exif-data.c:1174
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Laat bij het laden en opnieuw opslaan van EXIF-gegevens de fabrikantennotitie ongewijzigd. Wees u er van bewust dat de fabrikantennotitie beschadigd kan raken."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
-"Het label '%s' had de structuur '%s' (hetgeen niet volgens de specificaties "
-"is) en is gewijzigd naar de structuur '%s'."
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Het label '%s' had de structuur '%s' (hetgeen niet volgens de specificaties is) en is gewijzigd naar de structuur '%s'."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
-"Het label '%s' had structuur '%s' (hetgeen niet volgens de specificaties is) "
-"maar kan niet worden gewijzigd naar structuur '%s'."
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Het label '%s' had structuur '%s' (hetgeen niet volgens de specificaties is) maar kan niet worden gewijzigd naar structuur '%s'."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
-"Het label 'UserComment' heeft een ongeldige structuur '%s'. De structuur is "
-"op 'undefined' ingesteld."
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Het label 'UserComment' heeft een ongeldige structuur '%s'. De structuur is op 'undefined' ingesteld."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
-"Het label 'UserComment' is vergroot naar ten minste 8 bytes om te voldoen "
-"aan de specificatie."
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Het label 'UserComment' is vergroot naar ten minste 8 bytes om te voldoen aan de specificatie."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
-"Het label 'UserComment' is niet leeg, maar begint niet met een "
-"structuuridentificatie. Dit is verbeterd."
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Het label 'UserComment' is niet leeg, maar begint niet met een structuuridentificatie. Dit is verbeterd."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
-"Het label 'UserComment' begon niet met een structuuridentificatie. Dit is "
-"verbeterd."
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Het label 'UserComment' begon niet met een structuuridentificatie. Dit is verbeterd."
 
 #: libexif/exif-entry.c:462
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i bytes onbekende gegevens"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:589
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i bytes met niet-ondersteund gegevenstype"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:622
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
-"Het label '%s' bevat gegevens met een ongeldige structuur ('%s', verwacht "
-"'%s')."
+msgstr "Het label '%s' bevat gegevens met een ongeldige structuur ('%s', verwacht '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:635
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr ""
-"Het label '%s' bevat een ongeldig aantal componenten (%i, verwacht %i)."
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "Het label '%s' bevat een ongeldig aantal componenten (%i, verwacht %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:649
 msgid "Chunky format"
 msgstr "chunky-structuur"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:649
 msgid "Planar format"
 msgstr "planar-structuur"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
+#: libexif/exif-entry.c:651 libexif/exif-entry.c:743
 #: test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Niet gedefiniëerd"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:651
 msgid "One-chip color area sensor"
 msgstr "Eén-chip kleurgebiedsensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:652
 msgid "Two-chip color area sensor"
 msgstr "Twee-chips kleurgebiedsensor"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:652
 msgid "Three-chip color area sensor"
 msgstr "Drie-chips kleurgebiedsensor"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:653
 msgid "Color sequential area sensor"
 msgstr "Gebiedssensor voor kleurvolgorde"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:653
 msgid "Trilinear sensor"
 msgstr "Tri-lineaire sensor"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:654
 msgid "Color sequential linear sensor"
 msgstr "Lineaire sensor voor kleurvolgorde"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Linksboven"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Rechtsboven"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Rechtsonder"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Linksonder"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:657
 msgid "Left-top"
 msgstr "linksboven"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:657
 msgid "Right-top"
 msgstr "rechtsboven"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:658
 msgid "Right-bottom"
 msgstr "rechtsonder"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:658
 msgid "Left-bottom"
 msgstr "linksonder"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:660
 msgid "Centered"
 msgstr "gecentreerd"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:660
 msgid "Co-sited"
 msgstr "naast elkaar"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:662
 msgid "Reversed mono"
 msgstr "Inverse mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:662
 msgid "Normal mono"
 msgstr "Normaal mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:662
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:662
 msgid "Palette"
 msgstr "Palet"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:663
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:663
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:663
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:665
 msgid "Normal process"
 msgstr "Normaal proces"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:665
 msgid "Custom process"
 msgstr "Aangepast proces"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:667
 msgid "Auto exposure"
 msgstr "Automatische belichting"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:667 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Handmatige belichting"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:667
 msgid "Auto bracket"
 msgstr "Auto-bracket"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:669
 msgid "Auto white balance"
 msgstr "Automatische witbalans"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:669
 msgid "Manual white balance"
 msgstr "Handmatige witbalans"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:674
 msgid "Low gain up"
 msgstr "Lage versterking"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:674
 msgid "High gain up"
 msgstr "Hoge versterking"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:675
 msgid "Low gain down"
 msgstr "Lage verzwakking"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:675
 msgid "High gain down"
 msgstr "Hoge verzwakking"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:677
 msgid "Low saturation"
 msgstr "Lage verzadiging"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:677 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Hoge verzadiging"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:678 libexif/exif-entry.c:679
 #: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
-#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:205
+#: libexif/olympus/mnote-olympus-entry.c:214
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "Zacht"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:678 libexif/exif-entry.c:679
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
-#: libexif/olympus/mnote-olympus-entry.c:207
-#: libexif/olympus/mnote-olympus-entry.c:215
+#: libexif/olympus/mnote-olympus-entry.c:204
+#: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/pentax/mnote-pentax-entry.c:107
 msgid "Hard"
 msgstr "Hard"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:695 libexif/exif-entry.c:713 libexif/exif-entry.c:795
+#: libexif/olympus/mnote-olympus-entry.c:589
+#: libexif/olympus/mnote-olympus-entry.c:683
+#: libexif/olympus/mnote-olympus-entry.c:738
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:696
 msgid "Avg"
 msgstr "gem"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:697
 msgid "Center-weight"
 msgstr "Centraalgewogen"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:699
 msgid "Multi spot"
 msgstr "Meerpunts"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:700
 msgid "Pattern"
 msgstr "Patroon"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:705
 msgid "Uncompressed"
 msgstr "Niet gecomprimeerd"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:706
 msgid "LZW compression"
 msgstr "LZW-compressie"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:707 libexif/exif-entry.c:708
 msgid "JPEG compression"
 msgstr "JPEG-compressie"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:709
 msgid "Deflate/ZIP compression"
 msgstr "Deflate/ZIP-compressie"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:710
 msgid "PackBits compression"
 msgstr "PackBits-compressie"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:716
 msgid "Tungsten incandescent light"
 msgstr "Licht van een wolframlamp"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:718
 msgid "Fine weather"
 msgstr "Mooi weer"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:719
 msgid "Cloudy weather"
 msgstr "Bewolkt weer"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:722 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Daglichtwit TL"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:723
 msgid "Cool white fluorescent"
 msgstr "Koelwit TL-licht"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:724 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "Wit TL-licht"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:725
 msgid "Standard light A"
 msgstr "Standaard licht A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:726
 msgid "Standard light B"
 msgstr "Standaard licht B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:727
 msgid "Standard light C"
 msgstr "Standaard licht C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:728
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:729
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:730
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:731
 msgid "ISO studio tungsten"
 msgstr "ISO studio-wolfram"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:735 libexif/exif-entry.c:739
 msgid "Inch"
 msgstr "Inch"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:735 libexif/exif-entry.c:739
 msgid "in"
 msgstr "in"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "Centimeter"
 msgstr "Centimeter"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:745
 msgid "Normal program"
 msgstr "Normaal programma"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:746
 msgid "Aperture priority"
 msgstr "Diafragmagetal heeft prioriteit"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:746 libexif/exif-tag.c:550
 msgid "Aperture"
 msgstr "Diafragmagetal"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:747
 msgid "Shutter priority"
 msgstr "Sluitertijd heeft prioriteit"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:747
 msgid "Shutter"
 msgstr "Sluitertijd"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:748
 msgid "Creative program (biased toward depth of field)"
 msgstr "Creatief programma (neigend naar scherptediepte)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:749
 msgid "Creative"
 msgstr "Creatief"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:750
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr "Creatief programma (neigend naar een snelle sluitertijd)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:751
 msgid "Action"
 msgstr "Actie"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:752
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "Portretmodus (voor closeupfoto's met een onscherpe achtergrond)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:754
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Landschapmodus (voor landschapfoto's met een scherpe achtergrond)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
-#: libexif/olympus/mnote-olympus-entry.c:100
+#: libexif/exif-entry.c:758 libexif/exif-entry.c:763
+#: libexif/olympus/mnote-olympus-entry.c:97
 msgid "Flash did not fire"
 msgstr "Flitser deed het niet"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:758
 msgid "No flash"
 msgstr "geen flits"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:759
 msgid "Flash fired"
 msgstr "Geflitst"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
-#: libexif/olympus/mnote-olympus-entry.c:178
-#: libexif/olympus/mnote-olympus-entry.c:212
-#: libexif/olympus/mnote-olympus-entry.c:221
-#: libexif/olympus/mnote-olympus-entry.c:244
+#: libexif/exif-entry.c:759 libexif/olympus/mnote-olympus-entry.c:170
+#: libexif/olympus/mnote-olympus-entry.c:175
+#: libexif/olympus/mnote-olympus-entry.c:209
+#: libexif/olympus/mnote-olympus-entry.c:218
+#: libexif/olympus/mnote-olympus-entry.c:241
 msgid "Yes"
 msgstr "Ja"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:760
 msgid "Strobe return light not detected"
 msgstr "Teruggekaatst flitslicht niet gedetecteerd"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:760
 msgid "Without strobe"
 msgstr "Zonder flits"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:762
 msgid "Strobe return light detected"
 msgstr "Teruggekaatst flitslicht gedetecteerd"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:762
 msgid "With strobe"
 msgstr "Met flits"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:764
 msgid "Flash fired, compulsory flash mode"
 msgstr "Geflitst, altijd-flitsen-modus."
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:765
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr "Geflitst, altijd-flitsen-modus, teruggekaatst licht niet gedetecteerd"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:767
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr "Geflitst, altijd-flitsen-modus, teruggekaatst licht gedetecteerd"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:769
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "Niet geflitst, altijd-flitsen-modus"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:770
 msgid "Flash did not fire, auto mode"
 msgstr "Niet geflitst, automatische modus"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:771
 msgid "Flash fired, auto mode"
 msgstr "Geflitst, automatische modus"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:772
 msgid "Flash fired, auto mode, return light not detected"
 msgstr "Geflitst, automatische modus, teruggekaatst licht niet gedetecteerd"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:774
 msgid "Flash fired, auto mode, return light detected"
 msgstr "Geflitst, automatische modus, teruggekaatst licht gedetecteerd"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:775
 msgid "No flash function"
 msgstr "Geen flitsfunctie"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:776
 msgid "Flash fired, red-eye reduction mode"
 msgstr "Geflits, rode-ogenreductie"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:777
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr "Geflitst, rode-ogenreductie, teruggekaatst licht niet gedetecteerd"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:779
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr "Geflitst, rode-ogenreductie, teruggekaatst licht gedetecteerd"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:781
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "Geflitst, altijd-flitsen-modus, rode-ogenreductie"
 
-#: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"Geflitst, altijd-flitsen-modus, rode-ogenreductie, teruggekaatst licht niet "
-"gedetecteerd"
+#: libexif/exif-entry.c:783
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "Geflitst, altijd-flitsen-modus, rode-ogenreductie, teruggekaatst licht niet gedetecteerd"
 
-#: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"Geflitst, altijd-flitsen-modus, rode-ogenreductie, teruggekaatst licht "
-"gedetecteerd"
+#: libexif/exif-entry.c:785
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "Geflitst, altijd-flitsen-modus, rode-ogenreductie, teruggekaatst licht gedetecteerd"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:787
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr "Niet geflitst, automatische modus, rode-ogenreductie"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:788
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "Geflitst, automatische modus, rode-ogenreductie"
 
-#: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"Niet geflitst, automatische modus, teruggekaatst licht niet gedetecteerd, "
-"rode-ogenreductie"
+#: libexif/exif-entry.c:789
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "Niet geflitst, automatische modus, teruggekaatst licht niet gedetecteerd, rode-ogenreductie"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"Geflitst, automatische modus, teruggekaatst licht gedetecteerd, rode-"
-"ogenreductie"
+msgstr "Geflitst, automatische modus, teruggekaatst licht gedetecteerd, rode-ogenreductie"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:795
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:797
 msgid "Close view"
 msgstr "Dichtbij bekijken"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:798
 msgid "Distant view"
 msgstr "Op afstand bekijken"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:798
 msgid "Distant"
 msgstr "Op afstand"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:801
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:802
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:803
 msgid "Uncalibrated"
 msgstr "Niet gecalibreerd"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:857
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Invoer heeft ongeldige grootte (%i, verwacht was %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:890
 msgid "Unsupported UNICODE string"
 msgstr "Niet-ondersteunde UNICODE tekst"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:898
 msgid "Unsupported JIS string"
 msgstr "Niet-ondersteunde JIS tekst"
 
-#: libexif/exif-entry.c:935
-#, fuzzy
-msgid "Tag UserComment contains data but is against specification."
-msgstr ""
-"Het label 'UserComment' is vergroot naar ten minste 8 bytes om te voldoen "
-"aan de specificatie."
+#: libexif/exif-entry.c:914
+msgid "Tag UserComment does not comply with standard but contains data."
+msgstr "Label Gebruikersopmerking voldoet niet aan de standaard maar bevat wel gegevens."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:918
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Byte op positie %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:927
 msgid "Unknown Exif Version"
 msgstr "Onbekende Exif-versie"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:931
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif-versie %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:942
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix versie 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:944
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix versie 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:946
 msgid "Unknown FlashPix Version"
 msgstr "Onbekende FlashPix versie"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:959 libexif/exif-entry.c:972 libexif/exif-entry.c:1628
+#: libexif/exif-entry.c:1633 libexif/exif-entry.c:1637
+#: libexif/exif-entry.c:1642 libexif/exif-entry.c:1643
 msgid "[None]"
 msgstr "[Geen]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:961
 msgid "(Photographer)"
 msgstr "(Fotograaf)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:975
 msgid "(Editor)"
 msgstr "(Bewerker)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:999 libexif/exif-entry.c:1079
+#: libexif/exif-entry.c:1096 libexif/exif-entry.c:1140
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1000
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1034
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35-equivalent: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1067 libexif/exif-entry.c:1068
 msgid " sec."
 msgstr " sec."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1082
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d sec.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1084
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d sec.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1097
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1107
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
+#: libexif/exif-entry.c:1109 libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1236 libexif/exif-entry.c:1287
+#: libexif/exif-entry.c:1296 libexif/exif-entry.c:1332
 #: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
 #: libexif/pentax/mnote-pentax-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:359
@@ -2344,74 +2276,74 @@ msgstr "DSC"
 msgid "Internal error (unknown value %i)"
 msgstr "Interne fout (onbekende waarde %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1117
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1118
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1119
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1120
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1121
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1122
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1123
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1124
 msgid "Reserved"
 msgstr "gereserveerd"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1147
 msgid "Directly photographed"
 msgstr "Direct gefotografeerd"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1160
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1162
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1179
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "Binnen afstand %i van (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1188
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "Binnen rechthoek (breedte %i, hoogte %i) rondom (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1194
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Onverwacht aantal componenten (%li, verwacht was 2, 3 of 4)"
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1232
 msgid "Sea level"
 msgstr "Zeeniveau"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1234
 msgid "Sea level reference"
 msgstr "Referentie zeeniveau"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1342
 #, c-format
 msgid "Unknown value %i"
 msgstr "Onbekende waarde %i"
@@ -2502,46 +2434,24 @@ msgid "GPS Tag Version"
 msgstr "GPS-labelversie"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
-"Geeft de versie van <GPSInfoIFD> weer. De versie wordt gegevens als 2.0.0.0. "
-"Dit label is verplicht als het <GPSInfo>-label aanwezig is. (Merk op: het "
-"<GPSVersionID>-label wordt uitgedrukt in bytes, in tegenstelling tot het "
-"<ExifVersion>-label. Als de versie 2.0.0.0 is, dan heeft het label de waarde "
-"02000000.H)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Geeft de versie van <GPSInfoIFD> weer. De versie wordt gegevens als 2.0.0.0. Dit label is verplicht als het <GPSInfo>-label aanwezig is. (Merk op: het <GPSVersionID>-label wordt uitgedrukt in bytes, in tegenstelling tot het <ExifVersion>-label. Als de versie 2.0.0.0 is, dan heeft het label de waarde 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
 msgstr "Interoperabiliteitsindex"
 
 #: libexif/exif-tag.c:70
-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 ""
-"Geeft de identificatie van de interoperabiltiteitsregel weer. Gebruik "
-"\"R98\" als afkorting van ExifR98-regels. Gebruikt vier bytes, inclusief het "
-"afbreekteken (NUL). Zie het aparte deel van Aanbevolen Exif-"
-"interoperabiliteitsregels (ExifR98) voor andere labels in het gebruik van "
-"ExifR98."
+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 "Geeft de identificatie van de interoperabiltiteitsregel weer. Gebruik \"R98\" als afkorting van ExifR98-regels. Gebruikt vier bytes, inclusief het afbreekteken (NUL). Zie het aparte deel van Aanbevolen Exif-interoperabiliteitsregels (ExifR98) voor andere labels in het gebruik van ExifR98."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
 msgstr "Noorder- of zuiderbreedte"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
-"Geeft aan of de breedtegraad de noorder- of zuiderbreedte betreft. De ASCII-"
-"waarde 'N' verwijst naar noorderbreedte en 'S' naar zuiderbreedte."
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Geeft aan of de breedtegraad de noorder- of zuiderbreedte betreft. De ASCII-waarde 'N' verwijst naar noorderbreedte en 'S' naar zuiderbreedte."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
@@ -2552,161 +2462,88 @@ msgid "Latitude"
 msgstr "Breedtegraad"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
-"Geeft de breedtegraad aan. De breedtegraad wordt uitgedrukt als drie reële "
-"waarden in respectievelijk graden, minuten en seconden. Als graden, minuten "
-"en seconden worden weergegeven, dan is de opmaak dd/1,mm/1,ss/1. Als graden "
-"en minuten worden gebruikt en, bijvoorbeeld, delen van minuten worden "
-"weergegeven tot twee decimale posities, dan is de opmaak dd/1,mmmm/100,0/1"
+msgid "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."
+msgstr "Geeft de breedtegraad aan. De breedtegraad wordt uitgedrukt als drie reële waarden in respectievelijk graden, minuten en seconden. Als graden, minuten en seconden worden weergegeven, dan is de opmaak dd/1,mm/1,ss/1. Als graden en minuten worden gebruikt en, bijvoorbeeld, delen van minuten worden weergegeven tot twee decimale posities, dan is de opmaak dd/1,mmmm/100,0/1"
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
 msgstr "Oosterlijke of westerlijke lengtegraad"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
-"Geeft aan of de lengtegraad de oosterlijke of de westerlijke betreft. ASCII "
-"'E' betekent oosterlengte en 'W' is westerlengte."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Geeft aan of de lengtegraad de oosterlijke of de westerlijke betreft. ASCII 'E' betekent oosterlengte en 'W' is westerlengte."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
 msgstr "Lengtegraad"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
-"Geeft de lengtegraad aan. De lengtegraad wordt uitgedrukt als drie reële "
-"waarden in respectievelijk graden, minuten en seconden. Als graden, minuten "
-"en seconden worden weergegeven, dan is de opmaak dd/1,mm/1,ss/1. Als graden "
-"en minuten worden gebruikt en, bijvoorbeeld, delen van minuten worden "
-"weergegeven tot twee decimale posities, dan is de opmaak dd/1,mmmm/100,0/1"
+msgid "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."
+msgstr "Geeft de lengtegraad aan. De lengtegraad wordt uitgedrukt als drie reële waarden in respectievelijk graden, minuten en seconden. Als graden, minuten en seconden worden weergegeven, dan is de opmaak dd/1,mm/1,ss/1. Als graden en minuten worden gebruikt en, bijvoorbeeld, delen van minuten worden weergegeven tot twee decimale posities, dan is de opmaak dd/1,mmmm/100,0/1"
 
 #: libexif/exif-tag.c:103
 msgid "Altitude Reference"
 msgstr "Hoogtereferentie"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
-"Geeft de hoogte aan die gebruikt wordt als referentiehoogte. Als de "
-"referentie het zeeniveau is de hoogte is boven zeeniveau, dan wordt 0 "
-"gegeven. Als de hoogte onder zeeniveau is, wordt een waarde van 1 gegeven en "
-"de hoogte is weergegeven als een absolute waarde in het GPSAltitude-label. "
-"De referentieeenheid is meters. Merk op dat dit label van het BYTE-soort is, "
-"dit in tegenstelling tot andere referentielabels."
+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 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."
+msgstr "Geeft de hoogte aan die gebruikt wordt als referentiehoogte. Als de referentie het zeeniveau is de hoogte is boven zeeniveau, dan wordt 0 gegeven. Als de hoogte onder zeeniveau is, wordt een waarde van 1 gegeven en de hoogte is weergegeven als een absolute waarde in het GPSAltitude-label. De referentieeenheid is meters. Merk op dat dit label van het BYTE-soort is, dit in tegenstelling tot andere referentielabels."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
 msgstr "Hoogte"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
-"Geeft de hoogte aan ten opzichte van de referentie in GPSAltitudeRef. Hoogte "
-"is uitgedrukt als één rationele waarde. De referentieeenheid is in meters."
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Geeft de hoogte aan ten opzichte van de referentie in GPSAltitudeRef. Hoogte is uitgedrukt als één rationele waarde. De referentieeenheid is in meters."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
 msgstr "GPS-tijd (atoomklok)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
-"Geeft de tijd als UTC (Coordinated Universal Time). Tijdcode is uitgedrukt "
-"als drie reële waarden voor uur, minuut en seconde."
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Geeft de tijd als UTC (Coordinated Universal Time). Tijdcode is uitgedrukt als drie reële waarden voor uur, minuut en seconde."
 
 #: libexif/exif-tag.c:118
 msgid "GPS Satellites"
 msgstr "GPS-satallieten"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
-"Geeft de GPS-satallieten gebruikt bij metingen. Dit label kan benut worden "
-"om het aantal satallieten, hun ID-nummer, elivatie, azimut, SNR en andere "
-"informatie in ASCII-notatie te beschrijven. De wijze waarop is niet "
-"vastgelegd. Als de GPS-ontvanger niet in staat is metingen vast te leggen, "
-"dan moet de waarde van het label op NUL gezet worden."
+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, 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 shall be set to NULL."
+msgstr "Geeft de GPS-satallieten gebruikt bij metingen. Dit label kan benut worden om het aantal satallieten, hun ID-nummer, elivatie, azimut, SNR en andere informatie in ASCII-notatie te beschrijven. De wijze waarop is niet vastgelegd. Als de GPS-ontvanger niet in staat is metingen vast te leggen, dan moet de waarde van het label op NUL gezet worden."
 
 #: libexif/exif-tag.c:125
 msgid "GPS Receiver Status"
 msgstr "Status GPS-ontvanger"
 
 #: libexif/exif-tag.c:126
-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 ""
-"Geeft de status van de GPS-ontvanger als de opname is vastgelegd. 'A' "
-"betekent dat de meting gaande is en 'V' zegt dat de meting interoperabel is."
+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 "Geeft de status van de GPS-ontvanger als de opname is vastgelegd. 'A' betekent dat de meting gaande is en 'V' zegt dat de meting interoperabel is."
 
 #: libexif/exif-tag.c:129
 msgid "GPS Measurement Mode"
 msgstr "GPS-meetmodus"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
-"Geeft de GPS-meetmodus. '2' staat voor tweedimensionale meting en '3' voor "
-"driedimensionaal."
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Geeft de GPS-meetmodus. '2' staat voor tweedimensionale meting en '3' voor driedimensionaal."
 
 #: libexif/exif-tag.c:133
 msgid "Measurement Precision"
 msgstr "Meetprecisie"
 
 #: libexif/exif-tag.c:134
-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 ""
-"Geeft de GPS-DOP (Degree Of Precision, mate van nauwkeurigheid). Een HDOP-"
-"waarde wordt weggeschreven tijdens tweedimensionale metingen en PDOP tijdens "
-"driedimensionale metingen."
+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 "Geeft de GPS-DOP (Degree Of Precision, mate van nauwkeurigheid). Een HDOP-waarde wordt weggeschreven tijdens tweedimensionale metingen en PDOP tijdens driedimensionale metingen."
 
 #: libexif/exif-tag.c:137
 msgid "Speed Unit"
 msgstr "Snelheidseenheid"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
-"Geeft de eenheid waarin de snelheid of beweging van de GPS-ontvanger wordt "
-"uitgedrukt. 'K', 'M' en 'N' staan respectievelijk voor kilometers per uur, "
-"mijlen per uur en knopen."
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Geeft de eenheid waarin de snelheid of beweging van de GPS-ontvanger wordt uitgedrukt. 'K', 'M' en 'N' staan respectievelijk voor kilometers per uur, mijlen per uur en knopen."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
@@ -2721,167 +2558,96 @@ msgid "Reference for direction of movement"
 msgstr "Referentie voor bewegingsrichting"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"De referentie waarmee de beweegrichting van de GPS-ontvanger tijdens de "
-"opname wordt aangegeven. 'T' betekent het ware noorden en 'M' is het "
-"magnetische noorden."
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "De referentie waarmee de beweegrichting van de GPS-ontvanger tijdens de opname wordt aangegeven. 'T' betekent het ware noorden en 'M' is het magnetische noorden."
 
 #: libexif/exif-tag.c:147
 msgid "Direction of Movement"
 msgstr "Bewegingsrichting"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
-msgstr ""
-"Geeft de beweegrichting van de GPS-ontvanger. Het bereik ligt tussen de 0.00 "
-"en 359.99."
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
+msgstr "Geeft de beweegrichting van de GPS-ontvanger. Het bereik ligt tussen de 0.00 en 359.99."
 
 #: libexif/exif-tag.c:150
 msgid "GPS Image Direction Reference"
 msgstr "GPS-referentie voor afbeeldingsrichting"
 
 #: libexif/exif-tag.c:151
-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 ""
-"De referentie waarmee de richting van de afbeelding tijdens de opname wordt "
-"aangegeven. 'T' betekent het ware noorden en 'M' is het magnetische noorden."
+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 "De referentie waarmee de richting van de afbeelding tijdens de opname wordt aangegeven. 'T' betekent het ware noorden en 'M' is het magnetische noorden."
 
 #: libexif/exif-tag.c:153
 msgid "GPS Image Direction"
 msgstr "GPS-afbeeldingsrichting"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
-"Geeft de richting van de afbeelding tijdens de opname. Het bereik ligt "
-"tussen de 0.00 en 359.99."
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
+msgstr "Geeft de richting van de afbeelding tijdens de opname. Het bereik ligt tussen de 0.00 en 359.99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
 msgstr "Geodetische onderzoeksgegevens gebruikt"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
-"Geeft de geodetische onderzoeksgegevens zoals door de GPS-ontvanger wordt "
-"gebruikt. Als de onderzoeksgegevens zich beperken tot Japan, dan is de "
-"waarde van dit label 'TOKYO' of 'WGS-84'. Als een GPS-informatielabel wordt "
-"geregistreerd is het sterk aanbevolen dit label op te slaan."
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Geeft de geodetische onderzoeksgegevens zoals door de GPS-ontvanger wordt gebruikt. Als de onderzoeksgegevens zich beperken tot Japan, dan is de waarde van dit label 'TOKYO' of 'WGS-84'. Als een GPS-informatielabel wordt geregistreerd is het sterk aanbevolen dit label op te slaan."
 
 #: libexif/exif-tag.c:161
 msgid "Reference For Latitude of Destination"
 msgstr "Referentie voor lengtegraad van bestemming"
 
 #: libexif/exif-tag.c:162
-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 ""
-"Geeft aan of de breedtegraad de noorder- of zuiderbreedte betreft. De ASCII-"
-"waarde 'N' verwijst naar noorderbreedte en 'S' naar zuiderbreedte."
+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 "Geeft aan of de breedtegraad de noorder- of zuiderbreedte betreft. De ASCII-waarde 'N' verwijst naar noorderbreedte en 'S' naar zuiderbreedte."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
 msgstr "Breedtegraad van bestemming"
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
-"Geeft de breedtegraad van de bestemming aan. De breedtegraad wordt "
-"uitgedrukt als drie reële waarden in respectievelijk graden, minuten en "
-"seconden. Als graden, minuten en seconden worden weergegeven, dan is de "
-"opmaak dd/1,mm/1,ss/1. Als graden en minuten worden gebruikt en, "
-"bijvoorbeeld, delen van minuten worden weergegeven tot in twee decimale "
-"posities, dan is de opmaak dd/1,mmmm/100,0/1"
+msgid "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."
+msgstr "Geeft de breedtegraad van de bestemming aan. De breedtegraad wordt uitgedrukt als drie reële waarden in respectievelijk graden, minuten en seconden. Als graden, minuten en seconden worden weergegeven, dan is de opmaak dd/1,mm/1,ss/1. Als graden en minuten worden gebruikt en, bijvoorbeeld, delen van minuten worden weergegeven tot in twee decimale posities, dan is de opmaak dd/1,mmmm/100,0/1"
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
 msgstr "Referentie voor lengtegraad van bestemming"
 
 #: libexif/exif-tag.c:174
-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 ""
-"Geeft aan of de lengtegraad de oosterlijke of de westerlijke betreft. ASCII "
-"'E' betekent oosterlengte en 'W' is westerlengte."
+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 "Geeft aan of de lengtegraad de oosterlijke of de westerlijke betreft. ASCII 'E' betekent oosterlengte en 'W' is westerlengte."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
 msgstr "Lengtegraad van bestemming"
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
-msgstr ""
-"Geeft de lengtegraad van de bestemming aan. De lengtegraad wordt uitgedrukt "
-"als drie reële waarden in respectievelijk graden, minuten en seconden. Als "
-"graden, minuten en seconden worden weergegeven, dan is de opmaak dd/1,mm/1,"
-"ss/1. Als graden en minuten worden gebruikt en, bijvoorbeeld, delen van "
-"minuten worden weergegeven in twee decimale posities, dan is de opmaak dd/1,"
-"mmmm/100,0/1"
+msgid "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."
+msgstr "Geeft de lengtegraad van de bestemming aan. De lengtegraad wordt uitgedrukt als drie reële waarden in respectievelijk graden, minuten en seconden. Als graden, minuten en seconden worden weergegeven, dan is de opmaak dd/1,mm/1,ss/1. Als graden en minuten worden gebruikt en, bijvoorbeeld, delen van minuten worden weergegeven in twee decimale posities, dan is de opmaak dd/1,mmmm/100,0/1"
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
 msgstr "Referentie voor richting van bestemming"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"De referentie waarmee de richting van de afbeelding tijdens de opname wordt "
-"aangegeven. 'T' betekent het ware noorden en 'M' is het magnetische noorden."
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "De referentie waarmee de richting van de afbeelding tijdens de opname wordt aangegeven. 'T' betekent het ware noorden en 'M' is het magnetische noorden."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
 msgstr "Richting van bestemming"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
-msgstr ""
-"Geeft de richting naar de bestemming. Het bereik ligt tussen de 0.00 en "
-"359.99."
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
+msgstr "Geeft de richting naar de bestemming. Het bereik ligt tussen de 0.00 en 359.99."
 
 #: libexif/exif-tag.c:193
 msgid "Reference for Distance to Destination"
 msgstr "Referentie voor afstand tot bestemming"
 
 #: libexif/exif-tag.c:194
-#, fuzzy
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
-"Geeft de eenheid waarin de afstand tot de bestemming wordt uitgedrukt. 'K', "
-"'M' en 'N' staan voor respectievelijk kilometers, mijlen en zeemijlen."
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and knots."
+msgstr "Geeft de eenheid waarin de afstand tot de bestemming wordt uitgedrukt. 'K', 'M' en 'N' staan voor respectievelijk kilometers, mijlen en zeemijlen."
 
 #: libexif/exif-tag.c:197
 msgid "Distance to Destination"
@@ -2896,56 +2662,44 @@ msgid "Name of GPS Processing Method"
 msgstr "Naam van GPS-verwerkingsmethode"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
-"Een tekenreeks waarin de naam van de methode staat waarmee de locatie wordt "
-"bepaald. De eerste byte geeft de gebruikte tekencode, en dit wordt gevolgd "
-"door de naam van de methode. Omdat het geen ASCII betreft, is afsluiten met "
-"een NUL niet noodzakelijk. "
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Een tekenreeks waarin de naam van de methode staat waarmee de locatie wordt bepaald. De eerste byte geeft de gebruikte tekencode, en dit wordt gevolgd door de naam van de methode. Omdat het geen ASCII betreft, is afsluiten met een NUL niet noodzakelijk."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
 msgstr "Naam van GPS-gebied"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
-"Een tekenreeks waarin de naam van het GPS-gebied is opgeslagen. De eerste "
-"byte geeft de gebruikte tekencode, en dit wordt gevolgd door de naam van het "
-"GPS-gebied. Omdat het geen ASCII betreft, is afsluiten met een NUL niet "
-"noodzakelijk. "
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Een tekenreeks waarin de naam van het GPS-gebied is opgeslagen. De eerste byte geeft de gebruikte tekencode, en dit wordt gevolgd door de naam van het GPS-gebied. Omdat het geen ASCII betreft, is afsluiten met een NUL niet noodzakelijk."
 
 #: libexif/exif-tag.c:210
 msgid "GPS Date"
 msgstr "GPS-datum"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
-"Een tekenreeks waarin de datum- en tijdinformatie relatief tot UTC "
-"(Coordinated Universal Time) is opgeslagen in de vorm \"YYYY:MM:DD\". De "
-"lengte van de tekenreeks is 11 byte, inclusief NUL."
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "Een tekenreeks waarin de datum- en tijdinformatie relatief tot UTC (Coordinated Universal Time) is opgeslagen in de vorm \"YYYY:MM:DD\". De lengte van de tekenreeks is 11 byte, inclusief NUL."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
 msgstr "GPS-differentiaalcorrectie (DGPS)"
 
 #: libexif/exif-tag.c:216
-msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+msgid "Indicates whether differential correction is applied to the GPS receiver."
 msgstr "Geeft aan of differentiaalcorrectie op de GPS-ontvanger is toegepast."
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "Nieuw soort nevenbestand"
 
@@ -2958,68 +2712,40 @@ msgid "Image Width"
 msgstr "Afbeeldingsbreedte"
 
 #: libexif/exif-tag.c:223
-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 ""
-"Het aantal kolommen afbeeldingsgegevens, gelijk aan het aantal pixels per "
-"rij. In JPEG-gecomprimeerde gegevens wordt een JPEG-aanduiding gebruikt in "
-"plaats van dit label."
+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 "Het aantal kolommen afbeeldingsgegevens, gelijk aan het aantal pixels per rij. In JPEG-gecomprimeerde gegevens wordt een JPEG-aanduiding gebruikt in plaats van dit label."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
 msgstr "Afbeeldingslengte"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"Het aantal rijen afbeeldingsgegevens. In JPEG-gecomprimeerde gegevens wordt "
-"een JPEG-aanduiding gebruikt in plaats van dit label."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Het aantal rijen afbeeldingsgegevens. In JPEG-gecomprimeerde gegevens wordt een JPEG-aanduiding gebruikt in plaats van dit label."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
 msgstr "Bits per monster"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
-"Het aantal bits per afbeeldingscomponent. In deze standaard bestaat iedere "
-"afbeeldingscomponent uit 8 bits, dus de waarde van deze label is 8. Zie ook "
-"<SamplesPerPixel>. In JPEG-gecomprimeerde gegevens wordt een JPEG-aanduiding "
-"gebruikt in plaats van dit label."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Het aantal bits per afbeeldingscomponent. In deze standaard bestaat iedere afbeeldingscomponent uit 8 bits, dus de waarde van deze label is 8. Zie ook <SamplesPerPixel>. In JPEG-gecomprimeerde gegevens wordt een JPEG-aanduiding gebruikt in plaats van dit label."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Compressie"
 
 #: libexif/exif-tag.c:238
-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 ""
-"De comprimeerregels voor de afbeeldingsgegevens. Als een hoofdafbeelding "
-"JPEG-gecomprimeerd is, dan is deze aanduiding niet nodig en wordt het "
-"weggelaten. Als miniaturen JPEG-compressie gebruiken, dan wordt deze "
-"labelwaarde ingesteld op 6."
+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 "De comprimeerregels voor de afbeeldingsgegevens. Als een hoofdafbeelding JPEG-gecomprimeerd is, dan is deze aanduiding niet nodig en wordt het weggelaten. Als miniaturen JPEG-compressie gebruiken, dan wordt deze labelwaarde ingesteld op 6."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
 msgstr "Fotometrieke interpretatie"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
-"De pixelcompositie. In JPEG-gecomprimeerde gegevens wordt een JPEG-"
-"aanduiding gebruikt in plaats van dit label."
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "De pixelcompositie. In JPEG-gecomprimeerde gegevens wordt een JPEG-aanduiding gebruikt in plaats van dit label."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
@@ -3034,61 +2760,32 @@ msgid "Image Description"
 msgstr "Beschrijving van afbeelding"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
-"Een tekenreeks met de afbeeldingstitel. Dit kan bestaan uit een opmerkingen "
-"zoals \"2008 bedrijfsuitje\" of iets dergelijks. Twee-byte tekencodes kunnen "
-"niet gebruikt worden. Als deze codering nodig is, gebruik dan het Exif-"
-"gebonden label <UserComment>."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "Een tekenreeks met de afbeeldingstitel. Dit kan bestaan uit een opmerkingen zoals \"2008 bedrijfsuitje\" of iets dergelijks. Twee-byte tekencodes kunnen niet gebruikt worden. Als deze codering nodig is, gebruik dan het Exif-gebonden label <UserComment>."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Fabrikant"
 
 #: libexif/exif-tag.c:261
-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 ""
-"De fabrikant van de opnameapparatuur. Dit is de fabrikant van de DSC, de "
-"scanner, de video-digitaalomzetter of andere apparatuur die de afbeelding "
-"genereert. Als het veld leeg blijft, dan wordt dit als onbekend beschouwd."
+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 "De fabrikant van de opnameapparatuur. Dit is de fabrikant van de DSC, de scanner, de video-digitaalomzetter of andere apparatuur die de afbeelding genereert. Als het veld leeg blijft, dan wordt dit als onbekend beschouwd."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Model"
 
 #: libexif/exif-tag.c:268
-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 ""
-"De modelnaam of het modelnummer van de apparatuur. Dit is de modelnaam of "
-"nummer van de DSC, de scanner, de video-digitaalomzetter of andere "
-"apparatuur die de afbeelding genereert. Als het veld leeg blijft, dan wordt "
-"dit als onbekend beschouwd."
+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 "De modelnaam of het modelnummer van de apparatuur. Dit is de modelnaam of nummer van de DSC, de scanner, de video-digitaalomzetter of andere apparatuur die de afbeelding genereert. Als het veld leeg blijft, dan wordt dit als onbekend beschouwd."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
 msgstr "Strookverschuiving"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
-"Voor iedere strook, de byteverschuiving daarvan. Het wordt aanbevolen om dit "
-"zo te selecteren dat het aantal strookbytes de 64 Kbytes niet overschrijdt. "
-"Met JPEG-gecomprimeerde gegevens is deze aanduiding niet nodig en wordt "
-"weggelaten. Zie ook <RowsPerStrip> en <StripByteCounts>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "Voor iedere strook, de byteverschuiving daarvan. Het wordt aanbevolen om dit zo te selecteren dat het aantal strookbytes de 64 Kbytes niet overschrijdt. Met JPEG-gecomprimeerde gegevens is deze aanduiding niet nodig en wordt weggelaten. Zie ook <RowsPerStrip> en <StripByteCounts>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
@@ -3103,192 +2800,108 @@ msgid "Samples per Pixel"
 msgstr "Monsters per pixel"
 
 #: libexif/exif-tag.c:285
-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 ""
-"Het aantal componenten per pixel. Omdat deze standaard geldt voor RGB- en "
-"YCbCr-afbeeldingen, wordt de waarde van dit label ingesteld op 3. In JPEG-"
-"gecomprimeerde gegevens wordt een JPEG-aanduiding gebruikt in plaats van dit "
-"label."
+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 "Het aantal componenten per pixel. Omdat deze standaard geldt voor RGB- en YCbCr-afbeeldingen, wordt de waarde van dit label ingesteld op 3. In JPEG-gecomprimeerde gegevens wordt een JPEG-aanduiding gebruikt in plaats van dit label."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
 msgstr "Rijen per strook"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
-"Het aantal rijen per strook. Dit is het aantal rijen in de afbeelding van "
-"een strook als de afbeelding in stroken verdeeld is. Met JPEG-gecomprimeerde "
-"gegevens is deze aanduiding niet nodig en wordt weggelaten. Zie ook "
-"<StripOffsets> en <StripByteCounts>."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Het aantal rijen per strook. Dit is het aantal rijen in de afbeelding van een strook als de afbeelding in stroken verdeeld is. Met JPEG-gecomprimeerde gegevens is deze aanduiding niet nodig en wordt weggelaten. Zie ook <StripOffsets> en <StripByteCounts>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
 msgstr "Aantal strookbytes"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
-"Het aantal bytes in iedere strook. Met JPEG-gecomprimeerde gegevens is deze "
-"aanduiding niet nodig en wordt weggelaten."
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Het aantal bytes in iedere strook. Met JPEG-gecomprimeerde gegevens is deze aanduiding niet nodig en wordt weggelaten."
 
 #: libexif/exif-tag.c:301
 msgid "X-Resolution"
 msgstr "x-resolutie"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
-"Het aantal pixels per <ResolutionUnit> in de <ImageWidth>-richting. Als de "
-"afbeeldingsresolutie niet bekend is, wordt 72 [dpi] toegewezen."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Het aantal pixels per <ResolutionUnit> in de <ImageWidth>-richting. Als de afbeeldingsresolutie niet bekend is, wordt 72 [dpi] toegewezen."
 
 #: libexif/exif-tag.c:306
 msgid "Y-Resolution"
 msgstr "x-resolutie"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"Het aantal pixels per <ResolutionUnit> in de <ImageLength>-richting. "
-"Dezelfde waarde als <XResolution> wordt toegewezen."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Het aantal pixels per <ResolutionUnit> in de <ImageLength>-richting. Dezelfde waarde als <XResolution> wordt toegewezen."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
 msgstr "Planaire configuratie"
 
 #: libexif/exif-tag.c:312
-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 ""
-"Geeft aan of pixelcomponenten opgeslagen worden in chunky-structuur (1 pixel "
-"= 1 byte) of planar-structuur (1 pixel = 1 bit). In JPEG-gecomprimeerde "
-"bestanden wordt een JPEG-aanduiding gebruikt in plaats van dit label. Als "
-"dit veld niet bestaat, dan wordt de TIFF-standaard van 1 (chunky) "
-"aangehouden."
+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 "Geeft aan of pixelcomponenten opgeslagen worden in chunky-structuur (1 pixel = 1 byte) of planar-structuur (1 pixel = 1 bit). In JPEG-gecomprimeerde bestanden wordt een JPEG-aanduiding gebruikt in plaats van dit label. Als dit veld niet bestaat, dan wordt de TIFF-standaard van 1 (chunky) aangehouden."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "Resolutieeenheid"
 
 #: libexif/exif-tag.c:318
-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 ""
-"De eenheid van <XResolution> en <YResolution>. Voor <XResolution> en "
-"<YResolution> wordt dezelfde eenheid gebruikt. Als de afbeeldingsresolutie "
-"onbekend is, wordt 2 (inches) toegewezen."
+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 "De eenheid van <XResolution> en <YResolution>. Voor <XResolution> en <YResolution> wordt dezelfde eenheid gebruikt. Als de afbeeldingsresolutie onbekend is, wordt 2 (inches) toegewezen."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
 msgstr "Uitwisselingsfunctie"
 
 #: libexif/exif-tag.c:324
-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 ""
-"Een uitwisselingsfunctie voor de afbeelding, uitgedrukt in tabelvorm. "
-"Normaal is dit label niet nodig, omdat de kleurruimte opgegeven wordt in het "
-"informatielabel (<ColorSpace>)."
+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 "Een uitwisselingsfunctie voor de afbeelding, uitgedrukt in tabelvorm. Normaal is dit label niet nodig, omdat de kleurruimte opgegeven wordt in het informatielabel (<ColorSpace>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Programmatuur"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
-"Dit label bevat de naam en versie van de programmatuur of firmware van de "
-"camera of het apparaat waarmee de afbeelding gegenereerd is. De "
-"gedetailleerde structuur is niet gespecificeerd, maar het wordt aanbevolen "
-"het onderstaande voorbeeld te volgen. Als het veld leeg is, wordt het als "
-"onbekend behandeld."
+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 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."
+msgstr "Dit label bevat de naam en versie van de programmatuur of firmware van de camera of het apparaat waarmee de afbeelding gegenereerd is. De gedetailleerde structuur is niet gespecificeerd, maar het wordt aanbevolen het onderstaande voorbeeld te volgen. Als het veld leeg is, wordt het als onbekend behandeld."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Datum en tijd"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"De datum en het tijdstip waarop de afbeelding gemaakt is. In deze standaard "
-"(EXIF-2.1) betreft het de datum en het tijdstip waarop het bestand veranderd "
-"is."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "De datum en het tijdstip waarop de afbeelding gemaakt is. In deze standaard (EXIF-2.1) betreft het de datum en het tijdstip waarop het bestand veranderd is."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Artiest"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
-"Dit label bevat de naam van cameraeigenaar, de fotograaf of de "
-"afbeeldingsmaker. De gedetailleerde structuur is niet gespecificeerd, maar "
-"het wordt aanbevolen om de informatie te schrijven zoals in het onderstaande "
-"voorbeeld in verband met de uitwisselbaarheid. Als het veld leeg is, wordt "
-"het als onbekend behandeld."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "Dit label bevat de naam van cameraeigenaar, de fotograaf of de afbeeldingsmaker. De gedetailleerde structuur is niet gespecificeerd, maar het wordt aanbevolen om de informatie te schrijven zoals in het onderstaande voorbeeld in verband met de uitwisselbaarheid. Als het veld leeg is, wordt het als onbekend behandeld."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Witpunt"
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
-"De chromaticiteit van het afbeeldingswitpunt. Normaal is dit label niet "
-"nodig, omdat de kleurruimte opgegeven wordt in het informatielabel "
-"(<ColorSpace>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "De chromaticiteit van het afbeeldingswitpunt. Normaal is dit label niet nodig, omdat de kleurruimte opgegeven wordt in het informatielabel (<ColorSpace>)."
 
 #: libexif/exif-tag.c:353
 msgid "Primary Chromaticities"
 msgstr "Primaire chromaticiteit"
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
-msgstr ""
-"De chromaticiteit van de drie primaire afbeeldingskleuren. Normaal is dit "
-"label niet nodig, omdat de kleurruimte opgegeven wordt in het "
-"informatielabel (<ColorSpace>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "De chromaticiteit van de drie primaire afbeeldingskleuren. Normaal is dit label niet nodig, omdat de kleurruimte opgegeven wordt in het informatielabel (<ColorSpace>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
-"Gedefinieerd door Adobe Corporation om TIFF-bomen binnen een TIFF-bestand "
-"mogelijk te maken."
+msgstr "Gedefinieerd door Adobe Corporation om TIFF-bomen binnen een TIFF-bestand mogelijk te maken."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
@@ -3299,113 +2912,48 @@ msgid "JPEG Interchange Format"
 msgstr "JPEG uitwisselingsstructuur"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
-"De verschuiving ten opzichte van de beginbyte (SOI) van JPEG-gecomprimeerde "
-"miniatuurgegevens. Dit wordt niet gebruikt voor primaire JPEG-"
-"afbeeldingsgegevens."
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "De verschuiving ten opzichte van de beginbyte (SOI) van JPEG-gecomprimeerde miniatuurgegevens. Dit wordt niet gebruikt voor primaire JPEG-afbeeldingsgegevens."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
 msgstr "Lengte JPEG uitwisselingsstructuur"
 
 #: libexif/exif-tag.c:373
-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 ""
-"Het aantal bytes aan JPEG-gecomprimeerde miniatuurgegevens. Dit wordt niet "
-"gebruikt voor primaire JPEG-afbeeldingsgegevens. JPEG-miniaturen worden niet "
-"opgedeeld, maar als een continue JPEG-bitstroom van SOI tot EOI vastgelegd. "
-"Appn- en COM-aanduidingen mogen niet vastgelegd worden. Gecomprimeerde "
-"miniaturen moeten passen in maximaal 64 KBytes, inclusief alle andere "
-"gegevens die in APP1 opgenomen moeten worden."
+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 "Het aantal bytes aan JPEG-gecomprimeerde miniatuurgegevens. Dit wordt niet gebruikt voor primaire JPEG-afbeeldingsgegevens. JPEG-miniaturen worden niet opgedeeld, maar als een continue JPEG-bitstroom van SOI tot EOI vastgelegd. Appn- en COM-aanduidingen mogen niet vastgelegd worden. Gecomprimeerde miniaturen moeten passen in maximaal 64 KBytes, inclusief alle andere gegevens die in APP1 opgenomen moeten worden."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
 msgstr "YCbCr-coefficiënten"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
-"De matrixcoefficiënten voor de transformatie van RGB- naar YCbCr-"
-"afbeeldingsinformatie. Voor TIFF is geen standaard gegeven, maar hier wordt "
-"als standaard de waarde gebruikt uit \"Richtlijnen voor kleurruimte\". De "
-"kleurruimte is aangekondigd in een kleurruimteinformatielabel, waarbij als "
-"standaardwaarde de optimale afbeeldingskarakterstieken voor uitwisseling "
-"wordt genomen."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "De matrixcoefficiënten voor de transformatie van RGB- naar YCbCr-afbeeldingsinformatie. Voor TIFF is geen standaard gegeven, maar hier wordt als standaard de waarde gebruikt uit \"Richtlijnen voor kleurruimte\". De kleurruimte is aangekondigd in een kleurruimteinformatielabel, waarbij als standaardwaarde de optimale afbeeldingskarakterstieken voor uitwisseling wordt genomen."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
 msgstr "YCbCr-submonster"
 
 #: libexif/exif-tag.c:393
-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 ""
-"De monsterverhouding van chromatische componenten in relatie tot de "
-"belichtingscomponent. In JPEG-gecomprimeerde gegevens wordt een JPEG-"
-"aanduiding gebruikt in plaats van dit label."
+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 "De monsterverhouding van chromatische componenten in relatie tot de belichtingscomponent. In JPEG-gecomprimeerde gegevens wordt een JPEG-aanduiding gebruikt in plaats van dit label."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
 msgstr "YCbCr-positionering"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
-"De positie van chromatische componenten in relatie tot de "
-"belichtingscomponent. Dit veld wordt alleen toegekend aan JPEG-"
-"gecomprimeerde gegevens of ongecomprimeerde YCrCb-gegevens. De TIFF-"
-"standaard bedraagt 1 (gecentreerd), maar indien Y:Cb:Cr = 4:2:2 wordt in "
-"deze standaard aanbevolen om 2 (tweezijdig) bij de vastlegging van gegevens "
-"te gebruiken om de beeldkwaliteit te verbeteren bij vertoning op TV-"
-"systemen. Als dit veld niet bestaat, dan gaat de lezer uit van de TIFF-"
-"standaard. In het geval van Y:Cb:Cr = 4:2:0 wordt de TIFF-standaard "
-"(gecentreerd) aanbevolen. Als het de lezer ontbreekt aan ondersteuning van "
-"beide soorten <YCbCrPositioning>, dan moet het de TIFF-standaard volgen, "
-"onafhankelijk van de waarde in dit veld. Het heeft de voorkeur dat lezers "
-"zowel gecentreerd als tweezijdig positioneren ondersteunen."
+msgid "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."
+msgstr "De positie van chromatische componenten in relatie tot de belichtingscomponent. Dit veld wordt alleen toegekend aan JPEG-gecomprimeerde gegevens of ongecomprimeerde YCrCb-gegevens. De TIFF-standaard bedraagt 1 (gecentreerd), maar indien Y:Cb:Cr = 4:2:2 wordt in deze standaard aanbevolen om 2 (tweezijdig) bij de vastlegging van gegevens te gebruiken om de beeldkwaliteit te verbeteren bij vertoning op TV-systemen. Als dit veld niet bestaat, dan gaat de lezer uit van de TIFF-standaard. In het geval van Y:Cb:Cr = 4:2:0 wordt de TIFF-standaard (gecentreerd) aanbevolen. Als het de lezer ontbreekt aan ondersteuning van beide soorten <YCbCrPositioning>, dan moet het de TIFF-standaard volgen, onafhankelijk van de waarde in dit veld. Het heeft de voorkeur dat lezers zowel gecentreerd als tweezijdig positioneren ondersteunen."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
 msgstr "Referentie zwart-wit"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
-"De referentie zwartpunt- en witpuntwaarde. In TIFF worden geen standaarden "
-"gegeven, maar de onderstaande waarden gelden hier als standaard. De "
-"kleurruimte wordt aangekondigd in het kleurruimteinformatielabel, waarbij "
-"als standaard de waarde van de optimale afbeeldingskarakterstieken voor "
-"uitwisseling wordt genomen."
+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 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."
+msgstr "De referentie zwartpunt- en witpuntwaarde. In TIFF worden geen standaarden gegeven, maar de onderstaande waarden gelden hier als standaard. De kleurruimte wordt aangekondigd in het kleurruimteinformatielabel, waarbij als standaard de waarde van de optimale afbeeldingskarakterstieken voor uitwisseling wordt genomen."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
@@ -3420,14 +2968,8 @@ msgid "CFA Pattern"
 msgstr "CFA-patroon"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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 ""
-"Geeft het geometrische patroon aan van de kleurfilterreeks (CFA = Color "
-"Filter Array) van de beeldsensor indien een enkele-chip kleurgebiedsensor "
-"wordt gebruikt. Het is niet toepasbaar voor alle opnamemethoden."
+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 "Geeft het geometrische patroon aan van de kleurfilterreeks (CFA = Color Filter Array) van de beeldsensor indien een enkele-chip kleurgebiedsensor wordt gebruikt. Het is niet toepasbaar voor alle opnamemethoden."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
@@ -3438,39 +2980,8 @@ msgid "Copyright"
 msgstr "Copyright"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
-"Copyright-informatie. In deze standaard wordt het label gebruikt voor de "
-"copyrights van zowel de fotograaf als de bewerker. Het betreft de copyright-"
-"kennisgeving van de persoon of organisatie die het recht op de afbeelding "
-"claimt. De copyrightverklaring van interoperabiliteit inclusief datum en "
-"rechten moeten in dit veld worden opgenomen, bijvoorbeeld: \"Copyright, "
-"Klaas Bourtange, 2008. Alle rechten voorbehouden.\". In deze standaard "
-"worden zowel de fotograaf- als de bewerkerrechten vastgelegd, ieder in een "
-"apart deel van de verklaring. Als er een duidelijk onderscheid is tussen de "
-"rechten van de fotograaf en de bewerker, dan moeten deze in de volgorde "
-"fotograaf, bewerker worden geschreven, gescheiden door NUL (in dit geval "
-"zijn er twee NUL-codes, omdat de verklaring ook eindigt met een NUL-code), "
-"(zie voorbeeld 1). Als alleen de fotograaf genoemd wordt, dan wordt dit "
-"afgesloten met één NUL-code (zie voorbeeld 2). Bij slechts de "
-"bewerkerverklaring bestaat het deel van de fotograaf uit een spatie gevolgd "
-"door de afsluitende NUL-code waarna het bewerker-copyright volgt (zie "
-"voorbeeld 3). Als het veld leeg is, wordt het als onbekend beschouwd."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Copyright-informatie. In deze standaard wordt het label gebruikt voor de copyrights van zowel de fotograaf als de bewerker. Het betreft de copyright-kennisgeving van de persoon of organisatie die het recht op de afbeelding claimt. De copyrightverklaring van interoperabiliteit inclusief datum en rechten moeten in dit veld worden opgenomen, bijvoorbeeld: \"Copyright, Klaas Bourtange, 2008. Alle rechten voorbehouden.\". In deze standaard worden zowel de fotograaf- als de bewerkerrechten vastgelegd, ieder in een apart deel van de verklaring. Als er een duidelijk onderscheid is tussen de rechten van de fotograaf en de bewerker, dan moeten deze in de volgorde fotograaf, bewerker worden geschreven, gescheiden door NUL (in dit geval zijn er twee NUL-codes, omdat de verklaring ook eindigt met een NUL-code), (zie voorbeeld 1). Als alleen de fotograaf genoemd wordt, dan wordt dit afgesloten met één NUL-code (zie voorbeeld 2). Bij slechts de bewerkerverklaring bestaat het deel van de fotograaf uit een spatie gevolgd door de afsluitende NUL-code waarna het bewerker-copyright volgt (zie voorbeeld 3). Als het veld leeg is, wordt het als onbekend beschouwd."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
@@ -3489,79 +3000,48 @@ msgid "Image Resources Block"
 msgstr "Blok met afbeeldingsbronnen"
 
 #: libexif/exif-tag.c:477
-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 ""
-"Een verwijzer naar de Exif IFD. Interoperabiliteit, Exif IFD heeft dezelfde "
-"structuur als die van de IFD opgegeven in TIFF. Normaal gesproken bevat het "
-"echter geen afbeeldingsgegevens, zoals in het geval van TIFF."
+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 "Een verwijzer naar de Exif IFD. Interoperabiliteit, Exif IFD heeft dezelfde structuur als die van de IFD opgegeven in TIFF. Normaal gesproken bevat het echter geen afbeeldingsgegevens, zoals in het geval van TIFF."
 
 #: libexif/exif-tag.c:485
 msgid "Exposure Program"
 msgstr "Belichtingsprogramma"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"De programmaklasse die gebruikt wordt door de camera om de belichting in te "
-"stellen bij het nemen van de foto."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "De programmaklasse die gebruikt wordt door de camera om de belichting in te stellen bij het nemen van de foto."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
 msgstr "Spectrale gevoeligheid"
 
 #: libexif/exif-tag.c:491
-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 ""
-"Geeft de spectrale gevoeligheid van ieder kanaal van de gebruikte camera "
-"aan. De labelwaarde is een ASCII-tekenreeks compatibel met de standaard "
-"zoals die ontwikkeld is door de ASTM Technical Committee."
+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 "Geeft de spectrale gevoeligheid van ieder kanaal van de gebruikte camera aan. De labelwaarde is een ASCII-tekenreeks compatibel met de standaard zoals die ontwikkeld is door de ASTM Technical Committee."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
 msgstr "GPS-informatie IFD Pointer"
 
 #: libexif/exif-tag.c:497
-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 ""
-"Een verwijzer naar de GPS-informatie IFD. De interoperabiliteitsstructuur "
-"van de GPS-informatie IFD, net zoals bij de Exif IFD, bevat geen "
-"afbeeldingsgegevens."
+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 "Een verwijzer naar de GPS-informatie IFD. De interoperabiliteitsstructuur van de GPS-informatie IFD, net zoals bij de Exif IFD, bevat geen afbeeldingsgegevens."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
 msgstr "ISO-snelheidsgetal"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
-"Geeft de ISO-snelheid en ISO-lengtegraad van de camera of het apparaat aan "
-"zoals deze gespecificeerd is in ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Geeft de ISO-snelheid en ISO-lengtegraad van de camera of het apparaat aan zoals deze gespecificeerd is in ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
 msgstr "Opto-electronische conversiefuntie"
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-msgstr ""
-"Geeft de opto-electronische conversiefunctie (OECF) aan gespecificeerd in "
-"ISO 14525. <OECF> betreft de relatie tussen de optische invoer van de camera "
-"en de afbeeldingswaarden."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+msgstr "Geeft de opto-electronische conversiefunctie (OECF) aan gespecificeerd in ISO 14525. <OECF> betreft de relatie tussen de optische invoer van de camera en de afbeeldingswaarden."
 
 #: libexif/exif-tag.c:513
 msgid "Time Zone Offset"
@@ -3576,25 +3056,16 @@ msgid "Exif Version"
 msgstr "Exif-versie"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
-"De versie van deze ondersteunde standaard. Ontbreken van dit veld wordt "
-"geïnterpreteerd als het niet voldoen aan de standaard."
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "De versie van deze ondersteunde standaard. Ontbreken van dit veld wordt geïnterpreteerd als het niet voldoen aan de standaard."
 
 #: libexif/exif-tag.c:520
 msgid "Date and Time (Original)"
 msgstr "Datum en tijdstip (oorspronkelijk)"
 
 #: libexif/exif-tag.c:521
-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 ""
-"De datum en het tijdstip waarop de oorspronkelijke afbeeldingsgegevens zijn "
-"gegenereerd. Voor een digitaal fototoestel wordt de datum en het tijdstip "
-"genomen waarop de foto genomen is."
+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 "De datum en het tijdstip waarop de oorspronkelijke afbeeldingsgegevens zijn gegenereerd. Voor een digitaal fototoestel wordt de datum en het tijdstip genomen waarop de foto genomen is."
 
 #: libexif/exif-tag.c:526
 msgid "Date and Time (Digitized)"
@@ -3602,55 +3073,31 @@ msgstr "Datum en tijdstip (van digitalisatie)"
 
 #: libexif/exif-tag.c:527
 msgid "The date and time when the image was stored as digital data."
-msgstr ""
-"De datum en het tijdstip waarop de opname als digitale gegevens is "
-"opgeslagen. "
+msgstr "De datum en het tijdstip waarop de opname als digitale gegevens is opgeslagen."
 
 #: libexif/exif-tag.c:530
 msgid "Components Configuration"
 msgstr "Configuratie van componenten"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
-"Informatie specifiek voor gecomprimeerde gegevens. De kanalen van iedere "
-"component zijn geordend in de volgorde van de eerste tot de vierde component."
-"Voor niet-gecomprimeerde informatie is de gegevensordening beschreven in het "
-"<PhotometricInterpretation>-label. Echter, omdat <PhotometricInterpretation> "
-"alleen uitgedrukt kan worden in de volgorde van Y, Cb en Cr, wordt dit label "
-"gebruikt voor die gevallen waarin gecomprimeerde gegevens componenten "
-"gebruikt afwijkend van Y, Cb en Cr, en om andere ordeningen te ondersteunen."
+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 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."
+msgstr "Informatie specifiek voor gecomprimeerde gegevens. De kanalen van iedere component zijn geordend in de volgorde van de eerste tot de vierde component.Voor niet-gecomprimeerde informatie is de gegevensordening beschreven in het <PhotometricInterpretation>-label. Echter, omdat <PhotometricInterpretation> alleen uitgedrukt kan worden in de volgorde van Y, Cb en Cr, wordt dit label gebruikt voor die gevallen waarin gecomprimeerde gegevens componenten gebruikt afwijkend van Y, Cb en Cr, en om andere ordeningen te ondersteunen."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
 msgstr "Gecomprimeerde bits per pixel"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
-"Informatie specifiek voor gecomprimeerde gegevens. De compressiemodus die "
-"voor de gecomprimeerde afbeelding wordt gebruikt, heeft de eenheid bits per "
-"pixel."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Informatie specifiek voor gecomprimeerde gegevens. De compressiemodus die voor de gecomprimeerde afbeelding wordt gebruikt, heeft de eenheid bits per pixel."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Sluitertijd"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
-"Sluitersnelheid. De eenheid is de APEX-instelling (Additive System of "
-"Photographic Exposure)."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Sluitersnelheid. De eenheid is de APEX-instelling (Additive System of Photographic Exposure)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
@@ -3661,37 +3108,24 @@ msgid "Brightness"
 msgstr "Helderheid"
 
 #: libexif/exif-tag.c:554
-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 ""
-"De helderheidswaarde. De eenheid is de APEX-waarde. Normaal gesproken valt "
-"dit binnen het bereik van -99.99 tot 99.99."
+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 "De helderheidswaarde. De eenheid is de APEX-waarde. Normaal gesproken valt dit binnen het bereik van -99.99 tot 99.99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
 msgstr "Belichtingscompensatie"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
-"De belichtingscompensatie. De eenheid is de APEX-waarde. Normaal gesproken "
-"ligt dit in het bereik van -99.99 tot 99.99."
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "De belichtingscompensatie. De eenheid is de APEX-waarde. Normaal gesproken ligt dit in het bereik van -99.99 tot 99.99."
 
 #: libexif/exif-tag.c:562
 msgid "Maximum Aperture Value"
 msgstr "Maximale diafragmawaarde"
 
 #: libexif/exif-tag.c:563
-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 ""
-"Het kleinste F-getal van de lens. De eenheid is de APEX-waarde. Normaal "
-"gesproken valt dit in het bereik van 00.00 tot 99.99, maar het is niet tot "
-"dit bereik beperkt."
+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 "Het kleinste F-getal van de lens. De eenheid is de APEX-waarde. Normaal gesproken valt dit in het bereik van 00.00 tot 99.99, maar het is niet tot dit bereik beperkt."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
@@ -3714,31 +3148,20 @@ msgid "The kind of light source."
 msgstr "Het soort lichtbron."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
-msgstr ""
-"Dit label is vastgelegd als de afbeelding is genomen met een flitslicht "
-"(flitser)."
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
+msgstr "Dit label is vastgelegd als de afbeelding is genomen met een flitslicht (flitser)."
 
 #: libexif/exif-tag.c:582
-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 ""
-"De werkelijke brandpuntsafstand van de lens in mm. Conversie naar de "
-"brandpuntsafstand van een 35 mm filmcamera wordt niet gemaakt."
+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 "De werkelijke brandpuntsafstand van de lens in mm. Conversie naar de brandpuntsafstand van een 35 mm filmcamera wordt niet gemaakt."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr "Locatie van het onderwerp"
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
-msgstr ""
-"Dit label geeft de locatie en de gebied van het hoofdonderwerp in de "
-"algehele scene."
+msgid "This tag indicates the location and area of the main subject in the overall scene."
+msgstr "Dit label geeft de locatie en de gebied van het hoofdonderwerp in de algehele scene."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
@@ -3749,58 +3172,16 @@ msgid "Maker Note"
 msgstr "Fabrikantennotitie"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Een label voor de fabrikanten van Exif-schrijvers om iedere gewenste "
-"informatie in op te nemen. De inhoud is de verantwoordelijkheid van de "
-"fabrikant."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Een label voor de fabrikanten van Exif-schrijvers om iedere gewenste informatie in op te nemen. De inhoud is de verantwoordelijkheid van de fabrikant."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
 msgstr "Gebruikerscommentaar"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
-"Een label voor Exif-gebruikers om sleutelwoorden of commentaar over de "
-"afbeelding vast te leggen, naast die in <ImageDescription> en zonder de "
-"beperkingen van de tekencode van het <ImageDescription>-label. De tekencode "
-"die in de <UserComment> wordt gebruikt, wordt vastgesteld gebaseerd op een "
-"ID-code in een vast 8-byte gebied aan het begin van het labelgegevensruimte. "
-"Het ongebruikte deel van deze ruimte wordt gevuld met NUL (\"00.H\"). ID-"
-"codes worden toegekend via registratie. De toewijzingsmethode en refenties "
-"voor iedere tekencode zijn gegeven in de specificatie. De waarde van CountN "
-"is bepaald gebaseerd op de 8 bytes in de tekencoderuimte en het aantal bytes "
-"in het deel van het gebruikerscommentaar. Omdat het TYPE geen ASCII is, is "
-"beëindiging met een NUL niet noodzakelijk. De ID-code voor het <UserComment>-"
-"begied kan een 'Gedefinieerde code' zijn zoals JIS of ASCII, of mag "
-"ongedefinieerd zijn. De ongedefinieerde naam is UndefinedText en de ID-code "
-"is gevuld met 8 bytes van \"NUL\" (\"00.H\"). Een Exif-lezer die het "
-"<UserComment>-label leest moet een functie hebben om de ID-code te bepalen. "
-"Deze functie is niet vereist in Exif-lezers die het <UserComment>-label niet "
-"gebruiken. Als een <UserComment>-ruimte terzijde worden geschoven wordt "
-"aanbevolen dat de ID-code ASCII is en dat het volgende "
-"gebruikerscommentaardeel wordt gevuld met lege tekens [20.H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "Een label voor Exif-gebruikers om sleutelwoorden of commentaar over de afbeelding vast te leggen, naast die in <ImageDescription> en zonder de beperkingen van de tekencode van het <ImageDescription>-label. De tekencode die in de <UserComment> wordt gebruikt, wordt vastgesteld gebaseerd op een ID-code in een vast 8-byte gebied aan het begin van het labelgegevensruimte. Het ongebruikte deel van deze ruimte wordt gevuld met NUL (\"00.H\"). ID-codes worden toegekend via registratie. De toewijzingsmethode en refenties voor iedere tekencode zijn gegeven in de specificatie. De waarde van CountN is bepaald gebaseerd op de 8 bytes in de tekencoderuimte en het aantal bytes in het deel van het gebruikerscommentaar. Omdat het TYPE geen ASCII is, is beëindiging met een NUL niet noodzakelijk. De ID-code voor het <UserComment>-begied kan een 'Gedefinieerde code' zijn zoals JIS of ASCII, of mag ongedefinieerd zijn. De ongedefinieerde naam is UndefinedText en de ID-code is gevuld met 8 bytes van \"NUL\" (\"00.H\"). Een Exif-lezer die het <UserComment>-label leest moet een functie hebben om de ID-code te bepalen. Deze functie is niet vereist in Exif-lezers die het <UserComment>-label niet gebruiken. Als een <UserComment>-ruimte terzijde worden geschoven wordt aanbevolen dat de ID-code ASCII is en dat het volgende gebruikerscommentaardeel wordt gevuld met lege tekens [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
@@ -3808,31 +3189,23 @@ msgstr "Deelsecondetijd"
 
 #: libexif/exif-tag.c:620
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
-msgstr ""
-"Een label voor het vastleggen van fracties van seconden voor het <DateTime>-"
-"label."
+msgstr "Een label voor het vastleggen van fracties van seconden voor het <DateTime>-label."
 
 #: libexif/exif-tag.c:624
 msgid "Sub-second Time (Original)"
 msgstr "Datum en tijdstip (oorspronkelijk)"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
-msgstr ""
-"Een label voor het vastleggen van fracties van seconden voor het "
-"<DateTimeOriginal>-label."
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr "Een label voor het vastleggen van fracties van seconden voor het <DateTimeOriginal>-label."
 
 #: libexif/exif-tag.c:629
 msgid "Sub-second Time (Digitized)"
 msgstr "Datum en tijdstip (van digitalisatie)"
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
-msgstr ""
-"Een label voor het vastleggen van fracties van seconden voor het "
-"<DateTimeDigitized>-label."
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr "Een label voor het vastleggen van fracties van seconden voor het <DateTimeDigitized>-label."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
@@ -3847,34 +3220,24 @@ msgid "XP Comment"
 msgstr "XP-commentaar"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
-msgstr ""
-"Een tekenreeks met een opmerking over de afbeelding, in UTF-16LE gecodeerd."
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
+msgstr "Een tekenreeks met een opmerking over de afbeelding, in UTF-16LE gecodeerd."
 
 #: libexif/exif-tag.c:644
 msgid "XP Author"
 msgstr "XP-auteur"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
-msgstr ""
-"Een tekenreeks met de naam van de maker van de afbeelding, in UTF-16LE "
-"gecodeerd."
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
+msgstr "Een tekenreeks met de naam van de maker van de afbeelding, in UTF-16LE gecodeerd."
 
 #: libexif/exif-tag.c:649
 msgid "XP Keywords"
 msgstr "XP-sleutelwoorden"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
-"Een tekenreeks met sleutelwoorden die de afbeelding beschrijven, in UTF-16LE "
-"gecodeerd."
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "Een tekenreeks met sleutelwoorden die de afbeelding beschrijven, in UTF-16LE gecodeerd."
 
 #: libexif/exif-tag.c:654
 msgid "XP Subject"
@@ -3882,8 +3245,7 @@ msgstr "XP-onderwerp"
 
 #: libexif/exif-tag.c:655
 msgid "A character string giving the image subject, encoded in UTF-16LE."
-msgstr ""
-"Een tekenreeks met het onderwerp van de afbeelding, in UTF-16LE gecodeerd."
+msgstr "Een tekenreeks met het onderwerp van de afbeelding, in UTF-16LE gecodeerd."
 
 #: libexif/exif-tag.c:659
 msgid "The FlashPix format version supported by a FPXR file."
@@ -3894,221 +3256,96 @@ msgid "Color Space"
 msgstr "Kleurruimte"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
-"De kleurruimte-informatielabel is altijd vastgelegd als de "
-"kleurruimtespecificatie. Normaal wordt sRGB (=1) gebruikt om de kleurruimte "
-"te definiëren gebaseerd op de condities van het PC-beeldscherm en de "
-"omgeving. Als een andere kleurruimte dan sRGB wordt gebruikt, wordt "
-"ongecalibreerd (=FFFF.H) ingesteld. Afbeeldingsgegevens vastgelegd als "
-"ongecalibreerd kunnen worden behandeld als sRGB als deze is geconverteerd "
-"naar FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "De kleurruimte-informatielabel is altijd vastgelegd als de kleurruimtespecificatie. Normaal wordt sRGB (=1) gebruikt om de kleurruimte te definiëren gebaseerd op de condities van het PC-beeldscherm en de omgeving. Als een andere kleurruimte dan sRGB wordt gebruikt, wordt ongecalibreerd (=FFFF.H) ingesteld. Afbeeldingsgegevens vastgelegd als ongecalibreerd kunnen worden behandeld als sRGB als deze is geconverteerd naar FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
 msgstr "X-afmeting pixel"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
-"Informatie specifiek voor gecomprimeerde gegevens. Als een gecomprimeerd "
-"bestand is vastgelegd, moet de geldige breedte van de betekenisvolle "
-"afbeelding opgenomen worden in dit label, onafhankelijk of er opvulgegevens "
-"zijn of een herstart-aanduiding. Dit label moet niet bestaan in een "
-"ongecomprimeerd bestand."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Informatie specifiek voor gecomprimeerde gegevens. Als een gecomprimeerd bestand is vastgelegd, moet de geldige breedte van de betekenisvolle afbeelding opgenomen worden in dit label, onafhankelijk of er opvulgegevens zijn of een herstart-aanduiding. Dit label moet niet bestaan in een ongecomprimeerd bestand."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
 msgstr "Y-afmeting pixel"
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
-"Informatie specifiek voor gecomprimeerde gegevens. Als een gecomprimeerd "
-"bestand is vastgelegd, moet de geldige hoogte van de betekenisvolle "
-"afbeelding opgenomen worden in dit label, onafhankelijk of er opvulgegevens "
-"zijn of een herstart-aanduiding. Dit label moet niet bestaan in een "
-"ongecomprimeerd bestand. Omdat opvulgegevens niet nodig zijn in de vertikale "
-"richting, is het aantal regels in dit label van geldige afbeeldingshoogte "
-"gelijk aan die vastgelegd in de SOF."
+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, 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."
+msgstr "Informatie specifiek voor gecomprimeerde gegevens. Als een gecomprimeerd bestand is vastgelegd, moet de geldige hoogte van de betekenisvolle afbeelding opgenomen worden in dit label, onafhankelijk of er opvulgegevens zijn of een herstart-aanduiding. Dit label moet niet bestaan in een ongecomprimeerd bestand. Omdat opvulgegevens niet nodig zijn in de vertikale richting, is het aantal regels in dit label van geldige afbeeldingshoogte gelijk aan die vastgelegd in de SOF."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
 msgstr "Bijbehorend geluidsbestand"
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
-"Dit label is gebruikt om de naam van een geluidsbestand vast te leggen die "
-"gerelateerd is aan de afbeeldingsgegevens. De enige relationele informatie "
-"die hier wordt vastgelegd is de naam en extentie van het Exif-geluidsbestand "
-"(een ASCII-tekenreeks bestaande uit 8 tekens + '.' + 3 tekens). Het pad is "
-"niet opgeslagen. Voorwaarden voor geluid worden gegeven in paragraaf 3.6.3. "
-"Conventies van bestandsnamen staan in paragraaf 3.7.1. Als dit label wordt "
-"gebruikt, dan moeten geluidsbestanden opgenomen worden in overeenstemming "
-"met het Exif-geluidspatroon. Het afbeelden van Exif-afbeeldingsbestanden en "
-"geluidsbestanden is uitgevoerd op ieder van de drie wijzen zoals aangeduid "
-"in tabel 8. Als meerdere bestanden afgebeeld worden op een bestand zoals in "
-"[2] of [3] van deze tabel, dan wordt het bovenstaande patroon gebruikt om "
-"slechts één Exif-geluidsbestand op te nemen. Als er drie Exif-"
-"geluidsbestanden zijn \"SND00001.WAV\", \"SND00002.WAV\" en \"SND00003.WAV\" "
-"dan wordt de Exif-afbeeldingsnaam voor eenieder \"DSC00001.JPG\", zoals "
-"aangegeven. Door het combineren van meerdere, relationele informatie kan een "
-"variëteit aan afspeelmogelijkheiden worden ondersteund. De methode om "
-"relationele informatie te gebruiken wordt overgelaten aan de implementatie "
-"aan de afspeelzijde. Omdat deze informatie uit ASCII-tekenreeksen bestaat, "
-"wordt deze beëndigd door NUL. Als dit label gebruikt wordt om "
-"geluidsbestanden af te beelden, dan moet de relatie tussen het "
-"geluidsbestand en de afbeeldingsgegevens ook aangegeven worden op het einde "
-"van het geluidsbestand."
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Dit label is gebruikt om de naam van een geluidsbestand vast te leggen die gerelateerd is aan de afbeeldingsgegevens. De enige relationele informatie die hier wordt vastgelegd is de naam en extentie van het Exif-geluidsbestand (een ASCII-tekenreeks bestaande uit 8 tekens + '.' + 3 tekens). Het pad is niet opgeslagen. Voorwaarden voor geluid worden gegeven in paragraaf 3.6.3. Conventies van bestandsnamen staan in paragraaf 3.7.1. Als dit label wordt gebruikt, dan moeten geluidsbestanden opgenomen worden in overeenstemming met het Exif-geluidspatroon. Het afbeelden van Exif-afbeeldingsbestanden en geluidsbestanden is uitgevoerd op ieder van de drie wijzen zoals aangeduid in tabel 8. Als meerdere bestanden afgebeeld worden op een bestand zoals in [2] of [3] van deze tabel, dan wordt het bovenstaande patroon gebruikt om slechts één Exif-geluidsbestand op te nemen. Als er drie Exif-geluidsbestanden zijn \"SND00001.WAV\", \"SND00002.WAV\" en \"SND00003.WAV\" dan wordt de Exif-afbeeldingsnaam voor eenieder \"DSC00001.JPG\", zoals aangegeven. Door het combineren van meerdere, relationele informatie kan een variëteit aan afspeelmogelijkheiden worden ondersteund. De methode om relationele informatie te gebruiken wordt overgelaten aan de implementatie aan de afspeelzijde. Omdat deze informatie uit ASCII-tekenreeksen bestaat, wordt deze beëndigd door NUL. Als dit label gebruikt wordt om geluidsbestanden af te beelden, dan moet de relatie tussen het geluidsbestand en de afbeeldingsgegevens ook aangegeven worden op het einde van het geluidsbestand."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
 msgstr "Interoperabiliteit IFD Pointer"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
-"Interoperabiliteit IFD is samengesteld door labels die informatie bevatten "
-"om deze interoperabiliteit te waarborgen en verwijst naar de volgende label "
-"opgeslagen in Exif IFD. De structuur van interoperabiliteit van "
-"Interoperabiliteit IFD is gelijk aan TIFF-gedefinieerde IFD-structuur, maar "
-"bevat geen afbeeldingsgegevens karakteristiek vergeleken met normale TIFF "
-"IFD. "
+msgid "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."
+msgstr "Interoperabiliteit IFD is samengesteld door labels die informatie bevatten om deze interoperabiliteit te waarborgen en verwijst naar de volgende label opgeslagen in Exif IFD. De structuur van interoperabiliteit van Interoperabiliteit IFD is gelijk aan TIFF-gedefinieerde IFD-structuur, maar bevat geen afbeeldingsgegevens karakteristiek vergeleken met normale TIFF IFD."
 
 #: libexif/exif-tag.c:729
 msgid "Flash Energy"
 msgstr "Flitsenergie"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
-"Geeft de flitsenergie aan op het moment dat de afbeelding is geschoten, "
-"gemeten in Bean Candle Power Seconds (BCPS)"
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Geeft de flitsenergie aan op het moment dat de afbeelding is geschoten, gemeten in Bean Candle Power Seconds (BCPS)"
 
 #: libexif/exif-tag.c:734
 msgid "Spatial Frequency Response"
 msgstr "Ruimtelijke frequentierespons"
 
 #: libexif/exif-tag.c:735
-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 ""
-"Dit label legt de ruimtelijke frequentietabel van de camera of "
-"invoerapparaat vast en de SFR-waarden in de richting van de "
-"afbeeldingsbreedte, afbeeldingshoogte en de diagonale richting, zoals "
-"beschreven in ISO 12233."
+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 "Dit label legt de ruimtelijke frequentietabel van de camera of invoerapparaat vast en de SFR-waarden in de richting van de afbeeldingsbreedte, afbeeldingshoogte en de diagonale richting, zoals beschreven in ISO 12233."
 
 #: libexif/exif-tag.c:741
 msgid "Focal Plane X-Resolution"
 msgstr "Brandpuntsvlak x-resolutie"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Geeft het aantal pixels in de richting van de afbeeldingsbreedte (X) per "
-"<FocalPlaneResolutionUnit> op het camera brandpuntsvlak"
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Geeft het aantal pixels in de richting van de afbeeldingsbreedte (X) per <FocalPlaneResolutionUnit> op het camera brandpuntsvlak"
 
 #: libexif/exif-tag.c:746
 msgid "Focal Plane Y-Resolution"
 msgstr "Brandpuntsvlak x-resolutie"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Geeft het aantal pixels in de richting van de afbeeldingshoogte (V) per "
-"<FocalPlaneResolutionUnit> op het camera brandpuntsvlak"
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Geeft het aantal pixels in de richting van de afbeeldingshoogte (V) per <FocalPlaneResolutionUnit> op het camera brandpuntsvlak"
 
 #: libexif/exif-tag.c:751
 msgid "Focal Plane Resolution Unit"
 msgstr "Resolutieeenheid brandpuntsvlak"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
-"Geeft een meeteenheid van <FocalPlaneXResolution> en "
-"<FocalPlaneYResolution>. Deze waarde is gelijk aan de <ResolutionUnit>."
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Geeft een meeteenheid van <FocalPlaneXResolution> en <FocalPlaneYResolution>. Deze waarde is gelijk aan de <ResolutionUnit>."
 
 #: libexif/exif-tag.c:757
 msgid "Subject Location"
 msgstr "Locatie van het onderwerp"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
-"Geeft de locatie van het hoofdonderwerp in de scene. De waarde van dit label "
-"representeert de pixel in het midden van het hoofdonderwerp relatief tot de "
-"linker rand, voordat een rotatie volgens het <Rotation>-label wordt "
-"uitgevoerd. De eerste waarde staat voor het X-kolomnummer en de tweede voor "
-"het Y-kolomnummer."
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Geeft de locatie van het hoofdonderwerp in de scene. De waarde van dit label representeert de pixel in het midden van het hoofdonderwerp relatief tot de linker rand, voordat een rotatie volgens het <Rotation>-label wordt uitgevoerd. De eerste waarde staat voor het X-kolomnummer en de tweede voor het Y-kolomnummer."
 
 #: libexif/exif-tag.c:765
 msgid "Exposure Index"
 msgstr "Belichtingsgetal"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
-msgstr ""
-"Geeft het belichtingsgetal aan zoals dat geselecteerd is op de camera of "
-"apparaat op het moment dat de afbeelding genomen is."
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Geeft het belichtingsgetal aan zoals dat geselecteerd is op de camera of apparaat op het moment dat de afbeelding genomen is."
 
 #: libexif/exif-tag.c:769
 msgid "Sensing Method"
@@ -4116,58 +3353,35 @@ msgstr "Waarnemingsmethode"
 
 #: libexif/exif-tag.c:770
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr ""
-"Geeft het soort afbeeldingssensor weer op de camera of het invoerapparaat"
+msgstr "Geeft het soort afbeeldingssensor weer op de camera of het invoerapparaat"
 
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Bestandsbron"
 
 #: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"Geeft de afbeeldingsbron aan. Als de afbeelding met een DSC genomen is, "
-"heeft dit label altijd de waarde 3."
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Geeft de afbeeldingsbron aan. Als de afbeelding met een DSC genomen is, heeft dit label altijd de waarde 3."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
 msgstr "Soort scène"
 
 #: libexif/exif-tag.c:779
-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 ""
-"Geeft het soort scene aan. Als de afbeelding met een DSC genomen is, moet de "
-"waarde van dit label altijd 1 bedragen, wat betekent dat de afbeelding "
-"direct gefotografeerd is."
+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 "Geeft het soort scene aan. Als de afbeelding met een DSC genomen is, moet de waarde van dit label altijd 1 bedragen, wat betekent dat de afbeelding direct gefotografeerd is."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
 msgstr "Handmatig gerenderd"
 
 #: libexif/exif-tag.c:790
-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 ""
-"Dit label toont het gebruik van speciale bewerkingen op afbeeldingsgegevens, "
-"zoals verzadiging van de weergave. Bij het uitvoeren van speciale "
-"bewerkingen wordt ervan uitgegaan dat de lezer geen of minimale nabewerking "
-"uitvoert."
+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 "Dit label toont het gebruik van speciale bewerkingen op afbeeldingsgegevens, zoals verzadiging van de weergave. Bij het uitvoeren van speciale bewerkingen wordt ervan uitgegaan dat de lezer geen of minimale nabewerking uitvoert."
 
 #: libexif/exif-tag.c:796
-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 ""
-"Dit label toont de belichtingsmodus op het moment van opname. In auto-"
-"bracketing modus neemt de camera een aantal opnamen van dezelfde scene met "
-"verschillende belichtingsinstellingen."
+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 "Dit label toont de belichtingsmodus op het moment van opname. In auto-bracketing modus neemt de camera een aantal opnamen van dezelfde scene met verschillende belichtingsinstellingen."
 
 #: libexif/exif-tag.c:801
 msgid "This tag indicates the white balance mode set when the image was shot."
@@ -4178,41 +3392,24 @@ msgid "Digital Zoom Ratio"
 msgstr "Digitale zoomverhouding"
 
 #: libexif/exif-tag.c:806
-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 ""
-"Dit label toont de digitale zoom op het moment van opname. Als de noemer van "
-"de vastgelegde waarde 0 is, dan is deze functie niet gebruikt."
+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 "Dit label toont de digitale zoom op het moment van opname. Als de noemer van de vastgelegde waarde 0 is, dan is deze functie niet gebruikt."
 
 #: libexif/exif-tag.c:811
 msgid "Focal Length in 35mm Film"
-msgstr "Brandpuntsafstand bij 35mm-film "
+msgstr "Brandpuntsafstand bij 35mm-film"
 
 #: libexif/exif-tag.c:812
-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 ""
-"Dit label toont de brandpuntsafstand vergelijkbaar met een 35mm-filmcamera, "
-"uitgedrukt in mm. De waarde 0 betekent dat deze onbekend is. Let op het "
-"verschil met het label Brandpuntsafstand."
+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 "Dit label toont de brandpuntsafstand vergelijkbaar met een 35mm-filmcamera, uitgedrukt in mm. De waarde 0 betekent dat deze onbekend is. Let op het verschil met het label Brandpuntsafstand."
 
 #: libexif/exif-tag.c:818
 msgid "Scene Capture Type"
 msgstr "Opnametype van scène"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
-"Dit label toont het soort scene van de opname. Het kan ook gebruikt worden "
-"voor de modus waarin de opname is gemaakt. Let op het verschil met het label "
-"scenetype <SceneType>."
+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 scene type <SceneType> tag."
+msgstr "Dit label toont het soort scene van de opname. Het kan ook gebruikt worden voor de modus waarin de opname is gemaakt. Let op het verschil met het label scenetype <SceneType>."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
@@ -4223,42 +3420,24 @@ msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "Dit label toont de algemene versterkingsinstelling voor afbeeldingen."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Dit label toont de richting van contrastbewerking door de camera tijdens de "
-"opname."
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Dit label toont de richting van contrastbewerking door de camera tijdens de opname."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Dit label toont de richting van verzadigingsbewerking door de camera tijdens "
-"de opname."
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Dit label toont de richting van verzadigingsbewerking door de camera tijdens de opname."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Dit label toont de richting van scherptebewerking door de camera tijdens de "
-"opname."
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Dit label toont de richting van scherptebewerking door de camera tijdens de opname."
 
 #: libexif/exif-tag.c:841
 msgid "Device Setting Description"
 msgstr "Beschrijving van apparaatinstellingen"
 
 #: libexif/exif-tag.c:842
-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 ""
-"Dit label toont informatie over de opnamecondities van een bepaald "
-"cameramodel. Het label wordt alleen gebruikt voor de weergave van de "
-"opnamecondities in de lezer."
+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 "Dit label toont informatie over de opnamecondities van een bepaald cameramodel. Het label wordt alleen gebruikt voor de weergave van de opnamecondities in de lezer."
 
 #: libexif/exif-tag.c:848
 msgid "Subject Distance Range"
@@ -4273,14 +3452,8 @@ msgid "Image Unique ID"
 msgstr "Unieke afbeeldings-ID"
 
 #: libexif/exif-tag.c:852
-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 ""
-"Dit label toont een unieke code toegewezen aan iedere afbeelding. Het wordt "
-"opgeslagen als een ASCII-tekenreeks vergelijkbaar met hexidecimale notatie "
-"en met een vaste lengte van 128-bit."
+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 "Dit label toont een unieke code toegewezen aan iedere afbeelding. Het wordt opgeslagen als een ASCII-tekenreeks vergelijkbaar met hexidecimale notatie en met een vaste lengte van 128-bit."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
@@ -4303,17 +3476,8 @@ msgid "Padding"
 msgstr "Padding"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
-"Dit label reserveert ruimte waar later aanspraak op gemaakt kan worden voor "
-"aanvullende metagegevens. Nieuwe metagegevens kunnen worden opgeslagen door "
-"dit label te vervangen door een kleiner gegevenselement en door de "
-"gereserveerde ruimte te gebruiken voor de opslag van nieuwe of uitgebreide "
-"metagegevenslabels."
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Dit label reserveert ruimte waar later aanspraak op gemaakt kan worden voor aanvullende metagegevens. Nieuwe metagegevens kunnen worden opgeslagen door dit label te vervangen door een kleiner gegevenselement en door de gereserveerde ruimte te gebruiken voor de opslag van nieuwe of uitgebreide metagegevenslabels."
 
 #: libexif/fuji/mnote-fuji-entry.c:62
 msgid "Softest"
@@ -4597,441 +3761,441 @@ msgstr "Beeldnummer"
 msgid "Invalid format '%s', expected '%s' or '%s'."
 msgstr "Ongeldige structuur '%s', verwacht '%s' of '%s'."
 
-#: libexif/olympus/mnote-olympus-entry.c:92
+#: libexif/olympus/mnote-olympus-entry.c:89
 msgid "AF non D lens"
 msgstr "AF-non-D lens"
 
-#: libexif/olympus/mnote-olympus-entry.c:94
+#: libexif/olympus/mnote-olympus-entry.c:91
 msgid "AF-D or AF-S lens"
 msgstr "AF-D of AF-S lens"
 
-#: libexif/olympus/mnote-olympus-entry.c:95
+#: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF-D G lens"
 msgstr "AF-D G lens"
 
-#: libexif/olympus/mnote-olympus-entry.c:96
+#: libexif/olympus/mnote-olympus-entry.c:93
 msgid "AF-D VR lens"
 msgstr "AF-D VR lens"
 
-#: libexif/olympus/mnote-olympus-entry.c:97
+#: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D G VR lens"
 msgstr "AF-D VR lens"
 
-#: libexif/olympus/mnote-olympus-entry.c:101
+#: libexif/olympus/mnote-olympus-entry.c:98
 msgid "Flash unit unknown"
 msgstr "Flitser onbekend"
 
-#: libexif/olympus/mnote-olympus-entry.c:102
+#: libexif/olympus/mnote-olympus-entry.c:99
 msgid "Flash is external"
 msgstr "Externe flitser"
 
-#: libexif/olympus/mnote-olympus-entry.c:103
+#: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash is on camera"
 msgstr "Interne flitser"
 
-#: libexif/olympus/mnote-olympus-entry.c:106
+#: libexif/olympus/mnote-olympus-entry.c:103
 msgid "VGA basic"
 msgstr "VGA-basis"
 
-#: libexif/olympus/mnote-olympus-entry.c:107
+#: libexif/olympus/mnote-olympus-entry.c:104
 msgid "VGA normal"
 msgstr "VGA-normaal"
 
-#: libexif/olympus/mnote-olympus-entry.c:108
+#: libexif/olympus/mnote-olympus-entry.c:105
 msgid "VGA fine"
 msgstr "VGA-fijn"
 
-#: libexif/olympus/mnote-olympus-entry.c:109
+#: libexif/olympus/mnote-olympus-entry.c:106
 msgid "SXGA basic"
 msgstr "SXGA-basis"
 
-#: libexif/olympus/mnote-olympus-entry.c:110
+#: libexif/olympus/mnote-olympus-entry.c:107
 msgid "SXGA normal"
 msgstr "SXGA-normaal"
 
-#: libexif/olympus/mnote-olympus-entry.c:111
+#: libexif/olympus/mnote-olympus-entry.c:108
 msgid "SXGA fine"
 msgstr "SXGA-fijn"
 
-#: libexif/olympus/mnote-olympus-entry.c:112
+#: libexif/olympus/mnote-olympus-entry.c:109
 msgid "2 Mpixel basic"
 msgstr "2 MPixel-basis"
 
-#: libexif/olympus/mnote-olympus-entry.c:113
+#: libexif/olympus/mnote-olympus-entry.c:110
 msgid "2 Mpixel normal"
 msgstr "2 MPixel-normaal"
 
-#: libexif/olympus/mnote-olympus-entry.c:114
+#: libexif/olympus/mnote-olympus-entry.c:111
 msgid "2 Mpixel fine"
 msgstr "2 MPixel-fijn"
 
-#: libexif/olympus/mnote-olympus-entry.c:117
+#: libexif/olympus/mnote-olympus-entry.c:114
 msgid "Color"
 msgstr "Kleur"
 
-#: libexif/olympus/mnote-olympus-entry.c:122
+#: libexif/olympus/mnote-olympus-entry.c:119
 msgid "Bright+"
 msgstr "Helderheid+"
 
-#: libexif/olympus/mnote-olympus-entry.c:123
+#: libexif/olympus/mnote-olympus-entry.c:120
 msgid "Bright-"
 msgstr "Helderheid-"
 
-#: libexif/olympus/mnote-olympus-entry.c:124
+#: libexif/olympus/mnote-olympus-entry.c:121
 msgid "Contrast+"
 msgstr "Contrast+"
 
-#: libexif/olympus/mnote-olympus-entry.c:125
+#: libexif/olympus/mnote-olympus-entry.c:122
 msgid "Contrast-"
 msgstr "Contrast-"
 
-#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:125
 msgid "ISO 80"
 msgstr "ISO 80"
 
-#: libexif/olympus/mnote-olympus-entry.c:129
+#: libexif/olympus/mnote-olympus-entry.c:126
 msgid "ISO 160"
 msgstr "ISO 160"
 
-#: libexif/olympus/mnote-olympus-entry.c:130
+#: libexif/olympus/mnote-olympus-entry.c:127
 msgid "ISO 320"
 msgstr "ISO 320"
 
-#: libexif/olympus/mnote-olympus-entry.c:131
-#: libexif/olympus/mnote-olympus-entry.c:249
+#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:246
 msgid "ISO 100"
 msgstr "ISO 100"
 
-#: libexif/olympus/mnote-olympus-entry.c:135
+#: libexif/olympus/mnote-olympus-entry.c:132
 msgid "Preset"
 msgstr "Voorinstelling"
 
-#: libexif/olympus/mnote-olympus-entry.c:137
+#: libexif/olympus/mnote-olympus-entry.c:134
 msgid "Incandescence"
 msgstr "Gloeien"
 
-#: libexif/olympus/mnote-olympus-entry.c:138
+#: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Fluorescence"
 msgstr "TL-licht"
 
-#: libexif/olympus/mnote-olympus-entry.c:140
+#: libexif/olympus/mnote-olympus-entry.c:137
 msgid "SpeedLight"
 msgstr "SpeedLight"
 
-#: libexif/olympus/mnote-olympus-entry.c:143
+#: libexif/olympus/mnote-olympus-entry.c:140
 msgid "No fisheye"
 msgstr "Geen vissenoog"
 
-#: libexif/olympus/mnote-olympus-entry.c:144
+#: libexif/olympus/mnote-olympus-entry.c:141
 msgid "Fisheye on"
 msgstr "Vissenoog ingeschakeld"
 
-#: libexif/olympus/mnote-olympus-entry.c:147
+#: libexif/olympus/mnote-olympus-entry.c:144
 msgid "Normal, SQ"
 msgstr "Normaal, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:148
+#: libexif/olympus/mnote-olympus-entry.c:145
 msgid "Normal, HQ"
 msgstr "Normaal, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:149
+#: libexif/olympus/mnote-olympus-entry.c:146
 msgid "Normal, SHQ"
 msgstr "Normaal, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:150
+#: libexif/olympus/mnote-olympus-entry.c:147
 msgid "Normal, RAW"
 msgstr "Normaal, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:151
+#: libexif/olympus/mnote-olympus-entry.c:148
 msgid "Normal, SQ1"
 msgstr "Normaal, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:152
+#: libexif/olympus/mnote-olympus-entry.c:149
 msgid "Normal, SQ2"
 msgstr "Normaal, SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:153
+#: libexif/olympus/mnote-olympus-entry.c:150
 msgid "Normal, super high"
 msgstr "Normaal, super hoog"
 
-#: libexif/olympus/mnote-olympus-entry.c:154
+#: libexif/olympus/mnote-olympus-entry.c:151
 msgid "Normal, standard"
 msgstr "Normaal, standaard"
 
-#: libexif/olympus/mnote-olympus-entry.c:155
+#: libexif/olympus/mnote-olympus-entry.c:152
 msgid "Fine, SQ"
 msgstr "Fijn, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:156
+#: libexif/olympus/mnote-olympus-entry.c:153
 msgid "Fine, HQ"
 msgstr "Fijn, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:157
+#: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Fine, SHQ"
 msgstr "Fijn, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:158
+#: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, RAW"
 msgstr "Fijn, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:159
+#: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, SQ1"
 msgstr "Fijn, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:160
+#: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SQ2"
 msgstr "Fijn, SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:161
+#: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, super high"
 msgstr "Fijn, super hoog"
 
-#: libexif/olympus/mnote-olympus-entry.c:162
+#: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Super fine, SQ"
 msgstr "Zeer fijn, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:163
+#: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Super fine, HQ"
 msgstr "Zeer fijn, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:164
+#: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Super fine, SHQ"
 msgstr "Zeer fijn, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:165
+#: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, RAW"
 msgstr "Zeer fijn, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:166
+#: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, SQ1"
 msgstr "Zeer fijn, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:167
+#: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SQ2"
 msgstr "Zeer fijn, SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:168
+#: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, super high"
 msgstr "Super fijn, super hoog"
 
-#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, high"
 msgstr "Zeer fijn, hoog"
 
-#: libexif/olympus/mnote-olympus-entry.c:172
-#: libexif/olympus/mnote-olympus-entry.c:177
-#: libexif/olympus/mnote-olympus-entry.c:211
-#: libexif/olympus/mnote-olympus-entry.c:220
-#: libexif/olympus/mnote-olympus-entry.c:243
+#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:240
 msgid "No"
 msgstr "Nee"
 
-#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:180
 msgid "On (Preset)"
 msgstr "Ingeschakeld (Voorinstelling)"
 
-#: libexif/olympus/mnote-olympus-entry.c:188
+#: libexif/olympus/mnote-olympus-entry.c:185
 msgid "Fill"
 msgstr "Vullen"
 
-#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:192
 msgid "Internal + external"
 msgstr "Intern + extern"
 
-#: libexif/olympus/mnote-olympus-entry.c:224
+#: libexif/olympus/mnote-olympus-entry.c:221
 msgid "Interlaced"
 msgstr "Interlaced"
 
-#: libexif/olympus/mnote-olympus-entry.c:225
+#: libexif/olympus/mnote-olympus-entry.c:222
 msgid "Progressive"
 msgstr "Progressief"
 
-#: libexif/olympus/mnote-olympus-entry.c:231
+#: libexif/olympus/mnote-olympus-entry.c:228
 #: libexif/pentax/mnote-pentax-entry.c:85
 #: libexif/pentax/mnote-pentax-entry.c:139
 msgid "Best"
 msgstr "Best"
 
-#: libexif/olympus/mnote-olympus-entry.c:232
+#: libexif/olympus/mnote-olympus-entry.c:229
 msgid "Adjust exposure"
 msgstr "Belichting instellen"
 
-#: libexif/olympus/mnote-olympus-entry.c:235
+#: libexif/olympus/mnote-olympus-entry.c:232
 msgid "Spot focus"
 msgstr "Puntscherpstelling"
 
-#: libexif/olympus/mnote-olympus-entry.c:236
+#: libexif/olympus/mnote-olympus-entry.c:233
 msgid "Normal focus"
 msgstr "Normale scherpstelling"
 
-#: libexif/olympus/mnote-olympus-entry.c:239
+#: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Record while down"
 msgstr "Opname tijdens neergang"
 
-#: libexif/olympus/mnote-olympus-entry.c:240
+#: libexif/olympus/mnote-olympus-entry.c:237
 msgid "Press start, press stop"
 msgstr "Druk op start, druk op stop"
 
-#: libexif/olympus/mnote-olympus-entry.c:248
+#: libexif/olympus/mnote-olympus-entry.c:245
 msgid "ISO 50"
 msgstr "ISO 50"
 
-#: libexif/olympus/mnote-olympus-entry.c:250
+#: libexif/olympus/mnote-olympus-entry.c:247
 msgid "ISO 200"
 msgstr "ISO 200"
 
-#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 400"
 msgstr "ISO 400"
 
-#: libexif/olympus/mnote-olympus-entry.c:255
+#: libexif/olympus/mnote-olympus-entry.c:252
 #: libexif/pentax/mnote-pentax-entry.c:168
 msgid "Sport"
 msgstr "Sport"
 
-#: libexif/olympus/mnote-olympus-entry.c:256
+#: libexif/olympus/mnote-olympus-entry.c:253
 msgid "TV"
 msgstr "Tijdwaarde"
 
-#: libexif/olympus/mnote-olympus-entry.c:258
+#: libexif/olympus/mnote-olympus-entry.c:255
 msgid "User 1"
 msgstr "Gebruiker 1"
 
-#: libexif/olympus/mnote-olympus-entry.c:259
+#: libexif/olympus/mnote-olympus-entry.c:256
 msgid "User 2"
 msgstr "Gebruiker 2"
 
-#: libexif/olympus/mnote-olympus-entry.c:260
+#: libexif/olympus/mnote-olympus-entry.c:257
 msgid "Lamp"
 msgstr "Lamp"
 
-#: libexif/olympus/mnote-olympus-entry.c:263
+#: libexif/olympus/mnote-olympus-entry.c:260
 msgid "5 frames/sec"
 msgstr "5 beelden/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:264
+#: libexif/olympus/mnote-olympus-entry.c:261
 msgid "10 frames/sec"
 msgstr "10 beelden/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:265
+#: libexif/olympus/mnote-olympus-entry.c:262
 msgid "15 frames/sec"
 msgstr "15 beelden/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:266
+#: libexif/olympus/mnote-olympus-entry.c:263
 msgid "20 frames/sec"
 msgstr "20 beelden/sec"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:375
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "Roodcorrectie %f, blauwcorrectie %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
-msgid "No manual focus selection"
-msgstr "Geen handmatige scherpstelling mogelijk"
-
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:383
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f meters"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:385
+msgid "No manual focus selection"
+msgstr "Geen handmatige scherpstelling mogelijk"
+
+#: libexif/olympus/mnote-olympus-entry.c:411
 msgid "AF position: center"
 msgstr "AF-positie: centrum"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:412
 msgid "AF position: top"
 msgstr "AF-positie: bovenzijde"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:413
 msgid "AF position: bottom"
 msgstr "AF-positie: onderzijde"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:414
 msgid "AF position: left"
 msgstr "AF-positie: links"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:415
 msgid "AF position: right"
 msgstr "AF-positie: rechts"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:416
 msgid "AF position: upper-left"
 msgstr "AF-positie: linksboven"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:417
 msgid "AF position: upper-right"
 msgstr "AF-positie: rechtsboven"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: lower-left"
 msgstr "AF-positie: linksonder"
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: lower-right"
 msgstr "AF-positie: rechtsonder"
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: far left"
 msgstr "AF-positie: uiterst links"
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: far right"
 msgstr "AF-positie: uiterst rechts"
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "Unknown AF position"
 msgstr "Onbekende AF-positie"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:433
+#: libexif/olympus/mnote-olympus-entry.c:503
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Interne fout (onbekende waarde %hi)."
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:441
+#: libexif/olympus/mnote-olympus-entry.c:511
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Onbekende waarde %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:536
+#: libexif/olympus/mnote-olympus-entry.c:556
 #, c-format
 msgid "Unknown %hu"
 msgstr "Onbekend %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:553
 msgid "2 sec."
 msgstr "2 sec."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:592
 msgid "Fast"
 msgstr "snel"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:696
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:726
 #, c-format
 msgid "Manual: %liK"
 msgstr "Handmatig: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:729
 msgid "Manual: unknown"
 msgstr "Handmatig: onbekend"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:735
 msgid "One-touch"
 msgstr "Direct"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:791
+#: libexif/olympus/mnote-olympus-entry.c:801
 msgid "Infinite"
 msgstr "Oneindig"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:809
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i bytes onbekende gegevens: "
@@ -5705,7 +4869,7 @@ msgstr "Lengte voorvertoning"
 
 #: libexif/pentax/mnote-pentax-tag.c:66 libexif/pentax/mnote-pentax-tag.c:122
 msgid "Preview Start"
-msgstr "Begin voorvertoning "
+msgstr "Begin voorvertoning"
 
 #: libexif/pentax/mnote-pentax-tag.c:67
 msgid "Model Identification"
@@ -5867,11 +5031,6 @@ msgstr "Fijner"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
-#~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr ""
-#~ "Label Gebruikersopmerking voldoet niet aan de standaard maar bevat wel "
-#~ "gegevens."
-
 #~ msgid "%.02lf EV"
 #~ msgstr "%.02lf EV"
 
diff --git a/po/pl.gmo b/po/pl.gmo
deleted file mode 100644
index a2f62e7..0000000
--- a/po/pl.gmo
+++ /dev/null
diff --git a/po/pl.po b/po/pl.po
index 992c951..04162b6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,17 +1,18 @@
 # Polish translation for libexif.
 # Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libexif package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2005-2012.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2005-2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.21-pre1\n"
+"Project-Id-Version: libexif 0.6.22-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2012-07-02 16:15+0200\n"
+"POT-Creation-Date: 2016-09-02 00:46+0200\n"
+"PO-Revision-Date: 2016-09-02 21:33+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1565,8 +1566,9 @@ msgstr "Górna odległość ogniska"
 msgid "Focus Distance Lower"
 msgstr "Dolna odległość ogniska"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:469
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr "Liczba F"
 
 #: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
@@ -1647,76 +1649,43 @@ msgid "Follow specification"
 msgstr "Zgodność ze specyfikacją"
 
 #: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
-"Dodawanie, poprawianie i usuwanie wpisów aby uzyskać dane EXIF zgodne ze "
-"specyfikacjÄ…."
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Dodawanie, poprawianie i usuwanie wpisów aby uzyskać dane EXIF zgodne ze specyfikacją."
 
 #: libexif/exif-data.c:1183
 msgid "Do not change maker note"
 msgstr "Nie zmieniaj oznaczenia twórcy"
 
 #: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
-"Przy wczytywaniu i zapisywaniu danych Exif pozostaw oznaczenie twórcy "
-"niezmienione. Należy mieć świadomość, że oznaczenie twórcy może zostać "
-"uszkodzone."
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Przy wczytywaniu i zapisywaniu danych Exif pozostaw oznaczenie twórcy niezmienione. Należy mieć świadomość, że oznaczenie twórcy może zostać uszkodzone."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
-"Znacznik '%s' był w formacie '%s' (co jest niezgodne ze specyfikacją) i "
-"został zmieniony na format '%s'."
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Znacznik '%s' był w formacie '%s' (co jest niezgodne ze specyfikacją) i został zmieniony na format '%s'."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
-"Znacznik '%s' jest w formacie '%s' (co jest niezgodne ze specyfikacjÄ…), ale "
-"nie może być zmieniony na format '%s'."
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Znacznik '%s' jest w formacie '%s' (co jest niezgodne ze specyfikacją), ale nie może być zmieniony na format '%s'."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
-"Znacznik 'UserComment' ma nieprawidłowy format '%s'. Format został ustawiony "
-"na 'undefined'."
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Znacznik 'UserComment' ma nieprawidłowy format '%s'. Format został ustawiony na 'undefined'."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
-"Znacznik 'UserComment' został rozszerzony do co najmniej 8 bajtów dla "
-"zgodności ze specyfikacją."
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Znacznik 'UserComment' został rozszerzony do co najmniej 8 bajtów dla zgodności ze specyfikacją."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
-"Znacznik 'UserComment' nie jest pusty, ale nie zaczynał się od "
-"identyfikatora formatu. Poprawiono."
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Znacznik 'UserComment' nie jest pusty, ale nie zaczynał się od identyfikatora formatu. Poprawiono."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
-"Znacznik 'UserComment' nie zaczynał się od identyfikatora formatu. "
-"Poprawiono."
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Znacznik 'UserComment' nie zaczynał się od identyfikatora formatu. Poprawiono."
 
 #: libexif/exif-entry.c:462
 #, c-format
@@ -1731,13 +1700,11 @@ msgstr "%i bajtów nie obsługiwanego rodzaju danych"
 #: libexif/exif-entry.c:642
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
-"Znacznik '%s' zawiera dane w błędnym formacie ('%s', a oczekiwano '%s')."
+msgstr "Znacznik '%s' zawiera dane w błędnym formacie ('%s', a oczekiwano '%s')."
 
 #: libexif/exif-entry.c:655
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr "Znacznik '%s' zawiera błędną liczbę składników (%i, a oczekiwano %i)."
 
 #: libexif/exif-entry.c:669
@@ -2136,8 +2103,7 @@ msgstr "Flesz się uruchomił w trybie automatycznym"
 
 #: libexif/exif-entry.c:792
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
-"Flesz się uruchomił w trybie automatycznym, światło zwrotne nie wykryte"
+msgstr "Flesz się uruchomił w trybie automatycznym, światło zwrotne nie wykryte"
 
 #: libexif/exif-entry.c:794
 msgid "Flash fired, auto mode, return light detected"
@@ -2153,57 +2119,39 @@ msgstr "Flesz się uruchomił w trybie redukcji czerwonych oczu"
 
 #: libexif/exif-entry.c:797
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
-"Flesz się uruchomił w trybie redukcji czerwonych oczu, światło zwrotne nie "
-"wykryte"
+msgstr "Flesz się uruchomił w trybie redukcji czerwonych oczu, światło zwrotne nie wykryte"
 
 #: libexif/exif-entry.c:799
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
-"Flesz się uruchomił w trybie redukcji czerwonych oczu, światło zwrotne "
-"wykryte"
+msgstr "Flesz się uruchomił w trybie redukcji czerwonych oczu, światło zwrotne wykryte"
 
 #: libexif/exif-entry.c:801
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "Flesz się uruchomił w trybie pulsującym z redukcją czerwonych oczu"
 
 #: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"Flesz się uruchomił w trybie pulsującym z redukcją czerwonych oczu, światło "
-"zwrotne nie wykryte"
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "Flesz się uruchomił w trybie pulsującym z redukcją czerwonych oczu, światło zwrotne nie wykryte"
 
 #: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"Flesz się uruchomił w trybie pulsującym z redukcją czerwonych oczu, światło "
-"zwrotne wykryte"
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "Flesz się uruchomił w trybie pulsującym z redukcją czerwonych oczu, światło zwrotne wykryte"
 
 #: libexif/exif-entry.c:807
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
-msgstr ""
-"Flesz się nie uruchomił w trybie automatycznym z redukcją czerwonych oczu"
+msgstr "Flesz się nie uruchomił w trybie automatycznym z redukcją czerwonych oczu"
 
 #: libexif/exif-entry.c:808
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "Flesz się uruchomił w trybie automatycznym z redukcją czerwonych oczu"
 
 #: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"Flesz się uruchomił w trybie automatycznym z redukcją czerwonych oczu, "
-"światło zwrotne nie wykryte"
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "Flesz się uruchomił w trybie automatycznym z redukcją czerwonych oczu, światło zwrotne nie wykryte"
 
 #: libexif/exif-entry.c:811
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"Flesz się uruchomił w trybie automatycznym z redukcją czerwonych oczu, "
-"światło zwrotne wykryte"
+msgstr "Flesz się uruchomił w trybie automatycznym z redukcją czerwonych oczu, światło zwrotne wykryte"
 
 #: libexif/exif-entry.c:815
 msgid "?"
@@ -2276,9 +2224,9 @@ msgstr "FlashPIx w wersji 1.01"
 msgid "Unknown FlashPix Version"
 msgstr "Nieznana wersja FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1668
+#: libexif/exif-entry.c:1673 libexif/exif-entry.c:1677
+#: libexif/exif-entry.c:1682 libexif/exif-entry.c:1683
 msgid "[None]"
 msgstr "[Brak]"
 
@@ -2391,8 +2339,7 @@ msgstr "W odległości %i w (x,y) = (%i,%i)"
 #: libexif/exif-entry.c:1213
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
-msgstr ""
-"Wewnątrz prostokąta (szerokość %i, wysokość %i) w okolicy (x,y) = (%i,%i)"
+msgstr "Wewnątrz prostokąta (szerokość %i, wysokość %i) w okolicy (x,y) = (%i,%i)"
 
 #: libexif/exif-entry.c:1219
 #, c-format
@@ -2498,45 +2445,24 @@ msgid "GPS Tag Version"
 msgstr "Wersja znacznika GPS"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
-"Oznaczenie wersji <GPSInfoIFD>. Wersja jest podawana jako 2.0.0.0. Ten "
-"znacznik jest obowiązkowy, jeśli obecny jest znacznik <GPSInfo>. (Uwaga: "
-"znacznik <GPSVersionID> jest podawany w bajtach, w przeciwieństwie do "
-"znacznika <ExifVersion>. Kiedy wersja to 2.0.0.0, znacznik ma wartość "
-"02000000.H)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Oznaczenie wersji <GPSInfoIFD>. Wersja jest podawana jako 2.0.0.0. Ten znacznik jest obowiązkowy, jeśli obecny jest znacznik <GPSInfo>. (Uwaga: znacznik <GPSVersionID> jest podawany w bajtach, w przeciwieństwie do znacznika <ExifVersion>. Kiedy wersja to 2.0.0.0, znacznik ma wartość 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
 msgstr "Indeks Interoperability"
 
 #: libexif/exif-tag.c:70
-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 ""
-"Oznaczenie identyfikacji reguły współpracy. Należy użyć \"R98\" dla "
-"oznaczenia reguł ExifR98. Używane są cztery bajty wraz ze znacznikiem końca "
-"(NULL). Inne znaczniki ExifR98 sÄ… opisane w pozycji Recommended Exif "
-"Interoperability Rules (ExifR98)."
+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 "Oznaczenie identyfikacji reguły współpracy. Należy użyć \"R98\" dla oznaczenia reguł ExifR98. Używane są cztery bajty wraz ze znacznikiem końca (NULL). Inne znaczniki ExifR98 są opisane w pozycji Recommended Exif Interoperability Rules (ExifR98)."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
 msgstr "Szerokość północna lub południowa"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
-"Oznaczenie, czy szerokość geograficzna jest północna, czy południowa. "
-"Wartość ASCII 'N' oznacza szerokość północną, a 'S' południową."
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Oznaczenie, czy szerokość geograficzna jest północna, czy południowa. Wartość ASCII 'N' oznacza szerokość północną, a 'S' południową."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
@@ -2547,163 +2473,88 @@ msgid "Latitude"
 msgstr "Szerokość geograficzna"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
-"Określenie szerokości geograficznej. Szerokość jest wyrażona jako trzy "
-"wartości RATIONAL (wymierne) podające odpowiednio stopnie, minuty i sekundy. "
-"Kiedy są wyrażone stopnie, minuty i sekundy, format to dd/1,mm/1,ss/1. Kiedy "
-"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."
+msgid "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."
+msgstr "Określenie szerokości geograficznej. Szerokość jest wyrażona jako trzy wartości RATIONAL (wymierne) podające odpowiednio stopnie, minuty i sekundy. Kiedy są wyrażone stopnie, minuty i sekundy, format to dd/1,mm/1,ss/1. Kiedy 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."
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
 msgstr "Długość wschodnia lub zachodnia"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
-"Określenie, czy długość geograficzna jest wschodnia, czy zachodnia. Wartość "
-"ASCII 'E' oznacza długość wschodnią, a 'W' zachodnią."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Określenie, czy długość geograficzna jest wschodnia, czy zachodnia. Wartość ASCII 'E' oznacza długość wschodnią, a 'W' zachodnią."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
 msgstr "Długość geograficzna"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
-"Określenie długości geograficznej. Szerokość jest wyrażona jako trzy "
-"wartości RATIONAL (wymierne) podające odpowiednio stopnie, minuty i sekundy. "
-"Kiedy są wyrażone stopnie, minuty i sekundy, format to dd/1,mm/1,ss/1. Kiedy "
-"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."
+msgid "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."
+msgstr "Określenie długości geograficznej. Szerokość jest wyrażona jako trzy wartości RATIONAL (wymierne) podające odpowiednio stopnie, minuty i sekundy. Kiedy są wyrażone stopnie, minuty i sekundy, format to dd/1,mm/1,ss/1. Kiedy 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."
 
 #: libexif/exif-tag.c:103
 msgid "Altitude Reference"
 msgstr "Odniesienie wysokości"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
-"Określenie wysokości użytej jako wysokość odniesienia. Jeśli odniesienie "
-"jest poziomem morza i wysokość jest nad poziomem morza, podaje się 0. Jeśli "
-"wysokość jest poniżej poziomu morza, podaje się wartość 1 i wysokość oznacza "
-"się jako wartość bezwzględną w znaczniku GPSAltitude. Jednostką odniesienia "
-"są metry. Ten znacznik jest typu BYTE w przeciwieństwie do innych znaczników "
-"odniesienia."
+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 is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GPSAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags."
+msgstr "Określenie wysokości użytej jako wysokość odniesienia. Jeśli odniesienie jest poziomem morza i wysokość jest nad poziomem morza, podaje się 0. Jeśli wysokość jest poniżej poziomu morza, podaje się wartość 1 i wysokość oznacza się jako wartość bezwzględną w znaczniku GPSAltitude. Jednostką odniesienia są metry. Ten znacznik jest typu BYTE w przeciwieństwie do innych znaczników odniesienia."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
 msgstr "Wysokość"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
-"Określenie wysokości w oparciu o odniesienie w GPSAltitudeRef. Wysokość jest "
-"wyrażona jako jedna wartość RATIONAL (wymierna). Jednostką odniesienia są "
-"metry."
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Określenie wysokości w oparciu o odniesienie w GPSAltitudeRef. Wysokość jest wyrażona jako jedna wartość RATIONAL (wymierna). Jednostką odniesienia są metry."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
 msgstr "Czas GPS (zegar atomowy)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
-"Określenie czasu jako UTC (Coordinated Universal Time). Znacznik jest "
-"wyrażony jako trzy wartości RATIONAL (wymierne) określające godzinę, minuty "
-"i sekundy."
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Określenie czasu jako UTC (Coordinated Universal Time). Znacznik jest wyrażony jako trzy wartości RATIONAL (wymierne) określające godzinę, minuty i sekundy."
 
 #: libexif/exif-tag.c:118
 msgid "GPS Satellites"
 msgstr "Satelity GPS"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
-"Określenie satelitów GPS użytych do pomiaru. Znacznik ten może opisywać "
-"liczbę satelitów, ich numery identyfikacyjne, ich kąt podniesienia, azymut, "
-"SNR i inne informacje w zapisie ASCII. Format nie jest w pełni określony. "
-"Jeśli odbiornik GPS nie jest w stanie wykonać pomiaru, wartość tego "
-"znacznika powinna wynosić NULL."
+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, 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 shall be set to NULL."
+msgstr "Określenie satelitów GPS użytych do pomiaru. Znacznik ten może opisywać liczbę satelitów, ich numery identyfikacyjne, ich kąt podniesienia, azymut, SNR i inne informacje w zapisie ASCII. Format nie jest w pełni określony. Jeśli odbiornik GPS nie jest w stanie wykonać pomiaru, wartość tego znacznika powinna wynosić NULL."
 
 #: libexif/exif-tag.c:125
 msgid "GPS Receiver Status"
 msgstr "Stan odbiornika GPS"
 
 #: libexif/exif-tag.c:126
-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 ""
-"Określenie stanu odbiornika GPS podczas zapisu zdjęcia. 'A' oznacza pomiar w "
-"trakcie, 'V' oznacza pomiar współpracujący."
+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 "Określenie stanu odbiornika GPS podczas zapisu zdjęcia. 'A' oznacza pomiar w trakcie, 'V' oznacza pomiar współpracujący."
 
 #: libexif/exif-tag.c:129
 msgid "GPS Measurement Mode"
 msgstr "Tryb pomiaru GPS"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
-"Określenie trybu pomiaru GPS. '2' oznacza wykonywanie pomiaru "
-"dwuwymiarowego, '3' - pomiar trójwymiarowego."
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Określenie trybu pomiaru GPS. '2' oznacza wykonywanie pomiaru dwuwymiarowego, '3' - pomiar trójwymiarowego."
 
 #: libexif/exif-tag.c:133
 msgid "Measurement Precision"
 msgstr "Dokładność pomiaru"
 
 #: libexif/exif-tag.c:134
-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 ""
-"Określenie GPS DOP (stopnia precyzji danych). W trakcie pomiaru "
-"dwuwymiarowego zapisywana jest wartość HDOP, w trakcie trójwymiarowego - "
-"PDOP."
+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 "Określenie GPS DOP (stopnia precyzji danych). W trakcie pomiaru dwuwymiarowego zapisywana jest wartość HDOP, w trakcie trójwymiarowego - PDOP."
 
 #: libexif/exif-tag.c:137
 msgid "Speed Unit"
 msgstr "Jednostka prędkości"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
-"Określenie jednostki używanej do wyrażenia prędkości ruchu odbiornika GPS. "
-"'K', 'M' i 'N' oznaczajÄ… odpowiednio kilometry na godzinÄ™, mile na godzinÄ™ i "
-"węzły."
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Określenie jednostki używanej do wyrażenia prędkości ruchu odbiornika GPS. 'K', 'M' i 'N' oznaczają odpowiednio kilometry na godzinę, mile na godzinę i węzły."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
@@ -2718,162 +2569,96 @@ msgid "Reference for direction of movement"
 msgstr "Odniesienie kierunku ruchu"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"Określenie odniesienia wskazania kierunku ruchu odbiornika GPS. 'T' oznacza "
-"kierunek prawdziwy, a 'M' - magnetyczny."
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Określenie odniesienia wskazania kierunku ruchu odbiornika GPS. 'T' oznacza kierunek prawdziwy, a 'M' - magnetyczny."
 
 #: libexif/exif-tag.c:147
 msgid "Direction of Movement"
 msgstr "Kierunek ruchu"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
-msgstr ""
-"Określenie kierunku ruchu odbiornika GPS. Zakres wartości od 0.00 do 359.99."
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
+msgstr "Określenie kierunku ruchu odbiornika GPS. Zakres wartości od 0.00 do 359.99."
 
 #: libexif/exif-tag.c:150
 msgid "GPS Image Direction Reference"
 msgstr "Odniesienie kierunku wg GPS"
 
 #: libexif/exif-tag.c:151
-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 ""
-"Określenie odniesienia wskazania kierunku zdjęcia w czasie jego robienia. "
-"'T' oznacza kierunek prawdziwy, a 'M' - magnetyczny."
+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 "Określenie odniesienia wskazania kierunku zdjęcia w czasie jego robienia. 'T' oznacza kierunek prawdziwy, a 'M' - magnetyczny."
 
 #: libexif/exif-tag.c:153
 msgid "GPS Image Direction"
 msgstr "Kierunek wg GPS"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
-"Określenie kierunku zdjęcia w czasie jego robienia. Zakres wartości od 0.00 "
-"do 359.99."
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
+msgstr "Określenie kierunku zdjęcia w czasie jego robienia. Zakres wartości od 0.00 do 359.99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
 msgstr "Geodezyjny układ odniesienia"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
-"Określenie geodezyjnego układu odniesienia używanego przez odbiornik GPS. "
-"Jeśli dane są ograniczone do Japonii, znacznik ten może mieć wartość 'TOKYO' "
-"lub 'WGS-84'. Jeśli zapisany jest znacznik GPS Info, zdecydowanie zalecany "
-"jest zapis tego znacznika."
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Określenie geodezyjnego układu odniesienia używanego przez odbiornik GPS. Jeśli dane są ograniczone do Japonii, znacznik ten może mieć wartość 'TOKYO' lub 'WGS-84'. Jeśli zapisany jest znacznik GPS Info, zdecydowanie zalecany jest zapis tego znacznika."
 
 #: libexif/exif-tag.c:161
 msgid "Reference For Latitude of Destination"
 msgstr "Odniesienie szerokości geograficznej obiektu"
 
 #: libexif/exif-tag.c:162
-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 ""
-"Oznaczenie, czy szerokość geograficzna punktu docelowego jest północna, czy "
-"południowa. Wartość ASCII 'N' oznacza szerokość północną, a 'S' południową."
+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 "Oznaczenie, czy szerokość geograficzna punktu docelowego jest północna, czy południowa. Wartość ASCII 'N' oznacza szerokość północną, a 'S' południową."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
 msgstr "Szerokość geograficzna obiektu"
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
-"Określenie szerokości geograficznej punktu docelowego. Szerokość jest "
-"wyrażona jako trzy wartości RATIONAL (wymierne) podające odpowiednio "
-"stopnie, minuty i sekundy. Kiedy są wyrażone stopnie, minuty i sekundy, "
-"format to dd/1,mm/1,ss/1. Kiedy 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."
+msgid "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."
+msgstr "Określenie szerokości geograficznej punktu docelowego. Szerokość jest wyrażona jako trzy wartości RATIONAL (wymierne) podające odpowiednio stopnie, minuty i sekundy. Kiedy są wyrażone stopnie, minuty i sekundy, format to dd/1,mm/1,ss/1. Kiedy 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."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
 msgstr "Odniesienie długości geograficznej obiektu"
 
 #: libexif/exif-tag.c:174
-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 ""
-"Określenie, czy długość geograficzna punktu docelowego jest wschodnia, czy "
-"zachodnia. Wartość ASCII 'E' oznacza długość wschodnią, a 'W' zachodnią."
+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 "Określenie, czy długość geograficzna punktu docelowego jest wschodnia, czy zachodnia. Wartość ASCII 'E' oznacza długość wschodnią, a 'W' zachodnią."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
 msgstr "Długość geograficzna obiektu"
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
-msgstr ""
-"Określenie długości geograficznej punktu docelowego. Szerokość jest wyrażona "
-"jako trzy wartości RATIONAL (wymierne) podające odpowiednio stopnie, minuty "
-"i sekundy. Kiedy są wyrażone stopnie, minuty i sekundy, format to dd/1,mm/1,"
-"ss/1. Kiedy 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."
+msgid "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."
+msgstr "Określenie długości geograficznej punktu docelowego. Szerokość jest wyrażona jako trzy wartości RATIONAL (wymierne) podające odpowiednio stopnie, minuty i sekundy. Kiedy są wyrażone stopnie, minuty i sekundy, format to dd/1,mm/1,ss/1. Kiedy 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."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
 msgstr "Odniesienie kierunku celu"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"Określenie odniesienia wskazania kierunku punktu docelowego. 'T' oznacza "
-"kierunek prawdziwy, a 'M' - magnetyczny."
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Określenie odniesienia wskazania kierunku punktu docelowego. 'T' oznacza kierunek prawdziwy, a 'M' - magnetyczny."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
 msgstr "Kierunek celu"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
-msgstr ""
-"Określenie kierunku punktu docelowego. Zakres wartości od 0.00 do 359.99."
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
+msgstr "Określenie kierunku punktu docelowego. Zakres wartości od 0.00 do 359.99."
 
 #: libexif/exif-tag.c:193
 msgid "Reference for Distance to Destination"
 msgstr "Odniesienie odległości od celu"
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
-"Określenie jednostki użytej do wyrażenia odległości od punktu docelowego. "
-"'K', 'M' i 'N' określają odpowiednio kilometry, mile i mile morskie."
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr "Określenie jednostki użytej do wyrażenia odległości od punktu docelowego. 'K', 'M' i 'N' określają odpowiednio kilometry, mile i mile morskie."
 
 #: libexif/exif-tag.c:197
 msgid "Distance to Destination"
@@ -2888,56 +2673,44 @@ msgid "Name of GPS Processing Method"
 msgstr "Nazwa metody przetwarzania GPS"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
-"�ańcuch znaków zapisujący nazwę metody użytej do określenia lokalizacji. "
-"Pierwszy bajt określa użyty kod znaków, następne - nazwę metody. Ponieważ "
-"typ znacznika nie jest ASCII, zakończenie NULL nie jest wymagane."
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "�ańcuch znaków zapisujący nazwę metody użytej do określenia lokalizacji. Pierwszy bajt określa użyty kod znaków, następne - nazwę metody. Ponieważ typ znacznika nie jest ASCII, zakończenie NULL nie jest wymagane."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
 msgstr "Nazwa obszaru GPS"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
-"�ańcuch znaków zapisujący nazwę obszaru GPS. Pierwszy bajt określa użyty kod "
-"znaków, następne - nazwę metody. Ponieważ typ znacznika nie jest ASCII, "
-"zakończenie NULL nie jest wymagane."
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "�ańcuch znaków zapisujący nazwę obszaru GPS. Pierwszy bajt określa użyty kod znaków, następne - nazwę metody. Ponieważ typ znacznika nie jest ASCII, zakończenie NULL nie jest wymagane."
 
 #: libexif/exif-tag.c:210
 msgid "GPS Date"
 msgstr "Data GPS"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
-"�ańcuch znaków zapisujący informacje o dacie i czasie względem UTC "
-"(Coordinated Universal Time). Format to \"RRRR:MM:DD\". Długość łańcucha to "
-"11 bajtów wraz ze znakiem NULL."
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "�ańcuch znaków zapisujący informacje o dacie i czasie względem UTC (Coordinated Universal Time). Format to \"RRRR:MM:DD\". Długość łańcucha to 11 bajtów wraz ze znakiem NULL."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
 msgstr "Poprawka różnicowa GPS"
 
 #: libexif/exif-tag.c:216
+msgid "Indicates whether differential correction is applied to the GPS receiver."
+msgstr "Określenie, czy do pomiaru odbiornika GPS została zastosowana poprawka różnicowa."
+
+#: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
 msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
 msgstr ""
-"Określenie, czy do pomiaru odbiornika GPS została zastosowana poprawka "
-"różnicowa."
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "Typ nowego podpliku"
 
@@ -2950,67 +2723,40 @@ msgid "Image Width"
 msgstr "Szerokość obrazu"
 
 #: libexif/exif-tag.c:223
-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 ""
-"Liczba kolumn danych obrazu, różna liczbie pikseli w wierszu. W danych "
-"skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik "
-"JPEG."
+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 "Liczba kolumn danych obrazu, różna liczbie pikseli w wierszu. W danych skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
 msgstr "Długość obrazu"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"Liczba wierszy danych obrazu. W danych skompresowanych algorytmem JPEG "
-"zamiast tego znacznika używany jest znacznik JPEG."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Liczba wierszy danych obrazu. W danych skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
 msgstr "Bitów na próbkę"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
-"Liczba bitów na składową obrazu. W tym standardzie każda składowa obrazu ma "
-"8 bitów, więc wartość tego znacznika to 8. Patrz także <SamplesPerPixel>. W "
-"danych skompresowanych algorytmem JPEG zamiast tego znacznika używany jest "
-"znacznik JPEG."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Liczba bitów na składową obrazu. W tym standardzie każda składowa obrazu ma 8 bitów, więc wartość tego znacznika to 8. Patrz także <SamplesPerPixel>. W danych skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Kompresja"
 
 #: libexif/exif-tag.c:238
-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 ""
-"Algorytm kompresji użyty dla danych obrazu. Jeśli główny obraz jest "
-"skompresowany algorytmem JPEG, to oznaczenie nie jest potrzebne i jest "
-"pomijane. Jeśli miniaturki używają kompresji JPEG, ten znacznik ma wartość 6."
+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 "Algorytm kompresji użyty dla danych obrazu. Jeśli główny obraz jest skompresowany algorytmem JPEG, to oznaczenie nie jest potrzebne i jest pomijane. Jeśli miniaturki używają kompresji JPEG, ten znacznik ma wartość 6."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
 msgstr "Interpretacja fotometryczna"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
-"Składowe pikseli. W danych skompresowanych algorytmem JPEG zamiast tego "
-"znacznika używany jest znacznik JPEG."
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Składowe pikseli. W danych skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
@@ -3025,60 +2771,32 @@ msgid "Image Description"
 msgstr "Opis obrazu"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
-"�ańcuch znaków nadający obrazowi tytuł. Może być komentarzem takim jak "
-"\"piknik firmowy 1988\" lub podobnym. Nie można używać dwubajtowych kodów "
-"znaków. Jeśli dwubajtowe kody znaków są potrzebne, należy użyć znacznika "
-"Exif Private <UserComment>."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "�ańcuch znaków nadający obrazowi tytuł. Może być komentarzem takim jak \"piknik firmowy 1988\" lub podobnym. Nie można używać dwubajtowych kodów znaków. Jeśli dwubajtowe kody znaków są potrzebne, należy użyć znacznika Exif Private <UserComment>."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Producent"
 
 #: libexif/exif-tag.c:261
-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 ""
-"Producent urzÄ…dzenia nagrywajÄ…cego. Jest to producent DSC, skanera, "
-"digitalizera albo innego urządzenia, które wygenerowało obraz. Jeśli to pole "
-"jest puste, jest traktowane jako nieznane."
+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 "Producent urządzenia nagrywającego. Jest to producent DSC, skanera, digitalizera albo innego urządzenia, które wygenerowało obraz. Jeśli to pole jest puste, jest traktowane jako nieznane."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Model"
 
 #: libexif/exif-tag.c:268
-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 ""
-"Nazwa lub numer modelu urzÄ…dzenia. Jest to nazwa modelu lub numer DSC, "
-"skanera, digitalizera albo innego urządzenia, które wygenerowało obraz. "
-"Jeśli to pole jest puste, jest traktowane jako nieznane."
+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 "Nazwa lub numer modelu urządzenia. Jest to nazwa modelu lub numer DSC, skanera, digitalizera albo innego urządzenia, które wygenerowało obraz. Jeśli to pole jest puste, jest traktowane jako nieznane."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
 msgstr "Przesunięcia pasów"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
-"Bajtowe przesunięcie pasa dla każdego pasa. Zaleca się takie dobranie tej "
-"wartości, by liczba bajtów pasa nie przekraczała 64kB. W danych "
-"skompresowanych algorytmem JPEG to oznaczenie nie jest potrzebne i jest "
-"pomijane. Patrz także <RowsPerStrip> i <StripByteCount>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "Bajtowe przesunięcie pasa dla każdego pasa. Zaleca się takie dobranie tej wartości, by liczba bajtów pasa nie przekraczała 64kB. W danych skompresowanych algorytmem JPEG to oznaczenie nie jest potrzebne i jest pomijane. Patrz także <RowsPerStrip> i <StripByteCount>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
@@ -3093,188 +2811,108 @@ msgid "Samples per Pixel"
 msgstr "Próbek na piksel"
 
 #: libexif/exif-tag.c:285
-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 ""
-"Liczba składowych na piksel. Ponieważ ten standard odnosi się do obrazów RGB "
-"i YCbCr, wartość tego znacznika wynosi 3. W danych skompresowanych "
-"algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG."
+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 "Liczba składowych na piksel. Ponieważ ten standard odnosi się do obrazów RGB i YCbCr, wartość tego znacznika wynosi 3. W danych skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
 msgstr "Wierszy na pas"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
-"Liczba wierszy na pas. Jest to liczba wierszy w obrazie jednego pasa kiedy "
-"obraz jest podzielony na pasy. W danych skompresowanych algorytmem JPEG to "
-"oznaczenie nie jest potrzebne i jest pomijane. Patrz także <StripOffsets> i "
-"<StripByteCounts>."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Liczba wierszy na pas. Jest to liczba wierszy w obrazie jednego pasa kiedy obraz jest podzielony na pasy. W danych skompresowanych algorytmem JPEG to oznaczenie nie jest potrzebne i jest pomijane. Patrz także <StripOffsets> i <StripByteCounts>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
 msgstr "Liczba bajtów na pas"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
-"Całkowita liczba bajtów w każdym pasie. W danych skompresowanych algorytmem "
-"JPEG to oznaczenie nie jest potrzebne i jest pomijane."
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Całkowita liczba bajtów w każdym pasie. W danych skompresowanych algorytmem JPEG to oznaczenie nie jest potrzebne i jest pomijane."
 
 #: libexif/exif-tag.c:301
 msgid "X-Resolution"
 msgstr "Rozdzielczość X"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
-"Liczba pikseli na jednostkę rozdzielczości (<ResolutionUnit>) w kierunku "
-"szerokości (<ImageWidth>). Kiedy rozdzielczość obrazu jest nieznana, "
-"przyjmuje siÄ™ 72 [dpi]."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Liczba pikseli na jednostkę rozdzielczości (<ResolutionUnit>) w kierunku szerokości (<ImageWidth>). Kiedy rozdzielczość obrazu jest nieznana, przyjmuje się 72 [dpi]."
 
 #: libexif/exif-tag.c:306
 msgid "Y-Resolution"
 msgstr "Rozdzielczość Y"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"Liczba pikseli na jednostkę rozdzielczości (<ResolutionUnit>) w kierunku "
-"długości (<ImageLength>). Zakładana jest taka sama wartość jak <XResolution>."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Liczba pikseli na jednostkę rozdzielczości (<ResolutionUnit>) w kierunku długości (<ImageLength>). Zakładana jest taka sama wartość jak <XResolution>."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
 msgstr "Konfiguracja powierzchni"
 
 #: libexif/exif-tag.c:312
-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 ""
-"Oznaczenie, czy składowe pikseli są zapisane w formacie blokowym czy "
-"płaskim. W plikach skompresowanych algorytmem JPEG zamiast tego znacznika "
-"używany jest znacznik JPEG. Jeśli to pole nie istnieje, domyślne dla TIFF "
-"jest 1 (blokowy)."
+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 "Oznaczenie, czy składowe pikseli są zapisane w formacie blokowym czy płaskim. W plikach skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG. Jeśli to pole nie istnieje, domyślne dla TIFF jest 1 (blokowy)."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "Jednostka rozdzielczości"
 
 #: libexif/exif-tag.c:318
-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 ""
-"Jednostka do wyrażania <XResolution> i <YResolution>. Dla obu wielkości "
-"używana jest ta sama jednostka. Jeśli rozdzielczość jest nieznana, "
-"przyjmowane jest 2 (cale)."
+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 "Jednostka do wyrażania <XResolution> i <YResolution>. Dla obu wielkości używana jest ta sama jednostka. Jeśli rozdzielczość jest nieznana, przyjmowane jest 2 (cale)."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
 msgstr "Funkcja przejścia"
 
 #: libexif/exif-tag.c:324
-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 ""
-"Funkcja przejścia dla obrazu, opisana w postaci tabeli. Zwykle ten znacznik "
-"nie jest potrzebny, ponieważ przestrzeń kolorów podana jest w znaczniku "
-"informacji o przestrzeni kolorów (<ColorSpace>)."
+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 "Funkcja przejścia dla obrazu, opisana w postaci tabeli. Zwykle ten znacznik nie jest potrzebny, ponieważ przestrzeń kolorów podana jest w znaczniku informacji o przestrzeni kolorów (<ColorSpace>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Oprogramowanie"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
-"Ten znacznik przechowuje nazwÄ™ i wersjÄ™ oprogramowania lub firmware kamery "
-"albo innego urządzenia wejściowego obrazu użytego do wygenerowania obrazu. "
-"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."
+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 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."
+msgstr "Ten znacznik przechowuje nazwę i wersję oprogramowania lub firmware kamery albo innego urządzenia wejściowego obrazu użytego do wygenerowania obrazu. 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."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Data i czas"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"Data i czas stworzenia obrazu. W tym standardzie (EXIF-2.1) jest to data i "
-"czas zmiany pliku."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "Data i czas stworzenia obrazu. W tym standardzie (EXIF-2.1) jest to data i czas zmiany pliku."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Autor"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
-"Ten znacznik przechowuje nazwę właściciela aparatu, fotografa lub twórcy "
-"obrazu. Szczegółowy format nie jest określony, ale zaleca się naśladowanie "
-"poniższego przykładu dla ułatwienia współpracy. Jeśli pole jest puste, jest "
-"traktowane jako nieznane."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "Ten znacznik przechowuje nazwę właściciela aparatu, fotografa lub twórcy obrazu. Szczegółowy format nie jest określony, ale zaleca się naśladowanie poniższego przykładu dla ułatwienia współpracy. Jeśli pole jest puste, jest traktowane jako nieznane."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Biały punkt"
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
-"Barwa białego punktu obrazu. Zwykle ten znacznik nie jest potrzebny, "
-"ponieważ przestrzeń kolorów podana jest w znaczniku informacji o przestrzeni "
-"kolorów (<ColorSpace>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Barwa białego punktu obrazu. Zwykle ten znacznik nie jest potrzebny, ponieważ przestrzeń kolorów podana jest w znaczniku informacji o przestrzeni kolorów (<ColorSpace>)."
 
 #: libexif/exif-tag.c:353
 msgid "Primary Chromaticities"
 msgstr "Barwy główne"
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
-msgstr ""
-"Barwa trzech głównych kolorów obrazu. Zwykle ten znacznik nie jest "
-"potrzebny, ponieważ przestrzeń kolorów podana jest w znaczniku informacji o "
-"przestrzeni kolorów (<ColorSpace>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Barwa trzech głównych kolorów obrazu. Zwykle ten znacznik nie jest potrzebny, ponieważ przestrzeń kolorów podana jest w znaczniku informacji o przestrzeni kolorów (<ColorSpace>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
-"Zdefiniowane przez Adobe Corporation, aby pozwolić na drzewa TIFF w plikach "
-"TIFF."
+msgstr "Zdefiniowane przez Adobe Corporation, aby pozwolić na drzewa TIFF w plikach TIFF."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
@@ -3285,109 +2923,48 @@ msgid "JPEG Interchange Format"
 msgstr "Format JPEG"
 
 #: libexif/exif-tag.c:367
-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 bajtu (SOI) danych miniaturki skompresowanej JPEG. "
-"Nie jest używane dla danych JPEG głównego obrazu."
+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 bajtu (SOI) danych miniaturki skompresowanej JPEG. Nie jest używane dla danych JPEG głównego obrazu."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
 msgstr "Długość formatu JPEG"
 
 #: libexif/exif-tag.c:373
-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 miniaturki skompresowanej 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 najwyżej 64kB, "
-"włącznie ze wszystkimi innymi danymi zapisanymi w APP1."
+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 miniaturki skompresowanej 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 najwyżej 64kB, włącznie ze wszystkimi innymi danymi zapisanymi w APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
 msgstr "Współczynniki YCbCr"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
-"Macierz współczynników przekształcenia danych obrazu z RGB do YCbCr. Dla "
-"TIFF nie ma wartości domyślnych, ale wartości podane w \"Color Space "
-"Guidelines\" są używane jako domyślne. Przestrzeń kolorów jest określona w "
-"znaczniku informacji o przestrzeni kolorów z wartością domyślną będącą tą, "
-"która daje optymalną współpracę charakterystyki obrazu w danym przypadku."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "Macierz współczynników przekształcenia danych obrazu z RGB do YCbCr. Dla TIFF nie ma wartości domyślnych, ale wartości podane w \"Color Space Guidelines\" są używane jako domyślne. Przestrzeń kolorów jest określona w znaczniku informacji o przestrzeni kolorów z wartością domyślną będącą tą, która daje optymalną współpracę charakterystyki obrazu w danym przypadku."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
 msgstr "Podpróbkowanie YCbCr"
 
 #: libexif/exif-tag.c:393
-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 ""
-"Współczynnik próbkowania składowych chrominancji w stosunku do składowej "
-"luminancji. W danych skompresowanych algorytmem JPEG zamiast tego znacznika "
-"używany jest znacznik JPEG."
+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 "Współczynnik próbkowania składowych chrominancji w stosunku do składowej luminancji. W danych skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
 msgstr "Rozmieszczenie YCbCr"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
-"Rozmieszczenie składowych chrominancji w stosunku do składowej luminancji. "
-"To pole ma znaczenie tylko dla danych skompresowanych algorytmem JPEG lub "
-"nieskompresowanych danych YCbCr. Domyślne dla TIFF jest 1 (wyśrodkowane); "
-"ale kiedy Y:Cb:Cr = 4:2:2, zaleca się w tym standardzie 2 (położone razem) w "
-"celu poprawienia jakości obrazu w przypadku oglądania na telewizorze. Kiedy "
-"to pole nie istnieje, czytający powinien założyć wartość domyślną dla TIFF. "
-"W przypadku Y:Cb:Cr = 4:2:0, zalecana jest wartość domyślna dla TIFF "
-"(wyśrodkowane). Jeśli czytający nie ma możliwości obsługi obu rodzajów "
-"rozmieszczenia, powinien używać domyślnej wartości TIFF niezależnie od "
-"wartości tego pola. Zaleca się, żeby czytający byli w stanie obsłużyć oba "
-"rodzaje rozmieszczenia."
+msgid "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."
+msgstr "Rozmieszczenie składowych chrominancji w stosunku do składowej luminancji. To pole ma znaczenie tylko dla danych skompresowanych algorytmem JPEG lub nieskompresowanych danych YCbCr. Domyślne dla TIFF jest 1 (wyśrodkowane); ale kiedy Y:Cb:Cr = 4:2:2, zaleca się w tym standardzie 2 (położone razem) w celu poprawienia jakości obrazu w przypadku oglądania na telewizorze. Kiedy to pole nie istnieje, czytający powinien założyć wartość domyślną dla TIFF. W przypadku Y:Cb:Cr = 4:2:0, zalecana jest wartość domyślna dla TIFF (wyśrodkowane). Jeśli czytający nie ma możliwości obsługi obu rodzajów rozmieszczenia, powinien używać domyślnej wartości TIFF niezależnie od wartości tego pola. Zaleca się, żeby czytający byli w stanie obsłużyć oba rodzaje rozmieszczenia."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
 msgstr "Czerń/biel odniesienia"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
-"Wartości czarnego i białego punktu odniesienia. W formacie TIFF nie ma "
-"wartości domyślnych, ale poniższe są podane tutaj jako domyślne. Przestrzeń "
-"kolorów jest określona w znaczniku informacji o przestrzeni kolorów, z "
-"wartością domyślną dającą optymalną charakterystykę obrazu w danych "
-"warunkach."
+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 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."
+msgstr "Wartości czarnego i białego punktu odniesienia. W formacie TIFF nie ma wartości domyślnych, ale poniższe są podane tutaj jako domyślne. Przestrzeń kolorów jest określona w znaczniku informacji o przestrzeni kolorów, z wartością domyślną dającą optymalną charakterystykę obrazu w danych warunkach."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
@@ -3402,14 +2979,8 @@ msgid "CFA Pattern"
 msgstr "Wzór CFA"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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 ""
-"Oznaczenie wzoru geometrycznego CFA (color filter array - tablicy filtrów "
-"kolorów) czujnika obrazu w przypadku użycia jednoukładowego czujnika obszaru "
-"koloru. Nie odnosi się to do wszystkich metod próbkowania."
+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 "Oznaczenie wzoru geometrycznego CFA (color filter array - tablicy filtrów kolorów) czujnika obrazu w przypadku użycia jednoukładowego czujnika obszaru koloru. Nie odnosi się to do wszystkich metod próbkowania."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
@@ -3420,47 +2991,13 @@ msgid "Copyright"
 msgstr "Prawa autorskie"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
-"Informacje o prawach autorskich. Jest to standardowy znacznik używany do "
-"określenia praw autorskich zarówno fotografa, jak i redaktora. Jest to "
-"informacja o osobie lub organizacji majÄ…cej prawa do obrazu. Standardowe "
-"oświadczenie o prawach autorskich wraz z datą i prawami powinno być zapisane "
-"w tym polu, np. \"Copyright, John Smith, 19xx. All rights reserved.\". W tym "
-"standardzie pola opisują prawa zarówno fotografa, jak i redaktora, z których "
-"każdy jest opisywany w oddzielnej części oświadczenia. Jeśli jest jasne "
-"rozróżnienie między prawami fotografa i redaktora, powinny być zapisane w "
-"kolejności najpierw fotograf, a następnie redaktor, oddzielone znakiem NULL "
-"(w tym przypadku, jeśli oświadczenie także kończy się znakiem NULL, powinny "
-"być dwa kody NULL; p. przykład 1). Jeśli podano tylko fotografa, jest on "
-"kończony kodem NULL (p. przykład 2). Jeśli podano tylko prawa redaktora, "
-"część przeznaczona dla fotografa składa się z jednej spacji i następującego "
-"po niej kodu NULL, a następnie podane są prawa redaktora (p. przykład 3). "
-"Jeśli pole jest puste, jest traktowane jako nieznane."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Informacje o prawach autorskich. Jest to standardowy znacznik używany do określenia praw autorskich zarówno fotografa, jak i redaktora. Jest to informacja o osobie lub organizacji mającej prawa do obrazu. Standardowe oświadczenie o prawach autorskich wraz z datą i prawami powinno być zapisane w tym polu, np. \"Copyright, John Smith, 19xx. All rights reserved.\". W tym standardzie pola opisują prawa zarówno fotografa, jak i redaktora, z których każdy jest opisywany w oddzielnej części oświadczenia. Jeśli jest jasne rozróżnienie między prawami fotografa i redaktora, powinny być zapisane w kolejności najpierw fotograf, a następnie redaktor, oddzielone znakiem NULL (w tym przypadku, jeśli oświadczenie także kończy się znakiem NULL, powinny być dwa kody NULL; p. przykład 1). Jeśli podano tylko fotografa, jest on kończony kodem NULL (p. przykład 2). Jeśli podano tylko prawa redaktora, część przeznaczona dla fotografa składa się z jednej spacji i następującego po niej kodu NULL, a następnie podane są prawa redaktora (p. przykład 3). Jeśli pole jest puste, jest traktowane jako nieznane."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Czas ekspozycji podany w sekundach (sek)."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "Liczba F"
-
 #: libexif/exif-tag.c:470
 msgid "The F number."
 msgstr "Liczba F."
@@ -3470,77 +3007,48 @@ msgid "Image Resources Block"
 msgstr "Blok zasobów obrazu"
 
 #: libexif/exif-tag.c:477
-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 ""
-"Wskaźnik na 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."
+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 "Wskaźnik na 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."
 
 #: libexif/exif-tag.c:485
 msgid "Exposure Program"
 msgstr "Program ekspozycji"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"Klasa programu użytego przez aparat do ustawienia ekspozycji przy robieniu "
-"zdjęcia."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "Klasa programu użytego przez aparat do ustawienia ekspozycji przy robieniu zdjęcia."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
 msgstr "Czułość widmowa"
 
 #: libexif/exif-tag.c:491
-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 ""
-"Oznaczenie czułości widmowej każdego kanału używanego przez aparat. Wartość "
-"znacznika to łańcuch znaków ASCII kompatybilny ze standardem stworzonym "
-"przez ASTM Technical Committee."
+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 "Oznaczenie czułości widmowej każdego kanału używanego przez aparat. Wartość znacznika to łańcuch znaków ASCII kompatybilny ze standardem stworzonym przez ASTM Technical Committee."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
 msgstr "Wkaźnik IFD informacji GPS"
 
 #: libexif/exif-tag.c:497
-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 ""
-"Wskaźnik na GPS Info IFD. Struktura GPS Info IFD jest taka, jak Exif IFD, "
-"ale bez danych obrazu."
+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 "Wskaźnik na GPS Info IFD. Struktura GPS Info IFD jest taka, jak Exif IFD, ale bez danych obrazu."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
-msgstr "Oszacowania szybkości ISO"
+msgstr "Wskaźnik czułości ISO"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
-"Określenie szybkości ISO i szerokości ISO aparatu lub urządzenia wejściowego "
-"zgodne ze specyfikacjÄ… ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Określenie czułości ISO i zakresu ekspozycji ISO aparatu lub urządzenia wejściowego zgodne ze specyfikacją ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
 msgstr "Funkcja przekształcenia optoelektronicznego"
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-msgstr ""
-"Określenie funkcji konwersji optoelektrycznej (OECF - Opto-Electric "
-"Conversion Function) opisanej w ISO 14524. <OECF> to powiązanie między "
-"wejściem optycznym aparatu a wartościami obrazu."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+msgstr "Określenie funkcji konwersji optoelektrycznej (OECF - Opto-Electric Conversion Function) opisanej w ISO 14524. <OECF> to powiązanie między wejściem optycznym aparatu a wartościami obrazu."
 
 #: libexif/exif-tag.c:513
 msgid "Time Zone Offset"
@@ -3555,24 +3063,16 @@ msgid "Exif Version"
 msgstr "Wersja Exif"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
-"Obsługiwana wersja tego standardu. Brak tego pola jest uznawany za "
-"niezgodność ze standardem."
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "Obsługiwana wersja tego standardu. Brak tego pola jest uznawany za niezgodność ze standardem."
 
 #: libexif/exif-tag.c:520
 msgid "Date and Time (Original)"
 msgstr "Data i czas (oryginału)"
 
 #: libexif/exif-tag.c:521
-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 ""
-"Data i czas wygenerowania oryginalnych danych obrazu. Dla aparatu cyfrowego "
-"zapisywana jest data i czas zrobienia zdjęcia."
+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 "Data i czas wygenerowania oryginalnych danych obrazu. Dla aparatu cyfrowego zapisywana jest data i czas zrobienia zdjęcia."
 
 #: libexif/exif-tag.c:526
 msgid "Date and Time (Digitized)"
@@ -3580,51 +3080,31 @@ msgstr "Data i czas (obrazu cyfrowego)"
 
 #: libexif/exif-tag.c:527
 msgid "The date and time when the image was stored as digital data."
-msgstr "Data i czas zapisania obrazu jako danych cyfrowych. "
+msgstr "Data i czas zapisania obrazu jako danych cyfrowych."
 
 #: libexif/exif-tag.c:530
 msgid "Components Configuration"
 msgstr "Konfiguracja składowych"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
-"Informacje specyficzne dla skompresowanych danych. Kanały każdej składowej "
-"są układane w kolejności od 1. do 4. Dla danych nieskompresowanych ułożenie "
-"danych jest podane w znaczniku <PhotometricInterpretation>. Jednak ponieważ "
-"<PhotometricInterpretation> może wyrazić jedynie kolejność Y, Cb i Cr, ten "
-"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."
+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 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."
+msgstr "Informacje specyficzne dla skompresowanych danych. Kanały każdej składowej są układane w kolejności od 1. do 4. Dla danych nieskompresowanych ułożenie danych jest podane w znaczniku <PhotometricInterpretation>. Jednak ponieważ <PhotometricInterpretation> może wyrazić jedynie kolejność Y, Cb i Cr, ten 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."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
 msgstr "Skompresowane bity na piksel"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit 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."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit 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."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Szybkość migawki"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
-"Szybkość migawki. Jednostką jest ustawienie APEX (Additive System of "
-"Photographic Exposure)."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Szybkość migawki. Jednostką jest ustawienie APEX (Additive System of Photographic Exposure)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
@@ -3635,37 +3115,24 @@ msgid "Brightness"
 msgstr "Jasność"
 
 #: libexif/exif-tag.c:554
-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 ""
-"Wartość jasności. Jednostką jest wartość APEX. Zwykle jest podana w "
-"przedziale od -99.99 do 99.99."
+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 "Wartość jasności. Jednostką jest wartość APEX. Zwykle jest podana w przedziale od -99.99 do 99.99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
 msgstr "Odchylenie ekspozycji"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
-"Odchylenie ekspozycji. Jednostką jest wartość APEX. Zwykle jest podana w "
-"przedziale od -99.99 do 99.99."
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "Odchylenie ekspozycji. Jednostką jest wartość APEX. Zwykle jest podana w przedziale od -99.99 do 99.99."
 
 #: libexif/exif-tag.c:562
 msgid "Maximum Aperture Value"
 msgstr "Maksymalna wartość przysłony"
 
 #: libexif/exif-tag.c:563
-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 ""
-"Najmniejsza liczba F obiektywu. Jednostką jest wartość APEX. Zwykle jest "
-"podana w przedziale od 00.00 do 99.99, ale nie ma ograniczenia do tego "
-"zakresu."
+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 "Najmniejsza liczba F obiektywu. Jednostką jest wartość APEX. Zwykle jest podana w przedziale od 00.00 do 99.99, ale nie ma ograniczenia do tego zakresu."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
@@ -3688,30 +3155,20 @@ msgid "The kind of light source."
 msgstr "Rodzaj źródła światła."
 
 #: libexif/exif-tag.c:578
-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 "
-"stroboskopowego (flesza)."
+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 stroboskopowego (flesza)."
 
 #: libexif/exif-tag.c:582
-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 ""
-"Rzeczywista ogniskowa obiektywu w mm, bez przekształcenia do ogniskowej dla "
-"aparatu na film 35 mm."
+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 "Rzeczywista ogniskowa obiektywu w mm, bez przekształcenia do ogniskowej dla aparatu na film 35 mm."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr "Obszar obiektu"
 
 #: libexif/exif-tag.c:586
-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."
+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."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
@@ -3722,57 +3179,16 @@ msgid "Maker Note"
 msgstr "Uwaga producenta"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Znacznik dla producentów urządzeń zapisujących Exif do zapisywania dowolnie "
-"wybranych informacji. Zawartość zależy od producenta."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Znacznik dla producentów urządzeń zapisujących Exif do zapisywania dowolnie wybranych informacji. Zawartość zależy od producenta."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
 msgstr "Komentarz użytkownika"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
-"Znacznik dla użytkowników formatu Exif do zapisywania słów kluczowych lub "
-"komentarzy do obrazu poza tymi w <ImageDescription> i bez ograniczeń co do "
-"kodów znaków w znaczniku <ImageDescription>. Kody znaków używane w znaczniku "
-"<UserComment> są określane w oparciu o kod ID w stałym polu 8-bajtowym na "
-"początku obszaru danych znacznika. Nieużywana część tego obszaru jest "
-"wypełniana znakami NULL (\"00.h\"). Kody ID są przypisywane poprzez "
-"rejestrację. Metody określania i odniesienia dla każdego zestawu znaków są "
-"podane w specyfikacji. Wartość CountN jest określana w oparciu o 8 bajtów z "
-"obszaru kodowania znaków i liczbę bajtów w części zawierającej komentarz "
-"użytkownika. Ponieważ typ pola nie jest ASCII, nie jest potrzebne kończenie "
-"łańcucha znakiem NULL. Kod ID dla obszaru <UserComment> może być "
-"zdefiniowanym kodem takim jak JIS lub ASCII, albo może być nieokreślony. "
-"Nazwa pola nieokreślonego (Undefined) to UndefinedText, a jego kod ID jest "
-"wypełniany 8 bajtami znaków NULL (\"00.H\"). Czytający Exif, który ma czytać "
-"znacznik <UserComment>, musi mieć funkcję określania kodu ID. Funkcja ta nie "
-"jest wymagana dla czytających Exif nie używających znacznika <UserComment>. "
-"Kiedy znacznik <UserComment> jest pozostawiony nie używany, zaleca się żeby "
-"kod ID był ASCII, a następująca po nim część z komentarzem użytkownika była "
-"wypełniona pustymi znakami [20.H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "Znacznik dla użytkowników formatu Exif do zapisywania słów kluczowych lub komentarzy do obrazu poza tymi w <ImageDescription> i bez ograniczeń co do kodów znaków w znaczniku <ImageDescription>. Kody znaków używane w znaczniku <UserComment> są określane w oparciu o kod ID w stałym polu 8-bajtowym na początku obszaru danych znacznika. Nieużywana część tego obszaru jest wypełniana znakami NULL (\"00.h\"). Kody ID są przypisywane poprzez rejestrację. Metody określania i odniesienia dla każdego zestawu znaków są podane w specyfikacji. Wartość CountN jest określana w oparciu o 8 bajtów z obszaru kodowania znaków i liczbę bajtów w części zawierającej komentarz użytkownika. Ponieważ typ pola nie jest ASCII, nie jest potrzebne kończenie łańcucha znakiem NULL. Kod ID dla obszaru <UserComment> może być zdefiniowanym kodem takim jak JIS lub ASCII, albo może być nieokreślony. Nazwa pola nieokreślonego (Undefined) to UndefinedText, a jego kod ID jest wypełniany 8 bajtami znaków NULL (\"00.H\"). Czytający Exif, który ma czytać znacznik <UserComment>, musi mieć funkcję określania kodu ID. Funkcja ta nie jest wymagana dla czytających Exif nie używających znacznika <UserComment>. Kiedy znacznik <UserComment> jest pozostawiony nie używany, zaleca się żeby kod ID był ASCII, a następująca po nim część z komentarzem użytkownika była wypełniona pustymi znakami [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
@@ -3780,30 +3196,23 @@ msgstr "Czas - ułamki sekund"
 
 #: libexif/exif-tag.c:620
 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>."
+msgstr "Znacznik używany do zapisywania ułamków sekund dla znacznika <DateTime>."
 
 #: libexif/exif-tag.c:624
 msgid "Sub-second Time (Original)"
 msgstr "Czas - ułamki sekund (oryginału)"
 
 #: libexif/exif-tag.c:625
-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>."
+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>."
 
 #: libexif/exif-tag.c:629
 msgid "Sub-second Time (Digitized)"
 msgstr "Czas - ułamki sekund (obrazu cyfrowego)"
 
 #: libexif/exif-tag.c:630
-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>."
+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>."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
@@ -3818,8 +3227,7 @@ msgid "XP Comment"
 msgstr "Komentarz XP"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr "�ańcuch znaków zawierający komentarz do obrazu, zapisany w UTF-16LE."
 
 #: libexif/exif-tag.c:644
@@ -3827,9 +3235,7 @@ msgid "XP Author"
 msgstr "Autor XP"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
 msgstr "�ańcuch znaków zawierający nazwę twórcy obrazu, zapisany w UTF-16LE."
 
 #: libexif/exif-tag.c:649
@@ -3837,12 +3243,8 @@ msgid "XP Keywords"
 msgstr "SÅ‚owa kluczowe XP"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
-"�ańcuch znaków zawierający słowa kluczowe opisujące obraz, zapisane w "
-"UTF-16LE."
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "�ańcuch znaków zawierający słowa kluczowe opisujące obraz, zapisane w UTF-16LE."
 
 #: libexif/exif-tag.c:654
 msgid "XP Subject"
@@ -3861,218 +3263,96 @@ msgid "Color Space"
 msgstr "Przestrzeń kolorów"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
-"Znacznik informacji o przestrzeni kolorów jest zawsze zapisywany w celu "
-"określenia przestrzeni kolorów. Zwykle używane jest sRGB (=1) do określenia "
-"przestrzeni kolorów w oparciu o warunki i środowisko monitora PC. Jeśli "
-"użyta jest inna przestrzeń kolorów niż sRGB, ustawiona jest wartość "
-"\"nieskalibrowana\" (Uncalibrated, =FFFF.H). Dane obrazu zapisane jako "
-"nieskalibrowane mogą być traktowane jako sRGB przy konwersji do FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "Znacznik informacji o przestrzeni kolorów jest zawsze zapisywany w celu określenia przestrzeni kolorów. Zwykle używane jest sRGB (=1) do określenia przestrzeni kolorów w oparciu o warunki i środowisko monitora PC. Jeśli użyta jest inna przestrzeń kolorów niż sRGB, ustawiona jest wartość \"nieskalibrowana\" (Uncalibrated, =FFFF.H). Dane obrazu zapisane jako nieskalibrowane mogą być traktowane jako sRGB przy konwersji do FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
 msgstr "Wymiar X w pikselach"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
-"Informacje specyficzne dla skompresowanych danych. Kiedy zapisywany jest "
-"skompresowany plik, w tym znaczniku musi być zapisana poprawna szerokość "
-"znaczącego obrazu, niezależnie od istnienia danych dopełniających czy "
-"znacznika restartu. Ten znacznik nie powinien istnieć w pliku "
-"nieskompresowanym."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Informacje specyficzne dla skompresowanych danych. Kiedy zapisywany jest skompresowany plik, w tym znaczniku musi być zapisana poprawna szerokość znaczącego obrazu, niezależnie od istnienia danych dopełniających czy znacznika restartu. Ten znacznik nie powinien istnieć w pliku nieskompresowanym."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
 msgstr "Wymiar Y w pikselach"
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
-"Informacje specyficzne dla skompresowanych danych. Kiedy zapisywany jest "
-"skompresowany plik, w tym znaczniku musi być zapisana poprawna wysokość "
-"znaczącego obrazu, niezależnie od istnienia danych dopełniających czy "
-"znacznika restartu. Ten znacznik nie powinien istnieć w pliku "
-"nieskompresowanym. Ponieważ dopełnianie danych w kierunku pionowym nie jest "
-"potrzebne, liczba linii zapisana w tym polu będzie w praktyce równa tej "
-"zapisanej w SOF."
+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, 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."
+msgstr "Informacje specyficzne dla skompresowanych danych. Kiedy zapisywany jest skompresowany plik, w tym znaczniku musi być zapisana poprawna wysokość znaczącego obrazu, niezależnie od istnienia danych dopełniających czy znacznika restartu. Ten znacznik nie powinien istnieć w pliku nieskompresowanym. Ponieważ dopełnianie danych w kierunku pionowym nie jest potrzebne, liczba linii zapisana w tym polu będzie w praktyce równa tej zapisanej w SOF."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
 msgstr "Powiązany plik dźwiękowy"
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
-"Ten znacznik służy do zapisywania nazwy pliku dźwiękowego związanego z "
-"danymi obrazu. JedynÄ… informacjÄ… relacyjnÄ… zapisywanÄ… tutaj jest nazwa pliku "
-"dźwiękowego Exif i rozszerzenie (łańcuch ASCII składający się z 8 znaków + "
-"'.' + 3 znaków). Ścieżka nie jest zapisywana. Zastrzeżenia odnośnie dźwięku "
-"i konwencje nazywania plików są podane w specyfikacji. Kiedy używany jest "
-"ten znacznik, pliki dźwiękowe muszą być zapisane zgodnie z formatem dźwięku "
-"Exif. Zapisujący mogą także zapisywać dane takie jak dźwięk wewnątrz danych "
-"strumieni rozszerzeń APP2 lub FlashPix. Odwzorowanie między plikami obrazów "
-"Exif a plikami dźwiękowymi Exif jest wykonywane na trzy sposoby: [1], [2] i "
-"[3]. Jeśli wiele plików jest odwzorowywanych na jeden plik, jak w przypadku "
-"[2] lub [3], powyższy format służy do zapisywania tylko jednej nazwy pliku "
-"dźwiękowego. Jeśli jest wiele plików dźwiękowych, podawany jest pierwszy "
-"plik. W przypadku [3] na przykład dla pliku obrazu Exif \"DSC00001.JPG\" "
-"jako powiązany plik dźwiękowy Exif podany jest jedynie \"SND00001.WAV\". "
-"Kiedy są trzy pliki dźwiękowe \"SND00001.WAV\", \"SND00002.WAV\" i "
-"\"SND00003.WAV\", dla każdego z nich podawana jest nazwa pliku obrazu Exif "
-"\"DSC00001.JPG\". Poprzez łączenie wielu informacji relacyjnych obsługiwane "
-"jest wiele możliwości odtwarzania. Sposób używania informacji relacyjnych "
-"jest pozostawiony implementacji po stronie odtwarzania. Ponieważ ta "
-"informacja jest łańcuchem ASCII, jest zakończona znakiem NULL. Kiedy ten "
-"znacznik jest używany do przypisywania plików dźwiękowych do plików obrazu, "
-"relacja pliku dźwiękowego do danych obrazu musi być określona także po "
-"stronie pliku dźwiękowego."
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Ten znacznik służy do zapisywania nazwy pliku dźwiękowego związanego z danymi obrazu. Jedyną informacją relacyjną zapisywaną tutaj jest nazwa pliku dźwiękowego Exif i rozszerzenie (łańcuch ASCII składający się z 8 znaków + '.' + 3 znaków). Ścieżka nie jest zapisywana. Zastrzeżenia odnośnie dźwięku i konwencje nazywania plików są podane w specyfikacji. Kiedy używany jest ten znacznik, pliki dźwiękowe muszą być zapisane zgodnie z formatem dźwięku Exif. Zapisujący mogą także zapisywać dane takie jak dźwięk wewnątrz danych strumieni rozszerzeń APP2 lub FlashPix. Odwzorowanie między plikami obrazów Exif a plikami dźwiękowymi Exif jest wykonywane na trzy sposoby: [1], [2] i [3]. Jeśli wiele plików jest odwzorowywanych na jeden plik, jak w przypadku [2] lub [3], powyższy format służy do zapisywania tylko jednej nazwy pliku dźwiękowego. Jeśli jest wiele plików dźwiękowych, podawany jest pierwszy plik. W przypadku [3] na przykład dla pliku obrazu Exif \"DSC00001.JPG\" jako powiązany plik dźwiękowy Exif podany jest jedynie \"SND00001.WAV\". Kiedy są trzy pliki dźwiękowe \"SND00001.WAV\", \"SND00002.WAV\" i \"SND00003.WAV\", dla każdego z nich podawana jest nazwa pliku obrazu Exif \"DSC00001.JPG\". Poprzez łączenie wielu informacji relacyjnych obsługiwane jest wiele możliwości odtwarzania. Sposób używania informacji relacyjnych jest pozostawiony implementacji po stronie odtwarzania. Ponieważ ta informacja jest łańcuchem ASCII, jest zakończona znakiem NULL. Kiedy ten znacznik jest używany do przypisywania plików dźwiękowych do plików obrazu, relacja pliku dźwiękowego do danych obrazu musi być określona także po stronie pliku dźwiękowego."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
 msgstr "Wskaźnik IFD Interoperability"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
-"Interoperability IFD jest złożony ze znaczników przechowujących informacje "
-"zapewniające współpracę i wskazywane przez ten znacznik umieszczony w Exif "
-"IFD. Struktura Interoperability w Interoperability IFD jest taka sama jak "
-"struktra IFD zdefiniowana w TIFF, ale w porównaniu do normalnego TIFF IFD "
-"nie zawiera danych obrazu."
+msgid "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."
+msgstr "Interoperability IFD jest złożony ze znaczników przechowujących informacje zapewniające współpracę i wskazywane przez ten znacznik umieszczony w Exif IFD. Struktura Interoperability w Interoperability IFD jest taka sama jak struktra IFD zdefiniowana w TIFF, ale w porównaniu do normalnego TIFF IFD nie zawiera danych obrazu."
 
 #: libexif/exif-tag.c:729
 msgid "Flash Energy"
 msgstr "Energia Flesza"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
-"Określenie energii błysku w czasie robienia zdjęcia mierzonej w jednostkach "
-"BCPS (Beam Candle Power Seconds)."
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Określenie energii błysku w czasie robienia zdjęcia mierzonej w jednostkach BCPS (Beam Candle Power Seconds)."
 
 #: libexif/exif-tag.c:734
 msgid "Spatial Frequency Response"
 msgstr "Odpowiedź częstotliwości przestrzennej"
 
 #: libexif/exif-tag.c:735
-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 ""
-"Ten znacznik zapisuje tabelę częstotliwości przestrzennych aparatu lub "
-"urządzenia wejściowego oraz wartości SFR w kierunku szerokości obrazu, "
-"wysokości obrazu i przekątnej zgodnie ze specyfikacją ISO 12233."
+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 "Ten znacznik zapisuje tabelę częstotliwości przestrzennych aparatu lub urządzenia wejściowego oraz wartości SFR w kierunku szerokości obrazu, wysokości obrazu i przekątnej zgodnie ze specyfikacją ISO 12233."
 
 #: libexif/exif-tag.c:741
 msgid "Focal Plane X-Resolution"
 msgstr "Rozdzielczość X płaszczyzny ogniskowej"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Określenie liczby pikseli w kierunku szerokości obrazu (X) na "
-"<FocalPlaneResolutionUnit> w płaszczyźnie ogniskowej aparatu."
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Określenie liczby pikseli w kierunku szerokości obrazu (X) na <FocalPlaneResolutionUnit> w płaszczyźnie ogniskowej aparatu."
 
 #: libexif/exif-tag.c:746
 msgid "Focal Plane Y-Resolution"
 msgstr "Rozdzielczość Y płaszczyzny ogniskowej"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Określenie liczby pikseli w kierunku wysokości obrazu (Y) na "
-"<FocalPlaneResolutionUnit> w płaszczyźnie ogniskowej aparatu."
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Określenie liczby pikseli w kierunku wysokości obrazu (Y) na <FocalPlaneResolutionUnit> w płaszczyźnie ogniskowej aparatu."
 
 #: libexif/exif-tag.c:751
 msgid "Focal Plane Resolution Unit"
 msgstr "Jednostka rozdzielczości płaszczyzny ogniskowej"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
-"Określenie jednostki miary <FocalPlaneXResolution> i "
-"<FocalPlaneYResolution>. Ta wartość jest taka sama jak <ResolutionUnit>."
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Określenie jednostki miary <FocalPlaneXResolution> i <FocalPlaneYResolution>. Ta wartość jest taka sama jak <ResolutionUnit>."
 
 #: libexif/exif-tag.c:757
 msgid "Subject Location"
 msgstr "Położenie obiektu"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
-"Określenie położenia głównego obiektu na scenie. Wartość tego znacznika "
-"reprezentuje piksel w środku głównego obiektu względem lewej krawędzi, przed "
-"wykonaniem obrotu opisanego znacznikiem <Rotation>. Pierwsza wartość określa "
-"numer kolumny X, a druga numer wiersza Y."
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Określenie położenia głównego obiektu na scenie. Wartość tego znacznika reprezentuje piksel w środku głównego obiektu względem lewej krawędzi, przed wykonaniem obrotu opisanego znacznikiem <Rotation>. Pierwsza wartość określa numer kolumny X, a druga numer wiersza Y."
 
 #: libexif/exif-tag.c:765
 msgid "Exposure Index"
 msgstr "Indeks ekspozycji"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
-msgstr ""
-"Określenie indeksu ekspozycji wybranego przez aparat lub urządzenie "
-"wejściowe w czasie robienia zdjęcia."
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Określenie indeksu ekspozycji wybranego przez aparat lub urządzenie wejściowe w czasie robienia zdjęcia."
 
 #: libexif/exif-tag.c:769
 msgid "Sensing Method"
@@ -4080,105 +3360,63 @@ msgstr "Rodzaj czujnika"
 
 #: libexif/exif-tag.c:770
 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."
+msgstr "Określenie rodzaju czujnika obrazu w aparacie lub urządzeniu wejściowym."
 
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Źródło pliku"
 
 #: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"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 na DSC."
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "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 na DSC."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
 msgstr "Rodzaj sceny"
 
 #: libexif/exif-tag.c:779
-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 ""
-"Określenie rodzaju sceny. Jeśli obraz był zapisany przez DSC, wartość tego "
-"znacznika zawsze musi być ustawiona na 1, oznaczając, że obraz był "
-"bezpośrednio sfotografowany."
+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 "Określenie rodzaju sceny. Jeśli obraz był zapisany przez DSC, wartość tego znacznika zawsze musi być ustawiona na 1, oznaczając, że obraz był bezpośrednio sfotografowany."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
 msgstr "WÅ‚asny rendering"
 
 #: libexif/exif-tag.c:790
-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 ""
-"Ten znacznik określa użycie specjalnego przetwarzania danych obrazu, takiego "
-"jak rendering zastosowany na wyjściu. Jeśli jest wykonane specjalne "
-"przetwarzanie, czytający powinien wyłączyć albo zminimalizować dalsze "
-"przetwarzanie."
+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 "Ten znacznik określa użycie specjalnego przetwarzania danych obrazu, takiego jak rendering zastosowany na wyjściu. Jeśli jest wykonane specjalne przetwarzanie, czytający powinien wyłączyć albo zminimalizować dalsze przetwarzanie."
 
 #: libexif/exif-tag.c:796
-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 ""
-"Ten znacznik określa tryb ekspozycji ustawiony przy robieniu zdjęcia. W "
-"trybie auto bracket aparat pstryka serię klatek tej samej sceny z różnymi "
-"ustawieniami ekspozycji."
+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 "Ten znacznik określa tryb ekspozycji ustawiony przy robieniu zdjęcia. W trybie auto bracket aparat pstryka serię klatek tej samej sceny z różnymi ustawieniami ekspozycji."
 
 #: libexif/exif-tag.c:801
 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."
+msgstr "Ten znacznik określa tryb balansu bieli ustawiony przy robieniu zdjęcia."
 
 #: libexif/exif-tag.c:805
 msgid "Digital Zoom Ratio"
 msgstr "Współczynnik powiększenia cyfrowego"
 
 #: libexif/exif-tag.c:806
-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 ""
-"Ten znacznik określa współczynnik powiększenia cyfrowego w czasie robienia "
-"zdjęcia. Jeśli licznik wartości znacznika jest równy 0, oznacza to, że nie "
-"użyto cyfrowego powiększenia."
+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 "Ten znacznik określa współczynnik powiększenia cyfrowego w czasie robienia zdjęcia. Jeśli licznik wartości znacznika jest równy 0, oznacza to, że nie użyto cyfrowego powiększenia."
 
 #: libexif/exif-tag.c:811
 msgid "Focal Length in 35mm Film"
 msgstr "Ogniskowa dla filmu 35mm"
 
 #: libexif/exif-tag.c:812
-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 ""
-"Ten znacznik określa odpowiednik ogniskowej w mm przy założeniu aparatu na "
-"film 35 mm. Wartość 0 oznacza, że ogniskowa jest nieznana. Należy zauważyć, "
-"że ten znacznik różni się od znacznika FocalLength."
+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 "Ten znacznik określa odpowiednik ogniskowej w mm przy założeniu aparatu na film 35 mm. Wartość 0 oznacza, że ogniskowa jest nieznana. Należy zauważyć, że ten znacznik różni się od znacznika FocalLength."
 
 #: libexif/exif-tag.c:818
 msgid "Scene Capture Type"
 msgstr "Rodzaj uchwycenia sceny"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
-"Ten znacznik określa rodzaj sceny na zdjęciu. Może być także wykorzystany do "
-"zapisania trybu w którym było robione zdjęcie. Należy zauważyć, że ten "
-"znacznik różni się od znacznika rodzaju sceny <SceneType>."
+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 scene type <SceneType> tag."
+msgstr "Ten znacznik określa rodzaj sceny na zdjęciu. Może być także wykorzystany do zapisania trybu w którym było robione zdjęcie. Należy zauważyć, że ten znacznik różni się od znacznika rodzaju sceny <SceneType>."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
@@ -4189,42 +3427,24 @@ msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "Ten znacznik określa stopień wzmocnienia całego obrazu."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Ten znacznik określa kierunek przetwarzania kontrastu wykonanego przez "
-"aparat przy robieniu zdjęcia."
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Ten znacznik określa kierunek przetwarzania kontrastu wykonanego przez aparat przy robieniu zdjęcia."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Ten znacznik określa kierunek przetwarzania nasycenia wykonanego przez "
-"aparat przy robieniu zdjęcia."
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Ten znacznik określa kierunek przetwarzania nasycenia wykonanego przez aparat przy robieniu zdjęcia."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Ten znacznik określa kierunek przetwarzania ostrości wykonanego przez aparat "
-"przy robieniu zdjęcia."
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Ten znacznik określa kierunek przetwarzania ostrości wykonanego przez aparat przy robieniu zdjęcia."
 
 #: libexif/exif-tag.c:841
 msgid "Device Setting Description"
 msgstr "Opis ustawień urządzenia"
 
 #: libexif/exif-tag.c:842
-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 ""
-"Ten znacznik określa informacje o warunkach robienia zdjęcia dla konkretnego "
-"modelu aparatu. Jest on używany tylko do określenia warunków robienia "
-"zdjęcia przy odczycie."
+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 "Ten znacznik określa informacje o warunkach robienia zdjęcia dla konkretnego modelu aparatu. Jest on używany tylko do określenia warunków robienia zdjęcia przy odczycie."
 
 #: libexif/exif-tag.c:848
 msgid "Subject Distance Range"
@@ -4239,14 +3459,8 @@ msgid "Image Unique ID"
 msgstr "Unikalny identyfikator obrazu"
 
 #: libexif/exif-tag.c:852
-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 ""
-"Ten znacznik określa unikalny identyfikator przypisany każdemu zdjęciu. Jest "
-"on zapisany jako łańcuch ASCII odpowiadający notacji szesnastkowej o stałej "
-"długości 128 bitów."
+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 "Ten znacznik określa unikalny identyfikator przypisany każdemu zdjęciu. Jest on zapisany jako łańcuch ASCII odpowiadający notacji szesnastkowej o stałej długości 128 bitów."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
@@ -4269,17 +3483,8 @@ msgid "Padding"
 msgstr "Wyrównanie"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
-"Ten znacznik rezerwuje miejsce, które może być później użyte przy dodawaniu "
-"dodatkowych metadanych. Nowe metadane mogą być zapisane w tym miejscu "
-"poprzez zastąpienie tego znacznika mniejszym elementem danych i użycie "
-"odzyskanego miejsca w celu zapisania nowych lub powiększonych znaczników "
-"metadanych."
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Ten znacznik rezerwuje miejsce, które może być później użyte przy dodawaniu dodatkowych metadanych. Nowe metadane mogą być zapisane w tym miejscu poprzez zastąpienie tego znacznika mniejszym elementem danych i użycie odzyskanego miejsca w celu zapisania nowych lub powiększonych znaczników metadanych."
 
 #: libexif/fuji/mnote-fuji-entry.c:62
 msgid "Softest"
@@ -5210,7 +4415,7 @@ msgstr "Bracketing balansu bieli"
 #: libexif/olympus/mnote-olympus-tag.c:120
 #: libexif/pentax/mnote-pentax-tag.c:123
 msgid "White Balance Bias"
-msgstr "Nakierowanie balansu bieli"
+msgstr "Odchylenie balansu bieli"
 
 #: libexif/olympus/mnote-olympus-tag.c:121
 msgid "Data Dump"
@@ -5643,7 +4848,7 @@ msgstr "Jakość"
 
 #: libexif/pentax/mnote-pentax-tag.c:54
 msgid "ISO Speed"
-msgstr "Szybkość ISO"
+msgstr "Czułość ISO"
 
 #: libexif/pentax/mnote-pentax-tag.c:56
 msgid "Colors"
diff --git a/po/pt.gmo b/po/pt.gmo
deleted file mode 100644
index 8fcec5a..0000000
--- a/po/pt.gmo
+++ /dev/null
diff --git a/po/pt.po b/po/pt.po
index 3b66e26..5c8c758 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2009-11-25 15:19+0000\n"
-"Last-Translator: Ubuntu Archive Auto-Sync <archive@ubuntu.com>\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
+"PO-Revision-Date: 2014-07-26 18:07+0000\n"
+"Last-Translator: Mykas0 <Mykas0@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 06:52+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2016-09-01 20:32+0000\n"
+"X-Generator: Launchpad (build 18179)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -40,7 +40,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Número inválido de componentes (%i, esperados %i ou %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -51,14 +51,14 @@ msgstr "Macro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -87,15 +87,15 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -127,8 +127,8 @@ msgstr "Automático"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -148,8 +148,7 @@ msgstr ""
 msgid "Auto, red-eye reduction"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr ""
 
@@ -160,7 +159,7 @@ msgstr "Flash externo"
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
 #: libexif/canon/mnote-canon-entry.c:297
 msgid "Single"
-msgstr ""
+msgstr "Único"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
 #: libexif/canon/mnote-canon-entry.c:298
@@ -197,7 +196,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103
 msgid "Manual focus"
-msgstr ""
+msgstr "Focagem manual"
 
 #: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:132
 #: libexif/canon/mnote-canon-entry.c:187
@@ -211,27 +210,27 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:106
 msgid "CRW+THM"
-msgstr ""
+msgstr "CRW+THM"
 
 #: libexif/canon/mnote-canon-entry.c:107
 msgid "AVI+THM"
-msgstr ""
+msgstr "AVI+THM"
 
 #: libexif/canon/mnote-canon-entry.c:108
 msgid "TIF"
-msgstr ""
+msgstr "TIF"
 
 #: libexif/canon/mnote-canon-entry.c:109
 msgid "TIF+JPEG"
-msgstr ""
+msgstr "TIF+JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:110
 msgid "CR2"
-msgstr ""
+msgstr "CR2"
 
 #: libexif/canon/mnote-canon-entry.c:111
 msgid "CR2+JPEG"
-msgstr ""
+msgstr "CR2+JPEG"
 
 #: libexif/canon/mnote-canon-entry.c:112
 msgid "Large"
@@ -271,9 +270,8 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -285,7 +283,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -311,10 +309,10 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
 #: libexif/pentax/mnote-pentax-entry.c:128
 msgid "Sepia"
-msgstr ""
+msgstr "Sépia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -339,12 +337,11 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
 #: libexif/canon/mnote-canon-entry.c:434
 msgid "Neutral"
-msgstr ""
+msgstr "Neutro"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
-msgstr ""
+msgstr "Flash desligado"
 
 #: libexif/canon/mnote-canon-entry.c:136
 msgid "Long shutter"
@@ -386,7 +383,7 @@ msgstr "Neve"
 
 #: libexif/canon/mnote-canon-entry.c:144
 msgid "Kids & pets"
-msgstr ""
+msgstr "Crianças & animais"
 
 #: libexif/canon/mnote-canon-entry.c:145
 msgid "Night snapshot"
@@ -410,21 +407,21 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:150
 msgid "Color swap"
-msgstr ""
+msgstr "Troca de cor"
 
 #: libexif/canon/mnote-canon-entry.c:151
 msgid "Aquarium"
-msgstr ""
+msgstr "Aquário"
 
 #: libexif/canon/mnote-canon-entry.c:152
 msgid "ISO 3200"
-msgstr ""
+msgstr "ISO 3200"
 
 #: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Nenhum"
@@ -437,8 +434,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr ""
 
@@ -488,11 +485,11 @@ msgstr "800"
 msgid "Default"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
-msgstr ""
+msgstr "Ponto"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr ""
 
@@ -500,11 +497,11 @@ msgstr ""
 msgid "Evaluative"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Parcial"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr ""
 
@@ -514,9 +511,9 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:183
 msgid "Very close"
-msgstr ""
+msgstr "Muito perto"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Fechar"
 
@@ -535,15 +532,15 @@ msgstr "Infinito"
 
 #: libexif/canon/mnote-canon-entry.c:190
 msgid "Manual AF point selection"
-msgstr ""
+msgstr "Seleção manual do ponto AF"
 
 #: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
 msgid "None (MF)"
-msgstr ""
+msgstr "Nenhum (MF)"
 
 #: libexif/canon/mnote-canon-entry.c:192
 msgid "Auto-selected"
-msgstr ""
+msgstr "Selecção automática"
 
 #: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:224
@@ -565,7 +562,7 @@ msgstr "Esquerda"
 
 #: libexif/canon/mnote-canon-entry.c:196
 msgid "Auto AF point selection"
-msgstr ""
+msgstr "Selecção automática do ponto AF"
 
 #: libexif/canon/mnote-canon-entry.c:197
 msgid "Easy shooting"
@@ -574,7 +571,7 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:163
 msgid "Program"
-msgstr ""
+msgstr "Programa"
 
 #: libexif/canon/mnote-canon-entry.c:199
 msgid "Tv-priority"
@@ -586,11 +583,11 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:202
 msgid "A-DEP"
-msgstr ""
+msgstr "A-DEP"
 
 #: libexif/canon/mnote-canon-entry.c:203
 msgid "M-DEP"
-msgstr ""
+msgstr "M-DEP"
 
 #: libexif/canon/mnote-canon-entry.c:204
 msgid "Canon EF 50mm f/1.8"
@@ -610,7 +607,7 @@ msgstr "Tokina AF193-2 19-35mm f/3.5-4.5"
 
 #: libexif/canon/mnote-canon-entry.c:208
 msgid "Canon EF 100-300mm F5.6L"
-msgstr ""
+msgstr "Canon EF 100-300mm F5.6L"
 
 #: libexif/canon/mnote-canon-entry.c:209
 msgid "Sigma 50mm f/2.8 EX or 28mm f/1.8"
@@ -646,16 +643,15 @@ msgstr "Canon EF 50mm f/1.8 MkII"
 
 #: libexif/canon/mnote-canon-entry.c:217
 msgid "Tamron SP AF 300mm f/2.8 LD IF"
-msgstr ""
+msgstr "Tamron SP AF 300mm f/2.8 LD IF"
 
 #: libexif/canon/mnote-canon-entry.c:218
 msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
-msgstr ""
+msgstr "Canon EF 24mm f/2.8 ou Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -667,16 +663,15 @@ msgstr "Canon EF 28-80mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF 28-105mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 28-105mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
+msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -688,15 +683,15 @@ msgstr "Canon TS-E 24mm f/3.5L"
 
 #: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon TS-E 45mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 45mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:228
 msgid "Canon TS-E 90mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 90mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 50mm f/1.0L"
-msgstr ""
+msgstr "Canon EF 50mm f/1.0L"
 
 #: libexif/canon/mnote-canon-entry.c:230
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
@@ -704,7 +699,7 @@ msgstr "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 
 #: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 600mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 600mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 200mm f/1.8L"
@@ -716,7 +711,7 @@ msgstr "Canon EF 300mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 85mm f/1.2L"
-msgstr ""
+msgstr "Canon EF 85mm f/1.2L"
 
 #: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 400mm f/2.8L"
@@ -728,11 +723,11 @@ msgstr "Canon EF 500mm f/4.5L"
 
 #: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 300mm f/2.8L IS"
-msgstr ""
+msgstr "Canon EF 300mm f/2.8L IS"
 
 #: libexif/canon/mnote-canon-entry.c:238
 msgid "Canon EF 500mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 500mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 100mm f/2"
@@ -748,7 +743,7 @@ msgstr "Canon EF 200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:242
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
-msgstr ""
+msgstr "Sigma 10-20mm F4-5.6 ou 12-24mm f/4.5-5.6 or 14mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 35-350mm f/3.5-5.6L"
@@ -784,7 +779,7 @@ msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 28mm f/1.8 USM"
-msgstr ""
+msgstr "Canon EF 28mm f/1.8 USM"
 
 #: libexif/canon/mnote-canon-entry.c:252
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
@@ -796,7 +791,7 @@ msgstr "Canon EF 200mm f/2.8L II"
 
 #: libexif/canon/mnote-canon-entry.c:254
 msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
-msgstr "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
+msgstr "Canon EF 180mm Macro f/3.5L ou Sigma 180mm EX HSM Macro f/3.5"
 
 #: libexif/canon/mnote-canon-entry.c:255
 msgid "Canon EF 135mm f/2L"
@@ -820,7 +815,7 @@ msgstr "Canon EF 35mm f/1.4L"
 
 #: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
@@ -832,7 +827,7 @@ msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
 
 #: libexif/canon/mnote-canon-entry.c:263
 msgid "Canon EF 400mm f/2.8L + x2"
-msgstr ""
+msgstr "Canon EF 400mm f/2.8L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:264
 msgid "Canon EF 70-200mm f/4L"
@@ -860,7 +855,7 @@ msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
 #: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF 28-200mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF 28-200mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 90-300mm f/4.5-5.6"
@@ -868,19 +863,19 @@ msgstr "Canon EF 90-300mm f/4.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
 #: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 16-35mm f/2.8L"
@@ -896,52 +891,51 @@ msgstr "Canon EF 17-40mm f/4L"
 
 #: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF-S60mm F2.8 Macro USM"
-msgstr ""
+msgstr "Canon EF-S60mm F2.8 Macro USM"
 
 #: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 24-105mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 24-105mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:285
 msgid "Canon EF 50mm F1.2L USM"
-msgstr ""
+msgstr "Canon EF 50mm F1.2L USM"
 
 #: libexif/canon/mnote-canon-entry.c:286
 msgid "Canon EF 70-200mm f/4L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 200mm f/2.8L II"
+msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
-msgstr ""
+msgstr "TTL"
 
 #: libexif/canon/mnote-canon-entry.c:290
 msgid "A-TTL"
-msgstr ""
+msgstr "A-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:291
 msgid "E-TTL"
-msgstr ""
+msgstr "E-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:292
 msgid "FP sync enabled"
@@ -958,7 +952,7 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:295
 #: libexif/olympus/mnote-olympus-entry.c:193
 msgid "Internal"
-msgstr ""
+msgstr "Interno"
 
 #: libexif/canon/mnote-canon-entry.c:296
 #: libexif/olympus/mnote-olympus-entry.c:194
@@ -967,7 +961,7 @@ msgstr "Externo"
 
 #: libexif/canon/mnote-canon-entry.c:299
 msgid "Normal AE"
-msgstr ""
+msgstr "AE normal"
 
 #: libexif/canon/mnote-canon-entry.c:300
 msgid "Exposure compensation"
@@ -983,7 +977,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:303
 msgid "No AE"
-msgstr ""
+msgstr "Sem AE"
 
 #: libexif/canon/mnote-canon-entry.c:306
 msgid "On, shot only"
@@ -1030,39 +1024,39 @@ msgid "Sunny"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Nublado"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Fluorescente"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
-msgstr ""
+msgstr "Flash"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "Manual temperature (Kelvin)"
-msgstr ""
+msgstr "Temperatura manual (Kelvin)"
 
 #: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
 msgid "PC set 1"
@@ -1077,7 +1071,7 @@ msgid "PC set 3"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr ""
@@ -1090,7 +1084,7 @@ msgstr ""
 msgid "Custom 2"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1132,7 +1126,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:366
 msgid "Compact"
-msgstr ""
+msgstr "Compacto"
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
@@ -1148,29 +1142,29 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:371
 msgid "Rotate 270 CW"
-msgstr ""
+msgstr "Rotação 270 graus"
 
 #: libexif/canon/mnote-canon-entry.c:372
 msgid "Rotated by software"
-msgstr ""
+msgstr "Rodado pelo programa"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr ""
 
@@ -1180,7 +1174,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1198,9 +1192,8 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1208,15 +1201,15 @@ msgstr "Luz do dia"
 
 #: libexif/canon/mnote-canon-entry.c:422
 msgid "Set 1"
-msgstr ""
+msgstr "Definição 1"
 
 #: libexif/canon/mnote-canon-entry.c:423
 msgid "Set 2"
-msgstr ""
+msgstr "Definição 2"
 
 #: libexif/canon/mnote-canon-entry.c:424
 msgid "Set 3"
-msgstr ""
+msgstr "Definição 3"
 
 #: libexif/canon/mnote-canon-entry.c:425
 msgid "User def. 1"
@@ -1232,15 +1225,15 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:428
 msgid "External 1"
-msgstr ""
+msgstr "Externo 1"
 
 #: libexif/canon/mnote-canon-entry.c:429
 msgid "External 2"
-msgstr ""
+msgstr "Externo 2"
 
 #: libexif/canon/mnote-canon-entry.c:430
 msgid "External 3"
-msgstr ""
+msgstr "Externo 3"
 
 #: libexif/canon/mnote-canon-entry.c:435
 msgid "Faithful"
@@ -1255,37 +1248,44 @@ msgstr ""
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr ""
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr ""
 
@@ -1293,8 +1293,7 @@ msgstr ""
 msgid "Settings (Second Part)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1349,8 +1348,8 @@ msgstr "Qualidade"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr ""
 
@@ -1361,9 +1360,8 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr ""
 
@@ -1382,25 +1380,24 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Contraste"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Saturação"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1410,7 +1407,7 @@ msgstr ""
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr ""
@@ -1423,7 +1420,7 @@ msgstr ""
 msgid "AF Point"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Modo de Exposição"
 
@@ -1530,7 +1527,7 @@ msgid "Exposure Compensation"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1570,11 +1567,12 @@ msgstr ""
 msgid "Focus Distance Lower"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Tempo de Exposição"
@@ -1623,45 +1621,45 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr ""
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr ""
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr ""
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr ""
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr ""
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 msgstr ""
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr ""
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1706,195 +1704,193 @@ msgid ""
 "fixed."
 msgstr ""
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr ""
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr ""
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr ""
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Não definido"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr ""
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Paleta"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr ""
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr ""
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr ""
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "Processo normal"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "Processo personalizado"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr ""
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr ""
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr ""
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1902,178 +1898,178 @@ msgstr ""
 msgid "Hard"
 msgstr ""
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr ""
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr ""
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr ""
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Padrão"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "Não comprimido"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "Compressão LZW"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "Compressão JPEG"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr ""
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr ""
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr ""
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Bom tempo"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Tempo nublado"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr ""
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr ""
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr ""
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "Polegada"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "in"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Centímetro"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "Programa normal"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr ""
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr ""
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr ""
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr ""
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr ""
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr ""
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr ""
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "Acção"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr ""
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr ""
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr ""
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2081,305 +2077,303 @@ msgstr ""
 msgid "Yes"
 msgstr "Sim"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr ""
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr ""
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr ""
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr ""
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr ""
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr ""
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr ""
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr ""
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr ""
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr ""
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr ""
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[Nenhum]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr ""
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Editor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr ""
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " seg."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr ""
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr ""
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr ""
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr ""
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr ""
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr ""
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr ""
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr ""
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr ""
@@ -2465,11 +2459,11 @@ msgstr ""
 msgid "The data provided does not follow the specification."
 msgstr ""
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr ""
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2477,11 +2471,11 @@ msgid ""
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr ""
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2489,25 +2483,25 @@ msgid ""
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr ""
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Latitude"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2516,21 +2510,21 @@ msgid ""
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Longitude"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2539,44 +2533,44 @@ msgid ""
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr "Altitude"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr ""
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2585,101 +2579,101 @@ msgid ""
 "the tag shall be set to NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr ""
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr ""
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr ""
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr ""
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr ""
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr ""
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr ""
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr ""
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2687,22 +2681,22 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 ""
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2712,21 +2706,21 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2736,49 +2730,49 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2786,70 +2780,80 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr ""
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr ""
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr ""
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Largura da Imagem"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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 ""
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr ""
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr ""
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2857,40 +2861,40 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Compressão"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 ""
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr ""
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr ""
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Nome do Documento"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "Descrição da Imagem"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2898,33 +2902,33 @@ msgid ""
 "is to be used."
 msgstr ""
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Fabricante"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 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 ""
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Modelo"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 ""
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr ""
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2932,30 +2936,30 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "Orientação"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr ""
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 ""
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr ""
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -2963,74 +2967,74 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr ""
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 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 ""
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr ""
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 ""
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Software"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3038,21 +3042,21 @@ msgid ""
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Data e Hora"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 msgstr ""
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Artista"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3060,51 +3064,51 @@ msgid ""
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
-msgstr ""
+msgstr "Ponto Branco"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr ""
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr ""
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr ""
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3113,11 +3117,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr ""
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3126,21 +3130,21 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr ""
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3155,11 +3159,11 @@ msgid ""
 "both centered and co-sited positioning."
 msgstr ""
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr ""
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3168,34 +3172,34 @@ msgid ""
 "Interoperability these conditions."
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr ""
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr ""
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 ""
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr ""
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "Copyright"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3214,122 +3218,118 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr ""
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr ""
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr ""
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr ""
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr ""
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr ""
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr ""
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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 ""
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3339,120 +3339,120 @@ msgid ""
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr ""
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Brilho"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 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 ""
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr ""
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr ""
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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 ""
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr ""
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr ""
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr ""
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr ""
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr ""
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 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 ""
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr ""
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr ""
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
-msgstr ""
+msgstr "Comentário do Utilizador"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3474,86 +3474,86 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr ""
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr ""
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr ""
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr ""
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3562,11 +3562,11 @@ msgid ""
 "be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3574,11 +3574,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3588,11 +3588,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3617,11 +3617,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3630,62 +3630,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr ""
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr ""
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3694,176 +3694,176 @@ msgid ""
 "number."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr ""
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr ""
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr ""
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr ""
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr ""
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr ""
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr ""
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
-msgstr ""
+msgstr "Gama"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4041,17 +4041,11 @@ msgstr ""
 msgid "Wide2 (400%)"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr ""
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr ""
@@ -4477,117 +4471,117 @@ msgstr ""
 msgid "20 frames/sec"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr ""
@@ -4689,8 +4683,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr ""
 
@@ -4862,13 +4855,11 @@ msgstr ""
 msgid "White Balance Setting"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr ""
 
@@ -5216,10 +5207,20 @@ msgstr ""
 msgid "Digital filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:385
 #, c-format
-msgid "Internal error (unknown value %i %i)"
+msgid "Internal error (unknown value %hi %hi)"
 msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
deleted file mode 100644
index f5f65d1..0000000
--- a/po/pt_BR.gmo
+++ /dev/null
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cbf71b3..f940c65 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2012-04-25 00:25+0000\n"
-"Last-Translator: Rafael Neri <Unknown>\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
+"PO-Revision-Date: 2013-10-11 00:40+0000\n"
+"Last-Translator: Juliano Fischer Naves <julianofischer@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <pt_BR@li.org>\n"
-"Language: \n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 06:52+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2016-09-01 20:32+0000\n"
+"X-Generator: Launchpad (build 18179)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -41,7 +41,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Número inválido de componentes (%i, esperados %i ou %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -52,14 +52,14 @@ msgstr "Macro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -88,15 +88,15 @@ msgstr "Superfino"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -128,8 +128,8 @@ msgstr "Automático"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -149,8 +149,7 @@ msgstr "Sincronização lenta"
 msgid "Auto, red-eye reduction"
 msgstr "Automático, redução de olhos vermelhos"
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr "Ligado, redução de olhos vermelhos"
 
@@ -272,9 +271,8 @@ msgstr "Automático"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -286,7 +284,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -315,7 +313,7 @@ msgid "Sepia"
 msgstr "Sépia"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -342,8 +340,7 @@ msgstr "Vivo"
 msgid "Neutral"
 msgstr "Neutro"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "Flash desligado"
 
@@ -425,7 +422,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Nenhum"
@@ -438,8 +435,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "Outro"
 
@@ -489,11 +486,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Padrão"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "Local"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Média"
 
@@ -501,11 +498,11 @@ msgstr "Média"
 msgid "Evaluative"
 msgstr "Avaliativa"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Parcial"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr "Balaceamento central médio"
 
@@ -517,7 +514,7 @@ msgstr "Desconhecido"
 msgid "Very close"
 msgstr "Fechamento alto"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Fechar"
 
@@ -654,9 +651,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -675,9 +671,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -928,9 +923,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
+msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -1031,32 +1025,32 @@ msgid "Sunny"
 msgstr "Ensolarado"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Nublado"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Tungstênio"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Fluorescente"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Flash"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Sombra"
@@ -1078,7 +1072,7 @@ msgid "PC set 3"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Luz fluorescente"
@@ -1091,7 +1085,7 @@ msgstr "Personalizado 1"
 msgid "Custom 2"
 msgstr "Personalizado 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1156,22 +1150,22 @@ msgid "Rotated by software"
 msgstr "Rotacionado por software"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Esquerda para direita"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Direita para esquerda"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Baixo para cima"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Cima para baixo"
 
@@ -1181,7 +1175,7 @@ msgstr "matriz 2x2 (sentido horário)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1199,9 +1193,8 @@ msgstr "Mais baixa"
 msgid "Highest"
 msgstr "Mais alta"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1256,37 +1249,44 @@ msgstr "Monocromático"
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i bytes de dados desconhecidos"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr "Configurações (Primeira parte)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Comprimento focal"
 
@@ -1294,8 +1294,7 @@ msgstr "Comprimento focal"
 msgid "Settings (Second Part)"
 msgstr "Configurações (Segunda parte)"
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1350,8 +1349,8 @@ msgstr "Qualidade"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "Modo flash"
 
@@ -1362,9 +1361,8 @@ msgstr "Modo direção"
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "Modo foco"
 
@@ -1383,25 +1381,24 @@ msgstr "Modo fácil de disparo"
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "Zoom digital"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Contraste"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Saturação"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1411,7 +1408,7 @@ msgstr "Nitidez"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "Modo de medida"
@@ -1424,7 +1421,7 @@ msgstr "Distância do foco"
 msgid "AF Point"
 msgstr "Ponto AF"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Modo de exposição"
 
@@ -1531,7 +1528,7 @@ msgid "Exposure Compensation"
 msgstr "Compensação de exposição"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1565,17 +1562,18 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:109
 msgid "Focus Distance Upper"
-msgstr ""
+msgstr "Distância de foco superior"
 
 #: libexif/canon/mnote-canon-tag.c:110
 msgid "Focus Distance Lower"
-msgstr ""
+msgstr "Distância de foco inferior"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Tempo de Exposição"
@@ -1624,35 +1622,35 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr "Tamanho de dados muito pequeno para permitir dados EXIF."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr "Marcador EXIF não encontrado."
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr "Cabeçalho EXIF não encontrado."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr "Codificação desconhecida."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr "Ignorar marcações desconhecidas"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Ignorar marcações desconhecidas enquanto carrega os dados do EXIF."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr "Seguinte especificação"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
@@ -1660,11 +1658,11 @@ msgstr ""
 "Adicionar, corrigir e excluir entradas para pegar os dados do EXIF que segue "
 "as especificações."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr "Não altere a nota do fabricante"
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1679,6 +1677,8 @@ msgid ""
 "Tag '%s' was of format '%s' (which is against specification) and has been "
 "changed to format '%s'."
 msgstr ""
+"Etiqueta '%s' era do formato '%s' (o qual é contra a especificação) e foi "
+"alterado para o formato '%s'."
 
 #: libexif/exif-entry.c:271
 #, c-format
@@ -1686,6 +1686,8 @@ msgid ""
 "Tag '%s' is of format '%s' (which is against specification) but cannot be "
 "changed to format '%s'."
 msgstr ""
+"Etiqueta '%s' era do formato '%s' (o qual é contra a especificação) mas não "
+"pôde ser alterado para o formato '%s'."
 
 #: libexif/exif-entry.c:354
 #, c-format
@@ -1693,216 +1695,222 @@ msgid ""
 "Tag 'UserComment' had invalid format '%s'. Format has been set to "
 "'undefined'."
 msgstr ""
+"Etiqueta 'UserComment' tinha formato inválido '%s'. Formato foi definido "
+"como 'undefined'."
 
 #: libexif/exif-entry.c:381
 msgid ""
 "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
 "the specification."
 msgstr ""
+"Etiqueta 'UserComment' foi expandida para pelo menos 8 bytes de modo a "
+"seguir a especificação."
 
 #: libexif/exif-entry.c:396
 msgid ""
 "Tag 'UserComment' is not empty but does not start with a format identifier. "
 "This has been fixed."
 msgstr ""
+"Etiqueta 'UserComment' não está vazia, mas não inicia com um identificador "
+"de formato. Isso foi consertado."
 
 #: libexif/exif-entry.c:424
 msgid ""
 "Tag 'UserComment' did not start with a format identifier. This has been "
 "fixed."
 msgstr ""
+"Etiqueta 'UserComment' não inicia com um identificador de formato. Isso foi "
+"consertado."
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
-msgstr ""
+msgstr "%i bytes de dados indefinidos"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
-msgstr ""
+msgstr "%i bytes de tipos de dados não suportados"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 "A marcação '%s' contem dados ou formato inválido ('%s', esperado '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr ""
 "A marcação '%s' contém um número inválido de componentes (%i, esperado %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
-msgstr ""
+msgstr "Formato robusto"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
-msgstr ""
+msgstr "Formato plano"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Não definido"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "Sensor de área da cor de um chip"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr "Sensor trilinear"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Esquerda superior"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Canto superior-direito"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Canto inferior-direito"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Canto inferior-esquerdo"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
-msgstr ""
+msgstr "Superior esquerdo"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
-msgstr ""
+msgstr "Superior direito"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
-msgstr ""
+msgstr "Inferior direito"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
-msgstr ""
+msgstr "Inferior esquerdo"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr "Centralizado"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr "Normal mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Paleta"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "Processo normal"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "Processo padrão"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr "Exposição automática"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Exposição Manual"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr "Colchete automático"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr "Balanceamento automático de branco"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr "Balanceamento manual de branco"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr "Subida do ganho baixo"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr "Subida do ganho alto"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr "Descida do ganho baixo"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr "Descida do ganho alto"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "Baixa saturação"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Alta saturação"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "Suave"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1910,178 +1918,178 @@ msgstr "Suave"
 msgid "Hard"
 msgstr "Difícil"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr ""
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
-msgstr ""
+msgstr "Peso central"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr ""
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Padrão"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "Sem compressão"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "Compressão LZQ"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "Compressão JPEG"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
-msgstr ""
+msgstr "Desinflar/Compressão ZIP"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
-msgstr ""
+msgstr "compressão PackBits"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr "Luz de tungstênio incandescente"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Tempo bom"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Tempo nublado"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Fluorescente branco"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr "Fluorescente branco \"frio\""
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "Fluorescente branco"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "Luz Padrão A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "Luz Padrão B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "Luz Padrão C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr "Tungstênio de estúdio ISO"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "Polegada"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "pol"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Centímetro"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "Programa normal"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr "Prioridade de Abertura"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "Abertura"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr "Prioridade de fechamento"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr ""
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
-msgstr ""
+msgstr "Programa criativo (tendência para profundidade do campo)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr "Criativo"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
-msgstr ""
+msgstr "Programa criativo (tendência a velocidade rápida do obturador)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "Ação"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
-msgstr ""
+msgstr "Modo retrato (para fotografia de perto, com fundo fora de foco)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Modo paisagem (para fotos de paisagens com o fundo em foco)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "Flash não ativado"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
-msgstr ""
+msgstr "Sem flash"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
-msgstr ""
+msgstr "Flash disparado"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2089,305 +2097,317 @@ msgstr ""
 msgid "Yes"
 msgstr "Sim"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
-msgstr ""
+msgstr "Luz de retorno não detectada"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
-msgstr ""
+msgstr "Sem luz de retorno"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
-msgstr ""
+msgstr "Luz de retorno detectada"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
-msgstr ""
+msgstr "Com luz de retorno"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
-msgstr ""
+msgstr "Flash disparado, modo de flash forçado"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
+msgstr "Flash disparado, modo de flash forçado, luz de retorno não detectada"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
-msgstr ""
+msgstr "Flash disparado, modo de flash forçado, luz de retorno detectada"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
-msgstr ""
+msgstr "Flash não disparou, modo de flash forçado"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
-msgstr ""
+msgstr "Flash não disparou, modo automático"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
-msgstr ""
+msgstr "Flash disparou, modo automático"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
+msgstr "Flash disparou, modo automático, luz de retorno não detectada"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
-msgstr ""
+msgstr "Flash disparou, modo automático, luz de retorno detectada"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
-msgstr ""
+msgstr "Sem função de flash"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
-msgstr ""
+msgstr "Flash disparou, modo de redução de olhos vermelhos"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
+"Flash disparou, modo de redução de olhos vermelhos, luz de retorno não "
+"detectada"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
+"Flash disparou, modo de redução de olhos vermelhos, luz de retorno detectada"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
+"Flash disparou, modo de flash forçado, modo de redução de olhos vermelhos"
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
+"Flash disparou, modo de flash forçado, modo de redução de olhos vermelhos, "
+"luz de retorno não detectada"
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
+"Flash disparou, modo de flash forçado, modo de redução de olhos vermelhos, "
+"luz de retorno detectada"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr ""
+"Flash não disparou, modo automático, modo de redução de olhos vermelhos"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "Flash disparou, modo automático, modo de redução de olhos vermelhos"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
+"Flash disparou, modo automático, luz de retorno não detectada, modo de "
+"redução de olhos vermelhos"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
+"Flash disparou, modo automático, luz de retorno detectada, modo de redução "
+"de olhos vermelhos"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr "Visualização próxima"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr "Visualização distante"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr "Distante"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr "Descalibrado"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Tamanho de entrada inválido (%i, esperado %li x %i )"
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr "String UNICODE não suportada"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr "String JIS não suportada"
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Byte na posição %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr "Vesão Exif desconhecida"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Versão do Exif %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr "Versão do FlashPix 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr "Versão do FlashPix 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr "Versão desconhecida do FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[Vazio]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "(Fotógrafo)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Editor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35 equivalente: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " seg."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
-msgstr ""
+msgstr " (1/%d seg.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
-msgstr ""
+msgstr " (%d seg.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Erro interto (valor %i desconhecido)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "D"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
-msgstr ""
+msgstr "Reservado"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
-msgstr ""
+msgstr "Fotografado diretamente"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "Curta distância %i de (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr ""
+"Dentro do retângulo (largura %i, altura %i) em torno de (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Número de componentes inesperados (%li, esperado 2, 3 ou 4)"
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr "Nível do mar"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
-msgstr ""
+msgstr "Referência do nível do mar"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr "Valor %i desconhecido"
@@ -2410,7 +2430,7 @@ msgstr "Indefinido"
 
 #: libexif/exif-format.c:41
 msgid "ASCII"
-msgstr ""
+msgstr "ASCII"
 
 #: libexif/exif-format.c:42
 msgid "Long"
@@ -2473,11 +2493,11 @@ msgstr "Dados corrompidos"
 msgid "The data provided does not follow the specification."
 msgstr "Os dados fornecidos não seguem a especificação."
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
-msgstr ""
+msgstr "Versão da etiqueta GPS"
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2485,11 +2505,11 @@ msgid ""
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
-msgstr ""
+msgstr "�ndice de interoperabilidade"
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2497,25 +2517,25 @@ msgid ""
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr "Latitude Norte ou Sul"
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
-msgstr ""
+msgstr "Versão de interoperabilidade"
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Latitude"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2524,21 +2544,21 @@ msgid ""
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr "Longitude Leste ou Oeste"
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Longitude"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2547,44 +2567,44 @@ msgid ""
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr "Altitude de referência"
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr "Altitude"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr "Tempo GPS (Relógio atômico)"
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr ""
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2593,101 +2613,113 @@ msgid ""
 "the tag shall be set to NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
-msgstr ""
+msgstr "Estado do receptor GPS"
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
+"Indica o estado do receptor GPS quando a imagem é salva. 'A' significado que "
+"a medição está em andamento e 'V' significa que a medição é "
+"Interoperabilidade."
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
-msgstr ""
+msgstr "Modo de medição GPS"
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
+"Indica o modo de medida GPS. '2' significa medida bidimensional e '3' "
+"significa que uma medida tridimensional está em andamento."
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
-msgstr ""
+msgstr "Precisão de medida"
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr "Unidade de velocidade"
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
+"Indica a unidade utilizada para expressar a velocidade do movimento do "
+"recebedor GPS . 'K', 'M' and 'N' representam quilômetros por hora, milhas "
+"por hora e nós."
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
-msgstr ""
+msgstr "Velocidade do recebedor GPS"
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr "Referência para direção do movimento"
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
+"Indica a referência para dar a direção do movimento do receptor GPS. 'T' "
+"denota sentido verdadeiro e 'M' é o sentido magnético."
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr "Direção do movimento"
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
+"Indica a referência para dar a direção da imagem quando ela é capturada. 'T' "
+"denota sentido verdadeiro e 'M' é o sentido magnético."
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr ""
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
-msgstr ""
+msgstr "Dados de avaliação geodésica utilizados"
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2695,22 +2727,24 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
-msgstr ""
+msgstr "Referência para latitude do destino"
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 se a latitude do ponto de destino é norte ou sul. O valor ASCII 'N' "
+"indica latitude norte e 'S' indica latitude sul."
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
-msgstr ""
+msgstr "Latitude do destino"
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2720,21 +2754,23 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
-msgstr ""
+msgstr "Referência para longitude do destino"
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
+"Indica se a latitude do ponto de destino é leste ou oeste. O valor ASCII 'E' "
+"indica longitude leste e 'W' indica longitude oeste."
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
-msgstr ""
+msgstr "Longitude do destino"
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2744,110 +2780,127 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
-msgstr ""
+msgstr "Referência para distância até o destino"
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr "Distância até o destino"
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
-msgstr ""
+msgstr "Indica a distância até o ponto de destino."
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
-msgstr ""
+msgstr "Nome do método de processamento do GPS"
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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. Since the Type is not ASCII, NULL "
 "termination is not necessary."
 msgstr ""
+"Uma string de caracteres registrando o nome do método usado para encontrar a "
+"localização. O primeiro byte indica o código de caracteres utilizado e é "
+"seguido pelo nome do método. Desde que o tipo não seja ASCII, terminação com "
+"NULL não é necessária."
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
-msgstr ""
+msgstr "Nome da área GPS"
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
+"Uma string de caracteres registrando o nome da área GPS. O primeiro byte "
+"indica o código de caracteres utilizado e é seguido pelo nome da área GPS. "
+"Desde que o tipo não seja ASCII, terminação com NULL não é necessária."
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr "Data do GPS"
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
-msgstr ""
+msgstr "Correção diferencial do GPS"
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "Novo tipo de subarquivo"
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Lagura de imagem"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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 ""
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr "Altura da Imagem"
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -2855,11 +2908,11 @@ msgstr ""
 "O número de linhas dos dados da imagem. Em dados comprimidos em JPEG, um "
 "marcador JPEG é usado ao invés desta etiqueta."
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr "Bits por Amostra"
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2867,40 +2920,40 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Compressão"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 ""
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr "Interpretação fotométrica"
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr "Ordem de preenchimento"
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Nome do Documento"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "Descrição de Imagem"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2908,11 +2961,11 @@ msgid ""
 "is to be used."
 msgstr ""
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Fabricante"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -2922,22 +2975,22 @@ msgstr ""
 "scanner, digitalizador de vídeo ou outro equipamento que gera a imagem. "
 "Quando este campo é deixado em branco, ele é tratado como desconhecido."
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Modelo"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 ""
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr ""
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2945,30 +2998,30 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "Orientação"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "A orientação da imagem é vista em termos de linhas e colunas"
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr "Modelos por Pixel"
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 ""
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr ""
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -2976,74 +3029,74 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr ""
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr "Configuração Plana"
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr "Unidade de Resolução"
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 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 ""
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr "Função de Tranferência"
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 ""
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Software"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3051,11 +3104,11 @@ msgid ""
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
@@ -3063,63 +3116,74 @@ msgstr ""
 "A data e o tempo da criação da imagem. Neste padrão (EXIF-2.1) é a data e o "
 "tempo de quando o arquivo foi alterado."
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Artista"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
 "the information be written as in the example below for ease of "
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
+"Esta etiqueta registra o nome do proprietário da câmera, fotógrafo ou "
+"criador da imagem. O formato detalhado não é especificado, mas é recomendado "
+"que a informação seja escrita como no exemplo abaixo para facilidade de "
+"interoperabilidade. Quando o campo é deixado branco, ele é tratado como "
+"desconhecido."
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Ponto Branco"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
+"A cromaticidade do ponto branco da imagem. Normalmente esta etiqueta não é "
+"necessária, desde que o espaço de cores seja especificado na etiqueta de "
+"informação do espaço de cores (<ColorSpace>)."
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr ""
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
+"A cromaticidade das três cores primárias da imagem. Normalmente esta "
+"etiqueta não é necessária, desde que o espaço de cores seja especificado na "
+"etiqueta de informação do espaço de cores (<ColorSpace>)."
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr "Faixa de Transferência"
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr ""
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3128,11 +3192,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr "Coeficientes YCbCr"
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3141,21 +3205,21 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr "Posicionamento YCbCr"
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3170,11 +3234,11 @@ msgid ""
 "both centered and co-sited positioning."
 msgstr ""
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr "Referência preta/bBranca"
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3183,34 +3247,34 @@ msgid ""
 "Interoperability these conditions."
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr "Pacote XML"
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr "Metadado XMP"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr "Padrão CFA"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 ""
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Nível de Bateria"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "Direitos Autorais"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3229,122 +3293,118 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Tempo de exposição, em segundos (seg.)"
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr "O número F."
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr ""
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr "Programa de exposição"
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr "Sensibilidade espectral"
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr ""
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
-msgstr ""
+msgstr "Codifica o fuso horário do relógio da câmera relativo ao GMT."
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr "Versão Exif"
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
-msgstr ""
+msgstr "Data e hora (originais)"
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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 ""
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
-msgstr ""
+msgstr "Data e hora (digitalizadas)"
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr "Configuração de componentes"
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3354,11 +3414,11 @@ msgid ""
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr "Bits comprimidos por pixel"
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -3366,110 +3426,110 @@ msgstr ""
 "Informação específica para dados comprimidos. O modo de compressão usado "
 "para comprimir a imagem é indicado em um bit por pixel."
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Velocidade da veneziana"
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Brilho"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 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 ""
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr "Linha de exibição"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr ""
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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 ""
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr "Distância do assunto"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr ""
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr ""
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "Fonte de luz"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr "O tipo de fonte de luz"
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 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 ""
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr ""
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr "Fazer Nota"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "Comentário do Usuário"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3491,92 +3551,102 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 "Uma etiqueta usada para gravar frações de segundos para a etiqueta "
 "<DateTime>."
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "Uma etiqueta usada para gravar frações de segundos para a etiqueta "
 "<DateTimeOriginal>."
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Uma etiqueta usada para gravar frações de segundos para a etiqueta "
 "<DateTimeDigitized>."
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr "XP Título"
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
+"Uma string de caracteres fornecendo o título da imagem, codificada com "
+"UTF-16LE."
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr "XP Comentário"
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
+"Uma string de caracteres contendo um comentário sobre a imagem, codificada "
+"com UTF-16LE."
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr "XP Autor"
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
+"Uma string de caracteres contendo o nome do criador da imagem, codificada "
+"com UTF-16LE."
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr "XP Palavras-chave"
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
+"Uma string de caracteres contendo as palavras-chave descrevendo a imagem, "
+"codificada com UTF-16LE."
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr "XP Assunto"
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
+"Uma string de caracteres contendo o assunto da imagem, codificada com "
+"UTF-16LE."
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Espaço de Cores"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3585,11 +3655,11 @@ msgid ""
 "be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3597,11 +3667,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3611,11 +3681,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
-msgstr ""
+msgstr "Arquivo de som relacionado"
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3640,11 +3710,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3653,62 +3723,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr "Energia do Flash"
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
-msgstr ""
+msgstr "Resposta de frequência espacial"
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
-msgstr ""
+msgstr "Resolução X do plano focal"
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
-msgstr ""
+msgstr "Resolução Y do plano focal"
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr "Unidade de resolução plana focal"
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
-msgstr ""
+msgstr "Localização do assunto"
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3717,176 +3787,176 @@ msgid ""
 "number."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
-msgstr ""
+msgstr "�ndice de exposição"
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr "Modo de sensibilidade"
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Arquivo de origem"
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr "Tipo da cena"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr "Processamento personalizado"
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
-msgstr ""
+msgstr "Razão de ampliação digital"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
-msgstr ""
+msgstr "Distância focal em filme de 35mm"
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr "Tipo de captura de cena"
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr "Controle de ganho"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr "Descrição da configuração do dispositivo"
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr "ID Único de imagem"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr "Gama"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
-msgstr ""
+msgstr "Indica o valor do coeficiente gamma."
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -3994,15 +4064,15 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:152
 msgid "Blur warning"
-msgstr ""
+msgstr "Aviso de desfoque"
 
 #: libexif/fuji/mnote-fuji-entry.c:155
 msgid "Focus good"
-msgstr ""
+msgstr "Bom foco"
 
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
-msgstr ""
+msgstr "Fora de foco"
 
 #: libexif/fuji/mnote-fuji-entry.c:159
 msgid "AE good"
@@ -4010,7 +4080,7 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:160
 msgid "Over exposed"
-msgstr ""
+msgstr "Muito exposto"
 
 #: libexif/fuji/mnote-fuji-entry.c:164
 msgid "Wide"
@@ -4026,11 +4096,11 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:169
 msgid "F1a/Professional portrait"
-msgstr ""
+msgstr "F1a/Retrato profissional"
 
 #: libexif/fuji/mnote-fuji-entry.c:170
 msgid "F1b/Professional portrait"
-msgstr ""
+msgstr "F1b/Retrato profissional"
 
 #: libexif/fuji/mnote-fuji-entry.c:171
 msgid "F1c/Professional portrait"
@@ -4050,7 +4120,7 @@ msgstr "F4/Velvia"
 
 #: libexif/fuji/mnote-fuji-entry.c:177
 msgid "Auto (100-400%)"
-msgstr ""
+msgstr "Automático (100-400%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:179
 msgid "Standard (100%)"
@@ -4058,22 +4128,16 @@ msgstr "Padrão (100%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:180
 msgid "Wide1 (230%)"
-msgstr ""
+msgstr "Amplo1 (230%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:181
 msgid "Wide2 (400%)"
-msgstr ""
+msgstr "Amplo2 (400%)"
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
-msgstr ""
-
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr ""
+msgstr "%2.2f mm"
 
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
@@ -4081,11 +4145,11 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:37
 msgid "This number is unique and based on the date of manufacture."
-msgstr ""
+msgstr "Este número é único e baseado na data de manufatura."
 
 #: libexif/fuji/mnote-fuji-tag.c:41
 msgid "Chromaticity Saturation"
-msgstr ""
+msgstr "Saturação de cromaticidade"
 
 #: libexif/fuji/mnote-fuji-tag.c:44
 msgid "Flash Firing Strength Compensation"
@@ -4093,11 +4157,11 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:46
 msgid "Focusing Mode"
-msgstr ""
+msgstr "Modo focalizando"
 
 #: libexif/fuji/mnote-fuji-tag.c:47
 msgid "Focus Point"
-msgstr ""
+msgstr "Ponto de foco"
 
 #: libexif/fuji/mnote-fuji-tag.c:48
 msgid "Slow Synchro Mode"
@@ -4109,11 +4173,11 @@ msgstr "Modo imagem"
 
 #: libexif/fuji/mnote-fuji-tag.c:50
 msgid "Continuous Taking"
-msgstr ""
+msgstr "Captura contínua"
 
 #: libexif/fuji/mnote-fuji-tag.c:51
 msgid "Continuous Sequence Number"
-msgstr ""
+msgstr "Número de sequência contínuo"
 
 #: libexif/fuji/mnote-fuji-tag.c:52
 msgid "FinePix Color"
@@ -4121,23 +4185,23 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:53
 msgid "Blur Check"
-msgstr ""
+msgstr "Verificação de desfoque"
 
 #: libexif/fuji/mnote-fuji-tag.c:54
 msgid "Auto Focus Check"
-msgstr ""
+msgstr "Verificação de foco automática"
 
 #: libexif/fuji/mnote-fuji-tag.c:55
 msgid "Auto Exposure Check"
-msgstr ""
+msgstr "Verificação de exposição automática"
 
 #: libexif/fuji/mnote-fuji-tag.c:56
 msgid "Dynamic Range"
-msgstr ""
+msgstr "Intervalo dinâmico"
 
 #: libexif/fuji/mnote-fuji-tag.c:57
 msgid "Film Simulation Mode"
-msgstr ""
+msgstr "Modo de simulação de filme"
 
 #: libexif/fuji/mnote-fuji-tag.c:58
 msgid "Dynamic Range Wide Mode"
@@ -4149,56 +4213,56 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:60
 msgid "Minimum Focal Length"
-msgstr ""
+msgstr "Distância focal mínima"
 
 #: libexif/fuji/mnote-fuji-tag.c:61
 msgid "Maximum Focal Length"
-msgstr ""
+msgstr "Distância focal máxima"
 
 #: libexif/fuji/mnote-fuji-tag.c:62
 msgid "Maximum Aperture at Minimum Focal"
-msgstr ""
+msgstr "Abertura máxima com focal mínima"
 
 #: libexif/fuji/mnote-fuji-tag.c:63
 msgid "Maximum Aperture at Maximum Focal"
-msgstr ""
+msgstr "Abertura máxima com focal máxima"
 
 #: libexif/fuji/mnote-fuji-tag.c:65
 msgid "Order Number"
-msgstr ""
+msgstr "Número do pedido"
 
 #: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
 msgid "Frame Number"
-msgstr ""
+msgstr "Número do quadro"
 
 #: libexif/olympus/mnote-olympus-entry.c:49
 #, c-format
 msgid "Invalid format '%s', expected '%s' or '%s'."
-msgstr ""
+msgstr "Formato inválido '%s', esperado '%s' ou '%s'."
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF non D lens"
-msgstr ""
+msgstr "lentes AF não D"
 
 #: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D or AF-S lens"
-msgstr ""
+msgstr "lentes AF-D ou AF-S"
 
 #: libexif/olympus/mnote-olympus-entry.c:95
 msgid "AF-D G lens"
-msgstr ""
+msgstr "lentes AF-D G"
 
 #: libexif/olympus/mnote-olympus-entry.c:96
 msgid "AF-D VR lens"
-msgstr ""
+msgstr "lentes AF-D VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "AF-D G VR lens"
-msgstr ""
+msgstr "lentes AF-D G VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:101
 msgid "Flash unit unknown"
-msgstr ""
+msgstr "Unidade de flash desconhecida"
 
 #: libexif/olympus/mnote-olympus-entry.c:102
 msgid "Flash is external"
@@ -4206,43 +4270,43 @@ msgstr "Flash externo"
 
 #: libexif/olympus/mnote-olympus-entry.c:103
 msgid "Flash is on camera"
-msgstr ""
+msgstr "Flash é na câmera"
 
 #: libexif/olympus/mnote-olympus-entry.c:106
 msgid "VGA basic"
-msgstr ""
+msgstr "VGA básico"
 
 #: libexif/olympus/mnote-olympus-entry.c:107
 msgid "VGA normal"
-msgstr ""
+msgstr "VGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:108
 msgid "VGA fine"
-msgstr ""
+msgstr "VGA fino"
 
 #: libexif/olympus/mnote-olympus-entry.c:109
 msgid "SXGA basic"
-msgstr ""
+msgstr "SXGA básico"
 
 #: libexif/olympus/mnote-olympus-entry.c:110
 msgid "SXGA normal"
-msgstr ""
+msgstr "SXGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:111
 msgid "SXGA fine"
-msgstr ""
+msgstr "SXGA fino"
 
 #: libexif/olympus/mnote-olympus-entry.c:112
 msgid "2 Mpixel basic"
-msgstr ""
+msgstr "2 Mpixel básico"
 
 #: libexif/olympus/mnote-olympus-entry.c:113
 msgid "2 Mpixel normal"
-msgstr ""
+msgstr "2 Mpixel normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:114
 msgid "2 Mpixel fine"
-msgstr ""
+msgstr "2 Mpixel fino"
 
 #: libexif/olympus/mnote-olympus-entry.c:117
 msgid "Color"
@@ -4266,20 +4330,20 @@ msgstr "Contraste-"
 
 #: libexif/olympus/mnote-olympus-entry.c:128
 msgid "ISO 80"
-msgstr ""
+msgstr "ISO 80"
 
 #: libexif/olympus/mnote-olympus-entry.c:129
 msgid "ISO 160"
-msgstr ""
+msgstr "ISO 160"
 
 #: libexif/olympus/mnote-olympus-entry.c:130
 msgid "ISO 320"
-msgstr ""
+msgstr "ISO 320"
 
 #: libexif/olympus/mnote-olympus-entry.c:131
 #: libexif/olympus/mnote-olympus-entry.c:249
 msgid "ISO 100"
-msgstr ""
+msgstr "ISO 100"
 
 #: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Preset"
@@ -4299,35 +4363,35 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:143
 msgid "No fisheye"
-msgstr ""
+msgstr "Nenhum olho-de-peixe"
 
 #: libexif/olympus/mnote-olympus-entry.c:144
 msgid "Fisheye on"
-msgstr ""
+msgstr "Olho-de-peixe ligado"
 
 #: libexif/olympus/mnote-olympus-entry.c:147
 msgid "Normal, SQ"
-msgstr ""
+msgstr "Normal, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:148
 msgid "Normal, HQ"
-msgstr ""
+msgstr "Normal, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:149
 msgid "Normal, SHQ"
-msgstr ""
+msgstr "Normal, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:150
 msgid "Normal, RAW"
-msgstr ""
+msgstr "Normal, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:151
 msgid "Normal, SQ1"
-msgstr ""
+msgstr "Normal, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:152
 msgid "Normal, SQ2"
-msgstr ""
+msgstr "Normal, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:153
 msgid "Normal, super high"
@@ -4335,7 +4399,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Normal, standard"
-msgstr ""
+msgstr "Normal, padrão"
 
 #: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, SQ"
@@ -4343,23 +4407,23 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, HQ"
-msgstr ""
+msgstr "Fino, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SHQ"
-msgstr ""
+msgstr "Fino, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, RAW"
-msgstr ""
+msgstr "Fino, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Fine, SQ1"
-msgstr ""
+msgstr "Fino, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Fine, SQ2"
-msgstr ""
+msgstr "Fino, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Fine, super high"
@@ -4367,27 +4431,27 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, SQ"
-msgstr ""
+msgstr "Super fino, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, HQ"
-msgstr ""
+msgstr "Super fino, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SHQ"
-msgstr ""
+msgstr "Super fino, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, RAW"
-msgstr ""
+msgstr "Super fino, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, SQ1"
-msgstr ""
+msgstr "Super fino, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:167
 msgid "Super fine, SQ2"
-msgstr ""
+msgstr "Super fino, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:168
 msgid "Super fine, super high"
@@ -4415,7 +4479,7 @@ msgstr "Preencher"
 
 #: libexif/olympus/mnote-olympus-entry.c:195
 msgid "Internal + external"
-msgstr ""
+msgstr "Interno + externo"
 
 #: libexif/olympus/mnote-olympus-entry.c:224
 msgid "Interlaced"
@@ -4433,7 +4497,7 @@ msgstr "Bom"
 
 #: libexif/olympus/mnote-olympus-entry.c:232
 msgid "Adjust exposure"
-msgstr ""
+msgstr "Ajustar exposição"
 
 #: libexif/olympus/mnote-olympus-entry.c:235
 msgid "Spot focus"
@@ -4441,7 +4505,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Normal focus"
-msgstr ""
+msgstr "Foco normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:239
 msgid "Record while down"
@@ -4449,19 +4513,19 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:240
 msgid "Press start, press stop"
-msgstr ""
+msgstr "Pressione iniciar, pressione parar"
 
 #: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 50"
-msgstr ""
+msgstr "ISO 50"
 
 #: libexif/olympus/mnote-olympus-entry.c:250
 msgid "ISO 200"
-msgstr ""
+msgstr "ISO 200"
 
 #: libexif/olympus/mnote-olympus-entry.c:251
 msgid "ISO 400"
-msgstr ""
+msgstr "ISO 400"
 
 #: libexif/olympus/mnote-olympus-entry.c:255
 #: libexif/pentax/mnote-pentax-entry.c:168
@@ -4486,134 +4550,134 @@ msgstr "Lâmpada"
 
 #: libexif/olympus/mnote-olympus-entry.c:263
 msgid "5 frames/sec"
-msgstr ""
+msgstr "5 quadros/seg"
 
 #: libexif/olympus/mnote-olympus-entry.c:264
 msgid "10 frames/sec"
-msgstr ""
+msgstr "10 quadros/seg"
 
 #: libexif/olympus/mnote-olympus-entry.c:265
 msgid "15 frames/sec"
-msgstr ""
+msgstr "15 quadros/seg"
 
 #: libexif/olympus/mnote-olympus-entry.c:266
 msgid "20 frames/sec"
-msgstr ""
+msgstr "20 quadros/seg"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
-msgstr ""
+msgstr "Correção vermelha %f, correção azul %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
-msgstr ""
+msgstr "Nenhuma seleção manual de foco"
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f metros"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
-msgstr ""
+msgstr "Posição AF: centro"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
-msgstr ""
+msgstr "Posição AF: cima"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
-msgstr ""
+msgstr "Posição AF: inferior"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
-msgstr ""
+msgstr "Posição AF: esquerda"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
-msgstr ""
+msgstr "Posição AF: direita"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
-msgstr ""
+msgstr "Posição AF: superior-esquerda"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
-msgstr ""
+msgstr "Posição AF: superior-direita"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
-msgstr ""
+msgstr "Posição AF desconhecida"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
-msgstr ""
+msgstr "Erro interno (valor desconhecido %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Valor %hi desconhecido"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
-msgstr ""
+msgstr "Desconhecido %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
-msgstr ""
+msgstr "2 seg."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "Automático"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
-msgstr ""
+msgstr "Manual: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
-msgstr ""
+msgstr "Manual: desconhecido"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr "Um-toque"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr "Infinito"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
-msgstr ""
+msgstr "%i bytes de dados desconhecidos: "
 
 #: libexif/olympus/mnote-olympus-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:53
@@ -4658,7 +4722,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:54
 msgid "Image Boundary"
-msgstr ""
+msgstr "Limites da imagem"
 
 #: libexif/olympus/mnote-olympus-tag.c:56
 msgid "Flash Exposure Bracket Value"
@@ -4712,8 +4776,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr ""
 
@@ -4885,13 +4948,11 @@ msgstr "Níveis de preto"
 msgid "White Balance Setting"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr "Balanço do vermelho"
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr "Balanço do azul"
 
@@ -5239,11 +5300,21 @@ msgstr "3008x2008 ou 3040x2024"
 msgid "Digital filter?"
 msgstr "Filtro digital?"
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr "Erro interno (valor desconhecido %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Erro interno (valor %i %i desconhecido)"
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Erro interno (valor %hu %hu desconhecido)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
+#, c-format
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Erro interno (valor %hi %hi desconhechido)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5445,3 +5516,6 @@ msgstr ""
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
+
+#~ msgid "FNumber"
+#~ msgstr "FNumber"
diff --git a/po/quot.sed b/po/quot.sed
deleted file mode 100644
index 0122c46..0000000
--- a/po/quot.sed
+++ /dev/null
@@ -1,6 +0,0 @@
-s/"\([^"]*\)"/“\1�/g
-s/`\([^`']*\)'/‘\1’/g
-s/ '\([^`']*\)' / ‘\1’ /g
-s/ '\([^`']*\)'$/ ‘\1’/g
-s/^'\([^`']*\)' /‘\1’ /g
-s/“�/""/g
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
deleted file mode 100644
index 2436c49..0000000
--- a/po/remove-potcdate.sin
+++ /dev/null
@@ -1,19 +0,0 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
-# from a POT file.
-#
-# The distinction between the first and the following occurrences of the
-# pattern is achieved by looking at the hold space.
-/^"POT-Creation-Date: .*"$/{
-x
-# Test if the hold space is empty.
-s/P/P/
-ta
-# Yes it was empty. First occurrence. Remove the line.
-g
-d
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}
diff --git a/po/ru.gmo b/po/ru.gmo
deleted file mode 100644
index 087e521..0000000
--- a/po/ru.gmo
+++ /dev/null
diff --git a/po/ru.po b/po/ru.po
index cfe26b8..b3c4905 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2011-11-27 15:59+0000\n"
-"Last-Translator: Aleksey Kabanov <Unknown>\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
+"PO-Revision-Date: 2017-02-12 11:02+0000\n"
+"Last-Translator: Eugene Roskin <Unknown>\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-Launchpad-Export-Date: 2012-06-25 06:52+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2018-08-13 00:12+0000\n"
+"X-Generator: Launchpad (build 18747)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -41,7 +41,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "�екорректное чи�ло компонентов (%i, ожидало�ь %i или %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -52,14 +52,14 @@ msgstr "Макро"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -88,15 +88,15 @@ msgstr "Прево�ходное"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -128,8 +128,8 @@ msgstr "�вто"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -147,12 +147,11 @@ msgstr "Медленна� �инхронизаци�"
 
 #: libexif/canon/mnote-canon-entry.c:88
 msgid "Auto, red-eye reduction"
-msgstr ""
+msgstr "�вто, уменьшение кра�ноты глаз"
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
-msgstr ""
+msgstr "Включено, уменьшение кра�ноты глаз"
 
 #: libexif/canon/mnote-canon-entry.c:90
 msgid "External flash"
@@ -161,28 +160,28 @@ msgstr "Внешн�� в�пышка"
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
 #: libexif/canon/mnote-canon-entry.c:297
 msgid "Single"
-msgstr ""
+msgstr "Одиночна�"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
 #: libexif/canon/mnote-canon-entry.c:298
 msgid "Continuous"
-msgstr ""
+msgstr "�епрерывна�"
 
 #: libexif/canon/mnote-canon-entry.c:93
 msgid "Movie"
-msgstr ""
+msgstr "Видео"
 
 #: libexif/canon/mnote-canon-entry.c:94
 msgid "Continuous, speed priority"
-msgstr ""
+msgstr "Продолжительный, приоритет �коро�ти"
 
 #: libexif/canon/mnote-canon-entry.c:95
 msgid "Continuous, low"
-msgstr ""
+msgstr "Продолжительный, низкий приоритет"
 
 #: libexif/canon/mnote-canon-entry.c:96
 msgid "Continuous, high"
-msgstr ""
+msgstr "Продолжительный, вы�окий приоритет"
 
 #: libexif/canon/mnote-canon-entry.c:97
 msgid "One-shot AF"
@@ -272,9 +271,8 @@ msgstr "Полна� автоматика"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -286,7 +284,7 @@ msgid "Manual"
 msgstr "Ручна�"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -294,11 +292,11 @@ msgstr "�льбом"
 
 #: libexif/canon/mnote-canon-entry.c:123
 msgid "Fast shutter"
-msgstr ""
+msgstr "Бы�трый затвор"
 
 #: libexif/canon/mnote-canon-entry.c:124
 msgid "Slow shutter"
-msgstr ""
+msgstr "Медленный затвор"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
 #: libexif/olympus/mnote-olympus-entry.c:257
@@ -315,7 +313,7 @@ msgid "Sepia"
 msgstr "Сепи�"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -342,14 +340,13 @@ msgstr "Про�та� графика"
 msgid "Neutral"
 msgstr "�ейтральный"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "Без в�пышки"
 
 #: libexif/canon/mnote-canon-entry.c:136
 msgid "Long shutter"
-msgstr ""
+msgstr "Длительный затвор"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
 #: libexif/olympus/mnote-olympus-entry.c:174
@@ -425,7 +422,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "�ичего"
@@ -438,8 +435,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "Другое"
 
@@ -489,11 +486,11 @@ msgstr "800"
 msgid "Default"
 msgstr "По умолчанию"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "Точечный замер"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Средний"
 
@@ -501,11 +498,11 @@ msgstr "Средний"
 msgid "Evaluative"
 msgstr "Оценочный"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Ча�тичный замер"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr "Центрально-взвешенный �редний"
 
@@ -517,22 +514,22 @@ msgstr "�еизве�тно"
 msgid "Very close"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:185
 msgid "Middle range"
-msgstr ""
+msgstr "Средний диапазон"
 
 #: libexif/canon/mnote-canon-entry.c:186
 msgid "Far range"
-msgstr ""
+msgstr "Дальний диапазон"
 
 #: libexif/canon/mnote-canon-entry.c:189
 #: libexif/pentax/mnote-pentax-entry.c:210
 msgid "Infinity"
-msgstr ""
+msgstr "Бе�конечно�ть"
 
 #: libexif/canon/mnote-canon-entry.c:190
 msgid "Manual AF point selection"
@@ -570,7 +567,7 @@ msgstr "Ð�втоматичеÑ�кий выбор точки автофокуÑ�иÑ
 
 #: libexif/canon/mnote-canon-entry.c:197
 msgid "Easy shooting"
-msgstr ""
+msgstr "Лёгка� �ъёмка"
 
 #: libexif/canon/mnote-canon-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:163
@@ -654,9 +651,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 или Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -675,9 +671,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -928,9 +923,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -968,7 +962,7 @@ msgstr "Внешн��"
 
 #: libexif/canon/mnote-canon-entry.c:299
 msgid "Normal AE"
-msgstr ""
+msgstr "�ормальна� �Э"
 
 #: libexif/canon/mnote-canon-entry.c:300
 msgid "Exposure compensation"
@@ -976,15 +970,15 @@ msgstr "Компен�аци� �к�позиции"
 
 #: libexif/canon/mnote-canon-entry.c:301
 msgid "AE lock"
-msgstr ""
+msgstr "Фик�аци� �Э"
 
 #: libexif/canon/mnote-canon-entry.c:302
 msgid "AE lock + exposure compensation"
-msgstr ""
+msgstr "Фик�аци� авто�к�позиции + компен�аци� �к�позиции"
 
 #: libexif/canon/mnote-canon-entry.c:303
 msgid "No AE"
-msgstr ""
+msgstr "Без авто�к�позиции"
 
 #: libexif/canon/mnote-canon-entry.c:306
 msgid "On, shot only"
@@ -1012,11 +1006,11 @@ msgstr "Полный"
 
 #: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
 msgid "2/3"
-msgstr ""
+msgstr "2/3"
 
 #: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
 msgid "1/3"
-msgstr ""
+msgstr "1/3"
 
 #: libexif/canon/mnote-canon-entry.c:324
 msgid "Fixed"
@@ -1031,32 +1025,32 @@ msgid "Sunny"
 msgstr "Солнечно"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Облачно"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Лампа накаливани�"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Флуоре�центна� лампа"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "В�пышка"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Тень"
@@ -1078,7 +1072,7 @@ msgid "PC set 3"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Флуоре�центна� лампа дневного �вета"
@@ -1091,7 +1085,7 @@ msgstr "Профиль 1"
 msgid "Custom 2"
 msgstr "Профиль 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1137,51 +1131,51 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
-msgstr ""
+msgstr "EOS �реднего диапазона"
 
 #: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotate 90 CW"
-msgstr ""
+msgstr "Поворот на 90° ↷"
 
 #: libexif/canon/mnote-canon-entry.c:370
 msgid "Rotate 180"
-msgstr ""
+msgstr "Поворот на 180°"
 
 #: libexif/canon/mnote-canon-entry.c:371
 msgid "Rotate 270 CW"
-msgstr ""
+msgstr "Поворот на 270° ↷"
 
 #: libexif/canon/mnote-canon-entry.c:372
 msgid "Rotated by software"
-msgstr ""
+msgstr "Программный поворот"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Слева направо"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Справа налево"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Снизу вверх"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Сверху вниз"
 
 #: libexif/canon/mnote-canon-entry.c:388
 msgid "2x2 matrix (clockwise)"
-msgstr ""
+msgstr "2x2 матрица (↷)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1199,9 +1193,8 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1254,39 +1247,46 @@ msgstr "Монохромный"
 
 #: libexif/canon/mnote-canon-entry.c:494
 msgid ", "
-msgstr ""
+msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (м�)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u мм"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i байтов неизве�тных данных"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr "�а�тройки (перва� половина)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Фоку�ное ра��то�ние"
 
@@ -1294,8 +1294,7 @@ msgstr "Фоку�ное ра��то�ние"
 msgid "Settings (Second Part)"
 msgstr "�а�тройки (втора� половина)"
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Панорама"
@@ -1350,8 +1349,8 @@ msgstr "Каче�тво"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "Режим в�пышки"
 
@@ -1362,9 +1361,8 @@ msgstr "Режим движени�"
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "Спо�об фоку�ировки"
 
@@ -1378,30 +1376,29 @@ msgstr "Размер изображени�"
 
 #: libexif/canon/mnote-canon-tag.c:64
 msgid "Easy Shooting Mode"
-msgstr ""
+msgstr "Режим Easy Shooting"
 
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "Цифровой тран�фокатор"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Контра�т"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "�а�ыщенно�ть"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1411,7 +1408,7 @@ msgstr "Резко�ть"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "Режим замера"
@@ -1424,7 +1421,7 @@ msgstr "Диапазон фоку�ировки"
 msgid "AF Point"
 msgstr "Точка автофоку�ировки"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Режим �к�позиции"
 
@@ -1439,11 +1436,11 @@ msgstr "Длиннофоку�ный объектив"
 
 #: libexif/canon/mnote-canon-tag.c:76
 msgid "Short Focal Length of Lens"
-msgstr ""
+msgstr "Короткофоку�ные линзы"
 
 #: libexif/canon/mnote-canon-tag.c:77
 msgid "Focal Units per mm"
-msgstr ""
+msgstr "Фоку�ные единицы на каждый мм"
 
 #: libexif/canon/mnote-canon-tag.c:78
 msgid "Maximal Aperture"
@@ -1483,11 +1480,11 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:88
 msgid "Photo Effect"
-msgstr ""
+msgstr "Фотографиче�кий �ффект"
 
 #: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
 msgid "Manual Flash Output"
-msgstr ""
+msgstr "�а�траиваема� мощно�ть в�пышки"
 
 #: libexif/canon/mnote-canon-tag.c:90
 msgid "Color Tone"
@@ -1507,7 +1504,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:95
 msgid "Auto ISO"
-msgstr ""
+msgstr "�втоматиче�кое значение ISO"
 
 #: libexif/canon/mnote-canon-tag.c:96
 msgid "Shot ISO"
@@ -1515,23 +1512,23 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:97
 msgid "Measured EV"
-msgstr ""
+msgstr "Измеренна� �к�позици� EV"
 
 #: libexif/canon/mnote-canon-tag.c:98
 msgid "Target Aperture"
-msgstr ""
+msgstr "�азначенна� диафрагма"
 
 #: libexif/canon/mnote-canon-tag.c:99
 msgid "Target Exposure Time"
-msgstr ""
+msgstr "Врем� назначенной �к�позиции"
 
 #: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
 #: libexif/pentax/mnote-pentax-tag.c:81
 msgid "Exposure Compensation"
-msgstr ""
+msgstr "Компен�аци� �к�позиции"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1553,7 +1550,7 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
 msgid "Flash Exposure Compensation"
-msgstr ""
+msgstr "Компен�аци� �к�позиции в�пышки"
 
 #: libexif/canon/mnote-canon-tag.c:107
 msgid "AE Bracketing"
@@ -1565,17 +1562,18 @@ msgstr "Значение бр�кетинга AE"
 
 #: libexif/canon/mnote-canon-tag.c:109
 msgid "Focus Distance Upper"
-msgstr ""
+msgstr "Фоку�ное ра��то�ние верхнее"
 
 #: libexif/canon/mnote-canon-tag.c:110
 msgid "Focus Distance Lower"
-msgstr ""
+msgstr "Фоку�ное ра��то�ние нижнее"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr "Чи�ло F"
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Врем� �к�позиции"
@@ -1590,7 +1588,7 @@ msgstr "Тип камеры"
 
 #: libexif/canon/mnote-canon-tag.c:115
 msgid "Auto Rotate"
-msgstr ""
+msgstr "�втоматиче�кий поворот"
 
 #: libexif/canon/mnote-canon-tag.c:116
 msgid "ND Filter"
@@ -1602,7 +1600,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:120
 msgid "Panorama Direction"
-msgstr ""
+msgstr "�аправление панорамы"
 
 #: libexif/canon/mnote-canon-tag.c:121
 msgid "Tone Curve"
@@ -1624,35 +1622,35 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr "�едо�таточный размер данных допу�тимый дл� данных EXIF."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr "Маркер EXIF не найден"
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr "Заголовок EXIF не найден"
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr "�еизве�тна� кодировка"
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr "Игнорировать неизве�тные т�ги"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Игнорировать неизве�тные т�ги при загрузке данных EXIF"
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr "Следовать �пецификации"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
@@ -1660,15 +1658,17 @@ msgstr ""
 "Добавл�йте, и�правл�йте, удал�йте запи�и дл� приведени� в �оответ�твие �о "
 "�пецификаци�ми данных EXIF."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr ""
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
 msgstr ""
+"При загрузке и повторном �охранении данных Exif, �охраните заметку автора "
+"неизменной. Имейте ввиду, что заметка автора может быть повреждена."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
@@ -1676,6 +1676,8 @@ msgid ""
 "Tag '%s' was of format '%s' (which is against specification) and has been "
 "changed to format '%s'."
 msgstr ""
+"Метка'%s' имела формат '%s' (не �оответ�твующий �пецификации) и была "
+"преобразована в формат '%s'."
 
 #: libexif/exif-entry.c:271
 #, c-format
@@ -1718,196 +1720,194 @@ msgstr ""
 "Тег 'UserComment' не начинает�� � формата идентификатора. Это было "
 "и�правлено."
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i байт неопределённых данных"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i байт не поддерживаемых типов данных"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 "Т�г '%s' �одержит данные в некорректном формате ('%s', ожидало�ь '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr "Т�г '%s' �одержит некорректное чи�ло компонентов (%i, ожидало�ь %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr "Формат фрагмента"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr "Формат Planar"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "�е определено"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "Одночиповый датчик цветовой обла�ти"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr "Двухчиповый датчик цветовой обла�ти"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr "Трехчиповый датчик цветовой обла�ти"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
-msgstr ""
+msgstr "Трёхлинейный �ен�ор"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr ""
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
-msgstr ""
+msgstr "Палитра"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
-msgstr ""
+msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "Обычна� обработка"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "�а�троить обработку"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr "�вто�к�позици�"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Ручна� �к�позици�"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr "�втобрекетирование"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr "�втомат. балан� белого"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr "Ручной балан� белого"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
-msgstr ""
+msgstr "�ебольшое у�иление"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
-msgstr ""
+msgstr "Значительное у�иление"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
-msgstr ""
+msgstr "�ебольшое о�лабление"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
-msgstr ""
+msgstr "Значительное о�лабление"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "�изка� на�ыщенно�ть"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Вы�ока� на�ыщенно�ть"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "М�гко"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1915,179 +1915,179 @@ msgstr "М�гко"
 msgid "Hard"
 msgstr "Же�тко"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
-msgstr ""
+msgstr "У�реднённый"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
-msgstr ""
+msgstr "Центрально-взвешенный"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr ""
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Шаблон"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "�е�жатый"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "Сжатие LZW"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "Сжатие JPEG"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr "Сжатие Deflate/ZIP"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr "Сжатие PackBits"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr "Ярка� лампа накаливани�"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Я�на� погода"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Облачно�ть"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Бела� лампа дневного �вета"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
-msgstr ""
+msgstr "Холодный белый флюоре�центный"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "Бела� газоразр�дна� лампа"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "Стандартный �вет A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "Стандартный �вет B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "Стандартный �вет C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr "Студийное вольфрамовое о�вещение ISO"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "Дюйм"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "in"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Сантиметр"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "�ормальна� программа"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr "Приоритет диафрагмы"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "Диафрагма"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr "Приоритет выдержки"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr "Выдержка"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr "Творче�ка� программа (� приоритетом глубины резко�ти)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr "Творче�ка�"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr "Творче�ка� программа (� приоритетом �коро�ти затвора)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "Дей�твие"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr ""
 "Портретный режим (�ъёмка � близкого ра��то�ни� � передним планом вне фоку�а)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "�льбомный режим (дл� альбомных фото � передним планом в фоку�е)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "В�пышка не �работала"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
-msgstr ""
+msgstr "Без в�пышки"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr "В�пышка �работала"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2095,309 +2095,322 @@ msgstr "В�пышка �работала"
 msgid "Yes"
 msgstr "Да"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
-msgstr ""
+msgstr "Возвратный �вет �троба не обнаружен"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
-msgstr ""
+msgstr "Без �троба"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
-msgstr ""
+msgstr "Возвратный �вет �троба обнаружен"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
-msgstr ""
+msgstr "Имеет�� �троб"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr "В�пышка �работала, режим компен�ации в�пышки"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr ""
+"В�пышка �работала, режим компен�ации в�пышки, отраженный �вет не обнаружен"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr ""
+"В�пышка �работала, режим компен�ации в�пышки, отраженный �вет обнаружен"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "В�пышка не �работала, режим компен�ации в�пышки"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr "В�пышка не �работала, автоматиче�кий режим"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr "В�пышка �работала, автоматиче�кий режим"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr "В�пышка �работала, автоматиче�кий режим, возвратный �вет не найден"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr "В�пышка �работала, автоматиче�кий режим, возвратный �вет найден"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
-msgstr ""
+msgstr "�ет функции в�пышки"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
-msgstr ""
+msgstr "В�пышка �работала, режим уменьшени� �ффекта кра�ных глаз"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
+"В�пышка �работала, режим уменьшени� �ффекта кра�ных глаз, отраженный �вет не "
+"обнаружен"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
+"В�пышка �работала, режим уменьшени� �ффекта кра�ных глаз, отраженный �вет "
+"обнаружен"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
+"В�пышка �работала, принудительный режим в�пышки, режим уменьшени� �ффекта "
+"кра�ных глаз"
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
+"В�пышка �работала, режим компен�ации в�пышки, режим уменьшени� �ффекта "
+"кра�ных глаз, отраженный �вет не обнаружен"
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
+"В�пышка �работала, режим компен�ации в�пышки, режим уменьшени� �ффекта "
+"кра�ных глаз, отраженный �вет обнаружен"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr ""
 "В�пышка не �работала, автоматиче�кий режим, режим �н�ти� �ффекта кра�ных глаз"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr ""
 "В�пышка �работала, автоматиче�кий режим, режим �н�ти� �ффекта кра�ных глаз"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
+"В�пышка �работала, автоматиче�кий режим, отраженный �вет не обнаружен, режим "
+"уменьшени� �ффекта кра�ных глаз"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
+"В�пышка �работала, автоматиче�кий режим, отраженный �вет обнаружен, режим "
+"уменьшени� �ффекта кра�ных глаз"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr "Крупный план"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr "Обзор � ра��то�ни�"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr "�е откалибровано"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "�екорректный размер запи�и (%i, ожидало�ь %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr "�еподдерживаема� �трока Unicode"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr "�еподдерживаема� �трока JIS"
 
-#: libexif/exif-entry.c:935
-#, fuzzy
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
-"Тег 'UserComment' был ра�ширен до 8 байт дл� �оответ�тви� �пецификаци�м."
+"Метка UserComment, �одержит данные, но они не �оответ�твуют �пецификации."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Байт в позиции %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr "�еизве�тна� вер�и� EXIF"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "EXIF вер�ии %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix вер�ии 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix вер�ии 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr "�еизве�тна� вер�и� FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[�ичего]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "(Фотограф)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Редактор)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
-msgstr ""
+msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35мм �квивалент: %d мм)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " �ек."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d �ек.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d �ек.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f кд/м^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Внутренн�� ошибка (неизве�тное значение %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
-msgstr ""
+msgstr "Зарезервировано"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
-msgstr ""
+msgstr "Сфотографировано напр�мую"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "В пределах ра��то�ни� %i от (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "Внутри обла�ти (ширина %i, вы�ота %i) около (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "�еожиданное количе�тво компонентов (%li, ожидало�ь 2, 3, или 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr "Уровень мор�"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
-msgstr ""
+msgstr "Референ�ное значение уровн� мор�"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr "�еизве�тное значение %i"
@@ -2483,11 +2496,11 @@ msgstr "Повреждённые данные"
 msgid "The data provided does not follow the specification."
 msgstr "Эти данные не �оответ�твуют �пецификации"
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr "Вер�и� тега GPS"
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2499,11 +2512,11 @@ msgstr ""
 "<ExifVersion> т�г <GPSVersionID> задаёт�� в байтах. Когда вер�и� равна "
 "2.0.0.0, значение т�га равно 02000000.H)."
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr "Индек� �овме�тимо�ти"
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2515,11 +2528,11 @@ msgstr ""
 "отдельный том Recommended Exif Interoperability Rules (ExifR98) дл� других "
 "т�гов и�пользуемых в ExifR98."
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr "Северна� или южна� широта"
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -2527,15 +2540,15 @@ msgstr ""
 "Показывает, �еверна� широта или же южна�. ASCII-значение 'N' обозначает "
 "�еверную широту, а 'S' - южную."
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr "Вер�и� �овме�тимо�ти"
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Широта"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2547,11 +2560,11 @@ msgstr ""
 "минутами (mm) и �екундами (ss). При �то формат таков: dd/1,mm/1,ss/1. Когда "
 "и�пользуют�� только граду�ы и минуты, формат таков: dd/1,mmmm/100,0/1."
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr "Во�точна� или западна� долгота"
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -2559,11 +2572,11 @@ msgstr ""
 "Показывает, во�точна� долгота или же западна�. ASCII-значение 'E' обозначает "
 "во�точную долготу, а 'W' - западную."
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Долгота"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2575,16 +2588,17 @@ msgstr ""
 "минутами (mm) и �екундами (ss). При �то формат таков: ddd/1,mm/1,ss/1. Когда "
 "и�пользуют�� только граду�ы и минуты, формат таков: ddd/1,mmmm/100,0/1."
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
-msgstr ""
+msgstr "Референ�ное значение вы�оты"
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
+#, fuzzy
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 "Отображает вы�оту, и�пользуемую в каче�тве �талона. Е�ли �талоном �вл�ет�� "
@@ -2593,11 +2607,11 @@ msgstr ""
 "<GSPAltitude>. Эталонной единицей измерени� �вл�ет�� метр. Помните, что �тот "
 "т�г в отличие от других \"�талонных\" т�гов имеет тип BYTE."
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr "Вы�ота"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -2605,21 +2619,21 @@ msgstr ""
 "Отображает вы�оту, о�новыва��ь на �талоне из т�га <GPSAltitudeRef>. Вы�ота "
 "выражает�� RATIONAL значением. Эталонной единицей измерени� �вл�ет�� метр."
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr "Врем� GPS (�томные ча�ы)"
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr "Спутники GPS"
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2633,11 +2647,11 @@ msgstr ""
 "не указан. Е�ли приёмник GPS не может выполн�ть изменени�, значение тега "
 "должно быть у�тановлено - NULL."
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr "Со�то�ние приёмника GPS"
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 "
@@ -2646,11 +2660,11 @@ msgstr ""
 "Показывает �о�то�ние приёмника GPS при запи�и изображени�. 'A' означает "
 "выполнение измерени� и 'V' означает �овме�тимо�ть измерений."
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr "Режим измерени� GPS"
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
@@ -2658,11 +2672,11 @@ msgstr ""
 "Показывает режим измерени� GPS. '2' означает выполнение двухмерного "
 "измерени� и '3' означает выполнение трёхмерного измерени�."
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr "Точно�ть измерени�"
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
@@ -2671,11 +2685,11 @@ msgstr ""
 "Показывает GPS DOP (данные уровн� точно�ти). Значение HDOP запи�ывает�� во "
 "врем� двухмерного измерени� и PDOP во врем� трёхмерного измерени�."
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr "Единицы измерени� �коро�ти"
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
@@ -2683,19 +2697,19 @@ msgstr ""
 "Показывает единицы измерени� дл� отображени� �коро�ти перемещени� приёмника "
 "GPS. 'K', 'M' и 'N' �оответ�твуют километры в ча�, мили в ча� и узлы."
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr "Скоро�ть приёмника GPS"
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr "Скоро�ть перемещени� приёмника GPS"
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr "С�ылка направлени� движени�"
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
@@ -2703,11 +2717,11 @@ msgstr ""
 "Показывает ��ылку направлени� движени� при перемещении приёмника GPS. 'T' "
 "означает и�тинное направление и 'M' магнитное направление."
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr "�аправление движени�"
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
@@ -2715,11 +2729,11 @@ msgstr ""
 "Показывает направление движени� перемещени� приёмника GPS. Диапазон значений "
 "от 0.00 до 359.99."
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr "С�ылка направлени� изображени� GPS"
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2727,11 +2741,11 @@ msgstr ""
 "Показывает ��ылку заданного направлени� изображени� при произведённой "
 "�ъёмке. 'T' означает и�тинное направление и 'M' магнитное направление."
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr "�аправление �нимка GPS"
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
@@ -2739,11 +2753,11 @@ msgstr ""
 "Отображает направление изображени�, когда оно было запи�ано. Диапазон "
 "значений от 0.00 до 359.99"
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr "И�пользуют�� данные геодезиче�кой �лужбы"
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2755,11 +2769,11 @@ msgstr ""
 "'WGS-84'. Е�ли тег �ведений GPS запи�ан, на�то�тельно рекомендуем вам "
 "запи�ывать �тот тег."
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr "С�ылка на широту объекта"
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 "
@@ -2768,11 +2782,11 @@ msgstr ""
 "Показывает южную или �ерверную широту назначенной точки. ASCII значение 'N' "
 "показывает �еверную широту и 'S' южную широту."
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr "Широта назначенного объекта"
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2781,22 +2795,27 @@ msgid ""
 "and, for example, fractions of minutes are given up to two decimal places, "
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
+"Отображает широту конечной точки. Широта выражает�� трем� Р�ЦИО��ЛЬ�ЫМИ "
+"значени�ми задающими граду�ы, минуты и �екунды �оответ�твенно. Е�ли широта "
+"выражает�� в граду�ах, минутах и �екундах, то типичный формат будет dd/1,"
+"mm/1,ss/1. Когда граду�ы и минуты и�пользуют�� и к примеру, доли минут дают "
+"до двух знаков по�ле зап�той, формат будет dd/1,mmmm/100,0/1."
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr "С�ылка долготы назначенного объекта"
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2806,52 +2825,50 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
+"Указывает азимут на точку назначени�. Диапазон значений от 0.00 до 359.99."
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:194
-#, fuzzy
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
-"Показывает единицы измерени� дл� отображени� �коро�ти перемещени� приёмника "
-"GPS. 'K', 'M' и 'N' �оответ�твуют километры в ча�, мили в ча� и узлы."
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
-msgstr ""
+msgstr "Ра��то�ние до объекта"
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr "Отображает ра��то�ние до точки назначени�."
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr "�азвание метода обработки GPS"
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2859,50 +2876,60 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr ""
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr "GPS дата"
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
-msgstr ""
+msgstr "Дифференциальна� коррекци� GPS"
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
-msgstr ""
+msgstr "Показывает, примен�ла�ь ли дифференциальна� коррекци� к GPS-приёмнику."
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "Общее изображение типа данных в �том подфайле"
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Ширина изображени�"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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."
@@ -2910,11 +2937,11 @@ msgstr ""
 "Количе�тво �толбцов данных изображени�, равное количе�тву пик�елов на р�д. В "
 "данных, �жатых по алгоритму JPEG, вме�то �того т�га и�пользует�� маркер."
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr "Длина изображени�"
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -2922,11 +2949,11 @@ msgstr ""
 "Количе�тво р�дов данных изображени�. В данных, �жатых по алгоритму JPEG, "
 "вме�то �того т�га и�пользует�� маркер."
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr "Битов на ��мпл"
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2934,11 +2961,11 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Сжатие"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 "
@@ -2949,11 +2976,11 @@ msgstr ""
 "об�зательным и опу�кает��. Когда миниатюры и�пользуют JPEG-�жатие, значение "
 "�того т�га равно 6."
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr "Фотометриче�ка� интерпретаци�"
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -2961,19 +2988,19 @@ msgstr ""
 "Компоновка пик�елов. Е�ли данные �жаты по алгоритму JPEG, вме�то �того т�га "
 "и�пользует�� JPEG-маркер."
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr "Пор�док заполнени�"
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Им� документа"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "Опи�ание �нимка"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2985,11 +3012,11 @@ msgstr ""
 "Двухбайтова� кодировка cимволов не может быть и�пользована. Е�ли она в�ё же "
 "необходима, должен быть и�пользован ча�тный т�г EXIF <UserComment>."
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Производитель"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -3000,11 +3027,11 @@ msgstr ""
 "которое и�пользовало�ь дл� получени� �того изображени�. Е�ли поле не "
 "заполнено, производитель �читает�� неизве�тным."
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Модель"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 "
@@ -3015,11 +3042,11 @@ msgstr ""
 "оборудовани�, которое и�пользовало�ь дл� получени� �того изображени�. Е�ли "
 "поле не заполнено, оборудование �читает�� неизве�тным."
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr ""
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -3027,19 +3054,19 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "Ориентаци�"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "Ориентаци� изображени�, ра��матриваема� в терминах �трок и �толбцов."
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr "С�мплов на пик�ел"
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 "
@@ -3050,11 +3077,11 @@ msgstr ""
 "3. Е�ли данные �жаты по алгоритму JPEG, вме�то �того т�га и�пользует�� JPEG-"
 "маркер."
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr ""
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -3062,21 +3089,21 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr ""
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
-msgstr ""
+msgstr "Разрешение по X"
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -3084,11 +3111,11 @@ msgstr ""
 "Количе�тво пик�елов на <ResolutionUnit> в направлении <ImageWidth>. Е�ли "
 "разрешение не указано, оно принимает�� за 72 точки на дюйм."
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
-msgstr ""
+msgstr "Разрешение по Y"
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -3096,22 +3123,22 @@ msgstr ""
 "Количе�тво пик�елов на <ResolutionUnit> в направлении <ImageLength>. "
 "О�тальное аналогично <XResolution>."
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr "Планарна� конфигураци�"
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr "Единица разрешени�"
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -3121,11 +3148,11 @@ msgstr ""
 "и�пользует�� как дл� <XResolution>, так и дл� <YResolution>. Е�ли разрешение "
 "изображени� неизве�тно, оно принимает�� за 2 (дюйма)."
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr "Функци� передачи"
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 "
@@ -3135,11 +3162,11 @@ msgstr ""
 "не �вл�ет�� необходимым, по�кольку цветовое про�тран�тво уже указано в т�ге "
 "<ColorSpace>."
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Программное обе�печение"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3152,11 +3179,11 @@ msgstr ""
 "рекомендует�� �ледовать приведённому ниже примеру. Когда поле о�тавлено "
 "пу�тым, значение принимает�� за неизве�тное."
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Дата и врем�"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
@@ -3164,11 +3191,11 @@ msgstr ""
 "Дата и врем� �оздани� изображени�. В на�то�щем �тандарте (EXIF-2.1) �то дата "
 "и врем� изменени� файла."
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "И�полнитель"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3180,51 +3207,57 @@ msgstr ""
 "�ледовать приведённому ниже примеру. Когда поле о�тавлено пу�тым, значение "
 "принимает�� за неизве�тное."
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Бела� точка"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
+"Каче�тво цветно�ти белой точки изображени�. Обычно в �той метке нет "
+"необходимо�ти, так как цветовое про�тран�тво задано в метке �ведений о "
+"цветовом про�тран�тве (<ColorSpace>)."
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
-msgstr ""
+msgstr "Цветно�ть о�новных цветов"
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
+"Каче�тво цветно�ти трёх о�новных цветов изображени�. Обычно в �той метке нет "
+"необходимо�ти, так как цветовое про�тран�тво задаёт�� в метке �ведений о "
+"цветовом про�тран�тве (<ColorSpace>)."
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr "Определено Adobe Corporation дл� включени� TIFF Trees в файлах TIFF."
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr "Обла�ть передачи"
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr "Формат обмена данными JPEG"
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3233,11 +3266,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr "Ко�ффициенты YCbCr"
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3246,21 +3279,21 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr "Суб��мплинг YCbCr"
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr "Позиционирование YCbCr"
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3287,11 +3320,11 @@ msgstr ""
 "Предпочтительнее, когда �читывающа� программа поддерживает оба типа "
 "позиционировани�."
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr "Эталонный Чёрный/Белый"
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3300,34 +3333,34 @@ msgid ""
 "Interoperability these conditions."
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr "XML-пакет"
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr "Метаданные XMP"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr "Паттерн CFA"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 ""
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Зар�д батареи"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "�втор�кие и �межные права"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3346,95 +3379,91 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Врем� �к�позиции в �екундах"
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "Чи�ло F"
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr "Чи�ло F"
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr ""
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
-msgstr ""
+msgstr "Программа �к�позиции"
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 "Кла�� программы, и�пользованной камерой дл� у�тановки �к�позиции при �ъёмке."
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr "Спектральна� чув�твительно�ть"
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
-msgstr ""
+msgstr "Светочув�твительно�ть ISO"
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
-msgstr ""
+msgstr "Ко�ффициент опто�лектронного преобразовани�"
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
-msgstr ""
+msgstr "Смещение ча�ового по��а"
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
-msgstr ""
+msgstr "Ча�овой по�� ча�ов камеры отно�ительно GMT."
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr "Вер�и� EXIF"
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -3442,11 +3471,11 @@ msgstr ""
 "Поддерживаема� вер�и� �тандарта EXIF. От�ут�твие �того пол� принимает�� за "
 "�видетель�тво не�оответ�тви� �тандарту."
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
-msgstr ""
+msgstr "Дата и врем� (И�ходные)"
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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."
@@ -3454,19 +3483,19 @@ msgstr ""
 "Дата и врем� �оздани� и�ходного изображени�. Дл� цифровой фотокамеры �то "
 "дата и врем� �ъёмки."
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
-msgstr ""
+msgstr "Дата и врем� (Цифровые)"
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr "Дата и врем� �охранени� изображени� в цифровом виде"
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr "�а�тройка компонентов"
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3483,11 +3512,11 @@ msgstr ""
 "и�пользуют�� компоненты, отличные от Y, Cb и Cr, а также дл� обе�печени� "
 "поддержки обеих по�ледовательно�тей."
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr "Сжатых битов на пик�ел"
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -3495,11 +3524,11 @@ msgstr ""
 "Специфична� дл� �жатых данных информаци�. И�пользованный режим �жати� дл� "
 "�жатого изображени� показывает�� в единице измерени� \"битов на пик�ел\""
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Скоро�ть �рабатывани� затвора"
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -3507,15 +3536,15 @@ msgstr ""
 "Скоро�ть �рабатывани� затвора. Эта единица измерени� �вл�ет�� APEX(Additive "
 "System of Photographic Exposure)-на�тройкой (�м. Приложение С)"
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Диафрагма объектива. Эта единица измерени� �вл�ет�� APEX-значением"
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Ярко�ть"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -3523,11 +3552,11 @@ msgstr ""
 "Значение �рко�ти. Эта единица измерени� �вл�ет�� APEX-значением. Обычно оно "
 "находит�� в пределах от -99.99 до 99.99"
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr "Смещение �к�позиции"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -3535,11 +3564,11 @@ msgstr ""
 "Смещение �к�позиции. Измер�ет�� APEX-единицами. Обычно значение лежит в "
 "диапазоне между -99.99 и 99.99."
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
-msgstr ""
+msgstr "Мак�имальное значение диафрагмы"
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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."
@@ -3548,32 +3577,32 @@ msgstr ""
 "значение лежит в диапазоне между 00.00 и 99.99, но оно не ограничено �тим "
 "диапазоном."
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr "Ра��то�ние до объекта"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr "Ра��то�ние до объекта в метрах"
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr "Режим замера"
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "И�точник �вета"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr "Вид и�точника �вета"
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr "Этот т�г запи�ывает�� при и�пользовании �ффекта �тробо�копа во в�пышке"
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -3581,26 +3610,26 @@ msgstr ""
 "Реальное фоку�ное ра��то�ние объектива. Преобразование в 35мм плёночный "
 "аналог не производит��."
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr "Обла�ть объекта �ъёмки"
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 "Этот т�г отображает ме�тоположение и обла�ть объекта �ъёмки во в�ей �цене."
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr "ID �тандарта TIFF/EP"
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr ""
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -3608,11 +3637,11 @@ msgstr ""
 "Т�г дл� разработчиков �ред�тва запи�и т�гов EXIF, в который можно запи�ывать "
 "в�ё, что им хочет��. Содержимое зави�ит от разработчиков."
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "Пользователь�кий комментарий"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3634,87 +3663,91 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr "Т�г, и�пользуемый дл� запи�и долей �екунды из т�га <DateTime>."
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr "Т�г, и�пользуемый дл� запи�и долей �екунды из т�га <DateTimeOriginal>."
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Т�г, и�пользуемый дл� запи�и долей �екунды из т�га <DateTimeDigitized>."
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr ""
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
+"Строка �имволов в кодировке UTF-16LE, �одержаща� комментарий к изображению."
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr ""
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
+"Строка �имволов в кодировке UTF-16LE, �одержаща� им� �оздател� изображени�."
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr ""
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
+"Строка �имволов в кодировке UTF-16LE � ключевыми �ловами, опи�ывающими "
+"изображение."
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "Вер�и� формата FlashPix, поддерживаемого в формате файлов FPXR"
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Цветовое про�тран�тво"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3729,11 +3762,11 @@ msgstr ""
 "могут быть во�прин�ты как sRGB при преобразовании во FlashPix. Подробнее "
 "sRGB ра��матривает�� в приложении E."
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3741,11 +3774,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3755,11 +3788,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
-msgstr ""
+msgstr "Св�занный звуковой файл"
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3784,11 +3817,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3797,62 +3830,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr ""
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
-msgstr ""
+msgstr "Единица измерени� разрешени� в фокальной пло�ко�ти"
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr "Ме�тоположение объекта �ъёмки"
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3865,39 +3898,39 @@ msgstr ""
 "кра�, до обработки поворота �огла�но т�гу <Rotation>. Первое значение "
 "отображает номер �толбца по X, а второй - номер �троки по Y."
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
-msgstr ""
+msgstr "Индек� �к�позиции"
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "И�точник файла"
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr "Тип �цены"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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."
@@ -3906,18 +3939,18 @@ msgstr ""
 "значение т�га в�егда должно быть равно 1, что означает непо�ред�твенную "
 "�ъёмку."
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 "
@@ -3927,15 +3960,15 @@ msgstr ""
 "автоматиче�кого брекетинга камера делает �ерию кадров одной и той же �цены � "
 "разными на�тройками �к�позиции."
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr "Этот т�г отображает режим балан�а белого при �ъёмке изображени�."
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr "Ко�ффициент цифрового тран�фокатора"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 "
@@ -3945,11 +3978,11 @@ msgstr ""
 "изображени�. Е�ли значение равно 0, то цифровой тран�фокатор не был "
 "и�пользован."
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 "
@@ -3959,97 +3992,98 @@ msgstr ""
 "измер�емом миллиметрами. Е�ли значение равно 0, то фоку�ное ра��то�ние "
 "неизве�тно. Обратите внимание на то, что �тот т�г отличет�� от <FocalLength>."
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
-msgstr ""
+msgstr "Тип ме�та дей�тви� при �ъёмке"
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
-msgstr ""
+msgstr "Управление у�илением"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
+"Эта метка показывает �тепень общего у�илени� применённого к изображению."
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 "Этот т�г отображает направление обработки контра�та при �ъёмке изображени�"
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 "Этот т�г отображает направление обработки на�ыщенно�ти при �ъёмке изображени�"
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 "Этот т�г отображает направление обработки резко�ти при �ъёмке изображени�"
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
-msgstr ""
+msgstr "Опи�ание на�троек у�трой�тва"
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
-msgstr ""
+msgstr "Эта метка показывает ра��то�ние до объекта."
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr "Уникальный ID изображени�"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
-msgstr ""
+msgstr "Гамма"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
-msgstr ""
+msgstr "Показывает значение ко�ффициента гаммы."
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4076,7 +4110,7 @@ msgstr ""
 #: libexif/fuji/mnote-fuji-entry.c:69 libexif/fuji/mnote-fuji-entry.c:90
 #: libexif/fuji/mnote-fuji-entry.c:98 libexif/fuji/mnote-fuji-entry.c:182
 msgid "Film simulation mode"
-msgstr ""
+msgstr "Режим имитации плёнки"
 
 #: libexif/fuji/mnote-fuji-entry.c:79
 msgid "Incandescent"
@@ -4097,35 +4131,35 @@ msgstr ""
 #: libexif/fuji/mnote-fuji-entry.c:124 libexif/pentax/mnote-pentax-entry.c:164
 #: libexif/pentax/mnote-pentax-entry.c:299
 msgid "Program AE"
-msgstr ""
+msgstr "Программна� авто�к�позици�"
 
 #: libexif/fuji/mnote-fuji-entry.c:125
 msgid "Natural photo"
-msgstr ""
+msgstr "Е�те�твенное фото"
 
 #: libexif/fuji/mnote-fuji-entry.c:126
 msgid "Vibration reduction"
-msgstr ""
+msgstr "Подавление вибраций"
 
 #: libexif/fuji/mnote-fuji-entry.c:127
 msgid "Sunset"
-msgstr ""
+msgstr "Закат"
 
 #: libexif/fuji/mnote-fuji-entry.c:128 libexif/pentax/mnote-pentax-entry.c:181
 msgid "Museum"
-msgstr ""
+msgstr "Музей"
 
 #: libexif/fuji/mnote-fuji-entry.c:129
 msgid "Party"
-msgstr ""
+msgstr "Вечеринка"
 
 #: libexif/fuji/mnote-fuji-entry.c:130
 msgid "Flower"
-msgstr ""
+msgstr "Цветок"
 
 #: libexif/fuji/mnote-fuji-entry.c:131 libexif/pentax/mnote-pentax-entry.c:176
 msgid "Text"
-msgstr ""
+msgstr "Тек�т"
 
 #: libexif/fuji/mnote-fuji-entry.c:132
 msgid "NP & flash"
@@ -4133,11 +4167,11 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:137
 msgid "Aperture priority AE"
-msgstr ""
+msgstr "�вто�к�позици� � приоритетом диафрагмы"
 
 #: libexif/fuji/mnote-fuji-entry.c:138
 msgid "Shutter priority AE"
-msgstr ""
+msgstr "�вто�к�позици� � приоритетом выдержки"
 
 #: libexif/fuji/mnote-fuji-entry.c:146
 msgid "F-Standard"
@@ -4153,27 +4187,27 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:151
 msgid "No blur"
-msgstr ""
+msgstr "Без размыти�"
 
 #: libexif/fuji/mnote-fuji-entry.c:152
 msgid "Blur warning"
-msgstr ""
+msgstr "Предупреждение о размыто�ти"
 
 #: libexif/fuji/mnote-fuji-entry.c:155
 msgid "Focus good"
-msgstr ""
+msgstr "Хороша� фоку�ировка"
 
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
-msgstr ""
+msgstr "Вне фоку�а"
 
 #: libexif/fuji/mnote-fuji-entry.c:159
 msgid "AE good"
-msgstr ""
+msgstr "Хороша� авто�к�позици�"
 
 #: libexif/fuji/mnote-fuji-entry.c:160
 msgid "Over exposed"
-msgstr ""
+msgstr "Пере�к�понировано"
 
 #: libexif/fuji/mnote-fuji-entry.c:164
 msgid "Wide"
@@ -4181,74 +4215,68 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:167
 msgid "F0/Standard"
-msgstr ""
+msgstr "F0/Стандартный"
 
 #: libexif/fuji/mnote-fuji-entry.c:168
 msgid "F1/Studio portrait"
-msgstr ""
+msgstr "F1/Студийный портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:169
 msgid "F1a/Professional portrait"
-msgstr ""
+msgstr "F1a/Профе��иональный портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:170
 msgid "F1b/Professional portrait"
-msgstr ""
+msgstr "F1b/Профе��иональный портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:171
 msgid "F1c/Professional portrait"
-msgstr ""
+msgstr "F1c/Профе��иональный портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:172
 msgid "F2/Fujichrome"
-msgstr ""
+msgstr "F2/Fujichrome"
 
 #: libexif/fuji/mnote-fuji-entry.c:173
 msgid "F3/Studio portrait Ex"
-msgstr ""
+msgstr "F3/Студийный портрет Ex"
 
 #: libexif/fuji/mnote-fuji-entry.c:174
 msgid "F4/Velvia"
-msgstr ""
+msgstr "F4/Velvia"
 
 #: libexif/fuji/mnote-fuji-entry.c:177
 msgid "Auto (100-400%)"
-msgstr ""
+msgstr "�вто (100-400%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:179
 msgid "Standard (100%)"
-msgstr ""
+msgstr "Стандарт (100%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:180
 msgid "Wide1 (230%)"
-msgstr ""
+msgstr "Wide1 (230%)"
 
 #: libexif/fuji/mnote-fuji-entry.c:181
 msgid "Wide2 (400%)"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr "%2.2f мм"
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr "%i байтов неизве�тных данных"
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:37
 msgid "This number is unique and based on the date of manufacture."
-msgstr ""
+msgstr "Этот номер уникален и о�нован на дате производ�тва."
 
 #: libexif/fuji/mnote-fuji-tag.c:41
 msgid "Chromaticity Saturation"
-msgstr ""
+msgstr "�а�ыщенно�ть цветно�ти"
 
 #: libexif/fuji/mnote-fuji-tag.c:44
 msgid "Flash Firing Strength Compensation"
@@ -4284,15 +4312,15 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:53
 msgid "Blur Check"
-msgstr ""
+msgstr "Проверка размыти�"
 
 #: libexif/fuji/mnote-fuji-tag.c:54
 msgid "Auto Focus Check"
-msgstr ""
+msgstr "Проверка автофоку�а"
 
 #: libexif/fuji/mnote-fuji-tag.c:55
 msgid "Auto Exposure Check"
-msgstr ""
+msgstr "Проверка авто�к�позиции"
 
 #: libexif/fuji/mnote-fuji-tag.c:56
 msgid "Dynamic Range"
@@ -4300,7 +4328,7 @@ msgstr "Динамиче�кий диапазон"
 
 #: libexif/fuji/mnote-fuji-tag.c:57
 msgid "Film Simulation Mode"
-msgstr ""
+msgstr "Режим имитации плёнки"
 
 #: libexif/fuji/mnote-fuji-tag.c:58
 msgid "Dynamic Range Wide Mode"
@@ -4312,19 +4340,19 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:60
 msgid "Minimum Focal Length"
-msgstr ""
+msgstr "Минимальное фоку�ное ра��то�ние"
 
 #: libexif/fuji/mnote-fuji-tag.c:61
 msgid "Maximum Focal Length"
-msgstr ""
+msgstr "Мак�имальное фоку�ное ра��то�ние"
 
 #: libexif/fuji/mnote-fuji-tag.c:62
 msgid "Maximum Aperture at Minimum Focal"
-msgstr ""
+msgstr "Мак�имальна� диафрагма при минимальном фоку�ном ра��то�нии"
 
 #: libexif/fuji/mnote-fuji-tag.c:63
 msgid "Maximum Aperture at Maximum Focal"
-msgstr ""
+msgstr "Мак�имальна� диафрагма при мак�имальном фоку�ном ра��то�нии"
 
 #: libexif/fuji/mnote-fuji-tag.c:65
 msgid "Order Number"
@@ -4332,7 +4360,7 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
 msgid "Frame Number"
-msgstr ""
+msgstr "�омер кадра"
 
 #: libexif/olympus/mnote-olympus-entry.c:49
 #, c-format
@@ -4345,19 +4373,19 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D or AF-S lens"
-msgstr ""
+msgstr "Объектив AF-D или AF-S"
 
 #: libexif/olympus/mnote-olympus-entry.c:95
 msgid "AF-D G lens"
-msgstr ""
+msgstr "Объектив AF-D G"
 
 #: libexif/olympus/mnote-olympus-entry.c:96
 msgid "AF-D VR lens"
-msgstr ""
+msgstr "Объектив AF-D VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "AF-D G VR lens"
-msgstr ""
+msgstr "Объектив AF-D G VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:101
 msgid "Flash unit unknown"
@@ -4582,11 +4610,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:224
 msgid "Interlaced"
-msgstr ""
+msgstr "Чере��трочна�"
 
 #: libexif/olympus/mnote-olympus-entry.c:225
 msgid "Progressive"
-msgstr ""
+msgstr "Прогре��ивна�"
 
 #: libexif/olympus/mnote-olympus-entry.c:231
 #: libexif/pentax/mnote-pentax-entry.c:85
@@ -4596,11 +4624,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:232
 msgid "Adjust exposure"
-msgstr ""
+msgstr "Регулировка �к�позиции"
 
 #: libexif/olympus/mnote-olympus-entry.c:235
 msgid "Spot focus"
-msgstr ""
+msgstr "Точечный фоку�"
 
 #: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Normal focus"
@@ -4663,117 +4691,117 @@ msgstr "15 кадров/�."
 msgid "20 frames/sec"
 msgstr "20 кадров/�."
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
-msgstr ""
+msgstr "И�правление кра�ного %f, и�правление �инего %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr "�ет выбора ручной фоку�ировки"
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f метров"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: по-центру"
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: �верху"
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: �низу"
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: �лева"
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: �права"
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: �верху-�лева"
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: �верху-�права"
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: �низу-�лева"
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: �низу-�права"
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: крайне-лева�"
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
-msgstr ""
+msgstr "Позици� вз�ти� автофоку�а: крайне-права�"
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Внутренн�� ошибка (неизве�тное значение %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "�еизве�тное значение %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr "2 �."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "�втоматиче�кий"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr "One-touch"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr "Бе�конечный"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i байт неизве�тных данных: "
@@ -4793,7 +4821,7 @@ msgstr "Резко�ть изображени�"
 
 #: libexif/olympus/mnote-olympus-tag.c:44
 msgid "Flash Setting"
-msgstr ""
+msgstr "�а�тройка в�пышки"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
 msgid "White Balance Fine Adjustment"
@@ -4805,7 +4833,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:49
 msgid "ISO Selection"
-msgstr ""
+msgstr "Выбор ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Preview Image IFD"
@@ -4821,7 +4849,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:54
 msgid "Image Boundary"
-msgstr ""
+msgstr "Границы изображени�"
 
 #: libexif/olympus/mnote-olympus-tag.c:56
 msgid "Flash Exposure Bracket Value"
@@ -4838,7 +4866,7 @@ msgstr "Под�тройка изображени�"
 
 #: libexif/olympus/mnote-olympus-tag.c:59
 msgid "Tone Compensation"
-msgstr ""
+msgstr "Компен�аци� �рко�ти цвета"
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
@@ -4860,7 +4888,7 @@ msgstr "В�пышка �работала"
 
 #: libexif/olympus/mnote-olympus-tag.c:66
 msgid "AF Focus Position"
-msgstr ""
+msgstr "Положение автофоку�а"
 
 #: libexif/olympus/mnote-olympus-tag.c:67
 msgid "Bracketing"
@@ -4875,14 +4903,13 @@ msgid "Contrast Curve"
 msgstr "Крива� контра�та"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
-msgstr ""
+msgstr "Цветовой режим"
 
 #: libexif/olympus/mnote-olympus-tag.c:72
 msgid "Light Type"
-msgstr ""
+msgstr "Тип о�вещени�"
 
 #: libexif/olympus/mnote-olympus-tag.c:74
 msgid "Hue Adjustment"
@@ -4896,7 +4923,7 @@ msgstr "Подавление шума"
 
 #: libexif/olympus/mnote-olympus-tag.c:79
 msgid "Sensor Pixel Size"
-msgstr ""
+msgstr "Размер �ен�ора в пик�ел�х"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
 msgid "Image Data Size"
@@ -4920,11 +4947,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:89
 msgid "Capture Editor Data"
-msgstr ""
+msgstr "Данные редактора захвата изображени�"
 
 #: libexif/olympus/mnote-olympus-tag.c:90
 msgid "Capture Editor Version"
-msgstr ""
+msgstr "Вер�и� редактора захвата изображени�"
 
 #: libexif/olympus/mnote-olympus-tag.c:97
 #: libexif/olympus/mnote-olympus-tag.c:183
@@ -4941,7 +4968,7 @@ msgstr "Преобразователь"
 
 #: libexif/olympus/mnote-olympus-tag.c:105
 msgid "Thumbnail Image"
-msgstr ""
+msgstr "Уменьшенное изображение"
 
 #: libexif/olympus/mnote-olympus-tag.c:106
 msgid "Speed/Sequence/Panorama Direction"
@@ -4949,11 +4976,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:109
 msgid "Black & White Mode"
-msgstr ""
+msgstr "Чёрно-белый режим"
 
 #: libexif/olympus/mnote-olympus-tag.c:111
 msgid "Focal Plane Diagonal"
-msgstr ""
+msgstr "Диагональ фокальной пло�ко�ти"
 
 #: libexif/olympus/mnote-olympus-tag.c:112
 msgid "Lens Distortion Parameters"
@@ -4977,7 +5004,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:118
 msgid "One Touch White Balance"
-msgstr ""
+msgstr "Балан� белого одним нажатием"
 
 #: libexif/olympus/mnote-olympus-tag.c:119
 msgid "White Balance Bracket"
@@ -4990,7 +5017,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:121
 msgid "Data Dump"
-msgstr ""
+msgstr "Вывод данных"
 
 #: libexif/olympus/mnote-olympus-tag.c:124
 msgid "ISO Value"
@@ -5034,11 +5061,11 @@ msgstr "�а�тройка резко�ти"
 
 #: libexif/olympus/mnote-olympus-tag.c:139
 msgid "Flash Charge Level"
-msgstr ""
+msgstr "Уровень зар�да в�пышки"
 
 #: libexif/olympus/mnote-olympus-tag.c:140
 msgid "Color Matrix"
-msgstr ""
+msgstr "Цветова� матрица"
 
 #: libexif/olympus/mnote-olympus-tag.c:141
 msgid "Black Level"
@@ -5048,13 +5075,11 @@ msgstr "Уровень чёрного"
 msgid "White Balance Setting"
 msgstr "�а�тройка балан�а белого"
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr "Балан� кра�ного"
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr "Балан� �инего"
 
@@ -5108,7 +5133,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:158
 msgid "Scene Detect"
-msgstr ""
+msgstr "Определение ме�та дей�тви�"
 
 #: libexif/olympus/mnote-olympus-tag.c:159
 msgid "Compression Ratio"
@@ -5152,7 +5177,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:172
 msgid "Color Adjustment Mode"
-msgstr ""
+msgstr "Режим регулировки цветов"
 
 #: libexif/olympus/mnote-olympus-tag.c:174
 msgid "Quick Shot"
@@ -5160,7 +5185,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:176
 msgid "Voice Memo"
-msgstr ""
+msgstr "Голо�ова� заметка"
 
 #: libexif/olympus/mnote-olympus-tag.c:177
 msgid "Record Shutter Release"
@@ -5168,11 +5193,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:178
 msgid "Flicker Reduce"
-msgstr ""
+msgstr "Уменьшение мерцани�"
 
 #: libexif/olympus/mnote-olympus-tag.c:179
 msgid "Optical Zoom"
-msgstr ""
+msgstr "Оптиче�кий тран�фокатор"
 
 #: libexif/olympus/mnote-olympus-tag.c:181
 msgid "Light Source Special"
@@ -5184,7 +5209,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:184
 msgid "Scene Select"
-msgstr ""
+msgstr "Выбор ме�та дей�тви�"
 
 #: libexif/olympus/mnote-olympus-tag.c:186
 msgid "Sequence Shot Interval"
@@ -5200,7 +5225,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:191
 msgid "Epson Software Version"
-msgstr ""
+msgstr "Вер�и� ПО Epson"
 
 #: libexif/pentax/mnote-pentax-entry.c:80
 #: libexif/pentax/mnote-pentax-entry.c:134
@@ -5219,11 +5244,11 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:92
 msgid "Flash on"
-msgstr ""
+msgstr "В�пышка вкючена"
 
 #: libexif/pentax/mnote-pentax-entry.c:140
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #: libexif/pentax/mnote-pentax-entry.c:150
 msgid "2560x1920 or 2304x1728"
@@ -5243,7 +5268,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:172
 msgid "Sunset or candlelight"
-msgstr ""
+msgstr "Закат или при �вечах"
 
 #: libexif/pentax/mnote-pentax-entry.c:173
 msgid "Autumn"
@@ -5251,7 +5276,7 @@ msgstr "О�ень"
 
 #: libexif/pentax/mnote-pentax-entry.c:178
 msgid "Self portrait"
-msgstr ""
+msgstr "�втопортрет"
 
 #: libexif/pentax/mnote-pentax-entry.c:179
 msgid "Illustrations"
@@ -5308,11 +5333,11 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:197
 msgid "Auto, fired"
-msgstr ""
+msgstr "�втоматиче�ки, в�пышка �работала"
 
 #: libexif/pentax/mnote-pentax-entry.c:199
 msgid "Auto, fired, red-eye reduction"
-msgstr ""
+msgstr "�втоматиче�ки, в�пышка �работала, уменьшение �ффекта кра�ных глаз"
 
 #: libexif/pentax/mnote-pentax-entry.c:201
 msgid "On, wireless"
@@ -5336,11 +5361,11 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:213
 msgid "AF-S"
-msgstr ""
+msgstr "AF-S (автофоку� дл� �татичных �цен)"
 
 #: libexif/pentax/mnote-pentax-entry.c:214
 msgid "AF-C"
-msgstr ""
+msgstr "AF-C (�лед�щий автофоку�)"
 
 #: libexif/pentax/mnote-pentax-entry.c:217
 msgid "Upper-left"
@@ -5396,17 +5421,27 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:282
 msgid "3008x2008 or 3040x2024"
-msgstr ""
+msgstr "3008x2008 или 3040x2024"
 
 #: libexif/pentax/mnote-pentax-entry.c:293
 msgid "Digital filter?"
-msgstr ""
+msgstr "Цифровой фильтр?"
+
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr "Внутренн�� ошибка (неизве�тное значение %hu)"
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Внутренн�� ошибка (неизве�тное значение %i %i)"
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Внутренн�� ошибка (неизве�тное значение %hu %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
+#, c-format
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Внутренн�� ошибка (неизве�тное значение %hi %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5435,7 +5470,7 @@ msgstr "Ча�ова� зона"
 
 #: libexif/pentax/mnote-pentax-tag.c:61
 msgid "Daylight Savings"
-msgstr ""
+msgstr "Летнее врем�"
 
 #: libexif/pentax/mnote-pentax-tag.c:64
 msgid "Preview Size"
@@ -5491,11 +5526,11 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:94
 msgid "Hometown City"
-msgstr ""
+msgstr "Город по�то�нного проживани�"
 
 #: libexif/pentax/mnote-pentax-tag.c:95
 msgid "Destination City"
-msgstr ""
+msgstr "Город назначени�"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Hometown DST"
@@ -5515,7 +5550,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:99
 msgid "Image Processing"
-msgstr ""
+msgstr "Обработка изображени�"
 
 #: libexif/pentax/mnote-pentax-tag.c:100
 msgid "Picture Mode (2)"
@@ -5527,15 +5562,15 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:104
 msgid "Raw Image Size"
-msgstr ""
+msgstr "Размер необработанного изображени�"
 
 #: libexif/pentax/mnote-pentax-tag.c:105
 msgid "Autofocus Points Used"
-msgstr ""
+msgstr "И�пользовали�ь точки автофоку�ировки"
 
 #: libexif/pentax/mnote-pentax-tag.c:107
 msgid "Camera Temperature"
-msgstr ""
+msgstr "Температура камеры"
 
 #: libexif/pentax/mnote-pentax-tag.c:110
 msgid "Image Tone"
@@ -5543,7 +5578,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:111
 msgid "Shake Reduction Info"
-msgstr ""
+msgstr "Сведени� �табилизатора"
 
 #: libexif/pentax/mnote-pentax-tag.c:112
 msgid "Black Point"
@@ -5551,11 +5586,11 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:114
 msgid "AE Info"
-msgstr ""
+msgstr "Сведени� авто�к�позиции"
 
 #: libexif/pentax/mnote-pentax-tag.c:115
 msgid "Lens Info"
-msgstr ""
+msgstr "Сведени� объектива"
 
 #: libexif/pentax/mnote-pentax-tag.c:116
 msgid "Flash Info"
@@ -5571,11 +5606,11 @@ msgstr "Сведени� о батарее"
 
 #: libexif/pentax/mnote-pentax-tag.c:119
 msgid "Hometown City Code"
-msgstr ""
+msgstr "Код города проживани�"
 
 #: libexif/pentax/mnote-pentax-tag.c:120
 msgid "Destination City Code"
-msgstr ""
+msgstr "Код города назначени�"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
 msgid "Object Distance"
@@ -5583,11 +5618,11 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:125
 msgid "Distance of photographed object in millimeters."
-msgstr ""
+msgstr "Ра��то�ние до �фотографированного объекта в миллиметрах."
 
 #: libexif/pentax/mnote-pentax-tag.c:126
 msgid "Flash Distance"
-msgstr ""
+msgstr "Ра��то�ние в�пышки"
 
 #: libexif/pentax/mnote-pentax-tag.c:132
 msgid "Bestshot Mode"
@@ -5609,5 +5644,5 @@ msgstr ""
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr ""
 
-#~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr "Т�г UserComment не �оответ�твует �тандарту, но �одержит данные"
+#~ msgid "FNumber"
+#~ msgstr "Чи�ло F"
diff --git a/po/sk.gmo b/po/sk.gmo
deleted file mode 100644
index fa59a01..0000000
--- a/po/sk.gmo
+++ /dev/null
diff --git a/po/sk.po b/po/sk.po
index 002432e..d389183 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,11 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.21-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2012-06-25 21:22+0200\n"
 "PO-Revision-Date: 2012-07-03 00:42+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,8 +40,8 @@ msgstr "Neplatný po�et zložiek (%i, bolo o�akávaných %i alebo %i)."
 
 # exif-subjectdistancerange-1
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
-#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:797
+#: libexif/olympus/mnote-olympus-entry.c:196
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
 #: libexif/pentax/mnote-pentax-entry.c:209
@@ -50,14 +51,14 @@ msgstr "makro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
-#: libexif/olympus/mnote-olympus-entry.c:121
-#: libexif/olympus/mnote-olympus-entry.c:198
-#: libexif/olympus/mnote-olympus-entry.c:206
-#: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:675
+#: libexif/exif-entry.c:678 libexif/exif-entry.c:679 libexif/exif-entry.c:680
+#: libexif/exif-entry.c:746 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:213
+#: libexif/olympus/mnote-olympus-entry.c:589
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -90,11 +91,11 @@ msgstr "superjemný"
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
-#: libexif/olympus/mnote-olympus-entry.c:181
-#: libexif/olympus/mnote-olympus-entry.c:189
-#: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:178
+#: libexif/olympus/mnote-olympus-entry.c:186
+#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:533
+#: libexif/olympus/mnote-olympus-entry.c:550
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -105,10 +106,10 @@ msgstr "vypnutý"
 #: libexif/canon/mnote-canon-entry.c:403 libexif/fuji/mnote-fuji-entry.c:73
 #: libexif/fuji/mnote-fuji-entry.c:101 libexif/fuji/mnote-fuji-entry.c:111
 #: libexif/fuji/mnote-fuji-entry.c:119
-#: libexif/olympus/mnote-olympus-entry.c:134
-#: libexif/olympus/mnote-olympus-entry.c:186
-#: libexif/olympus/mnote-olympus-entry.c:202
-#: libexif/olympus/mnote-olympus-entry.c:247
+#: libexif/olympus/mnote-olympus-entry.c:131
+#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/olympus/mnote-olympus-entry.c:244
 #: libexif/pentax/mnote-pentax-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:88
 #: libexif/pentax/mnote-pentax-entry.c:91
@@ -125,16 +126,16 @@ msgstr "auto"
 #: libexif/canon/mnote-canon-entry.c:374 libexif/fuji/mnote-fuji-entry.c:102
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
-#: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:179
+#: libexif/olympus/mnote-olympus-entry.c:536
+#: libexif/olympus/mnote-olympus-entry.c:553
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
 msgstr "zapnutý"
 
 #: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
-#: libexif/olympus/mnote-olympus-entry.c:187
+#: libexif/olympus/mnote-olympus-entry.c:184
 #: libexif/pentax/mnote-pentax-entry.c:94
 msgid "Red-eye reduction"
 msgstr "korekcia �ervených o�í"
@@ -273,10 +274,10 @@ msgstr "plná automatika"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:745
 #: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
-#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/olympus/mnote-olympus-entry.c:90
+#: libexif/olympus/mnote-olympus-entry.c:200
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
 #: libexif/pentax/mnote-pentax-entry.c:133
@@ -288,7 +289,7 @@ msgstr "manuálny"
 
 # exif-scenecapturetype-1
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:672 libexif/exif-entry.c:756
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -303,7 +304,7 @@ msgid "Slow shutter"
 msgstr "pomalá uzávierka"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
-#: libexif/olympus/mnote-olympus-entry.c:257
+#: libexif/olympus/mnote-olympus-entry.c:254
 msgid "Night"
 msgstr "no�ný"
 
@@ -318,7 +319,7 @@ msgstr "sépia"
 
 # exif-scenecapturetype-2
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:672 libexif/exif-entry.c:754
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -355,7 +356,7 @@ msgid "Long shutter"
 msgstr "pomalá uzávierka"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
-#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:171
 msgid "Super macro"
 msgstr "super makro"
 
@@ -428,9 +429,9 @@ msgstr "ISO 3200"
 
 #: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
-#: libexif/olympus/mnote-olympus-entry.c:192
-#: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:189
+#: libexif/olympus/mnote-olympus-entry.c:226
+#: libexif/olympus/mnote-olympus-entry.c:454
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "žiadny"
@@ -443,8 +444,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:703
+#: libexif/exif-entry.c:733
 msgid "Other"
 msgstr "iný"
 
@@ -495,11 +496,11 @@ msgid "Default"
 msgstr "štandardný"
 
 # exif-meteringmode-3
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:699
 msgid "Spot"
 msgstr "bod"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:697
 msgid "Average"
 msgstr "priemer"
 
@@ -508,11 +509,11 @@ msgid "Evaluative"
 msgstr "vyhodnocujúci"
 
 # exif-meteringmode-6
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:702
 msgid "Partial"
 msgstr "�iasto�ný"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:698
 msgid "Center-weighted average"
 msgstr "vážený priemer"
 
@@ -524,7 +525,7 @@ msgstr "neznáme"
 msgid "Very close"
 msgstr "veľmi zblízka"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:798
 msgid "Close"
 msgstr "zblízka"
 
@@ -963,12 +964,12 @@ msgid "FP sync used"
 msgstr "FP synchr. použitá"
 
 #: libexif/canon/mnote-canon-entry.c:295
-#: libexif/olympus/mnote-olympus-entry.c:193
+#: libexif/olympus/mnote-olympus-entry.c:190
 msgid "Internal"
 msgstr "interný"
 
 #: libexif/canon/mnote-canon-entry.c:296
-#: libexif/olympus/mnote-olympus-entry.c:194
+#: libexif/olympus/mnote-olympus-entry.c:191
 msgid "External"
 msgstr "externý"
 
@@ -1041,36 +1042,36 @@ msgid "Sunny"
 msgstr "slne�no"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
-#: libexif/olympus/mnote-olympus-entry.c:139
+#: libexif/exif-entry.c:720 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "obla�no"
 
 # exif-lightsource-3
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:717 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "volfrám"
 
 # exif-lightsource-2
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:716 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "fluorescencia"
 
 # exif-lightsource-4
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:718 libexif/exif-entry.c:760 libexif/exif-tag.c:577
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "blesk"
 
 # exif-lightsource-11
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:721 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "odtieň"
@@ -1093,7 +1094,7 @@ msgid "PC set 3"
 msgstr "PC set 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:722 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "denné svetlo fluorescen�né"
@@ -1106,7 +1107,7 @@ msgstr "vlastné 1"
 msgid "Custom 2"
 msgstr "vlastné 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:673
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1171,22 +1172,22 @@ msgid "Rotated by software"
 msgstr "oto�enie softvérom"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:609
 msgid "Left to right"
 msgstr "Zľava doprava"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:612
 msgid "Right to left"
 msgstr "Sprava doľava"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:615
 msgid "Bottom to top"
 msgstr "Zdola hore"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:618
 msgid "Top to bottom"
 msgstr "Zhora dolu"
 
@@ -1196,9 +1197,9 @@ msgstr "matica 2x2 (v smere hodinových ru�i�iek)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:672 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
-#: libexif/olympus/mnote-olympus-entry.c:230
+#: libexif/olympus/mnote-olympus-entry.c:227
 msgid "Standard"
 msgstr "Štandardný"
 
@@ -1215,9 +1216,9 @@ msgid "Highest"
 msgstr "Najvyššie"
 
 # exif-lightsource-1
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:715
 #: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/olympus/mnote-olympus-entry.c:133
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1264,7 +1265,7 @@ msgid "Faithful"
 msgstr "Verné"
 
 #: libexif/canon/mnote-canon-entry.c:436
-#: libexif/olympus/mnote-olympus-entry.c:118
+#: libexif/olympus/mnote-olympus-entry.c:115
 msgid "Monochrome"
 msgstr "jednofarebné"
 
@@ -1287,7 +1288,7 @@ msgstr "%.2f mm"
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1065
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
@@ -1312,7 +1313,7 @@ msgid "Settings (Second Part)"
 msgstr "nastavenia (druhá �asť)"
 
 #: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/olympus/mnote-olympus-entry.c:598
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "panoráma"
@@ -1666,756 +1667,705 @@ msgstr "EXIF zna�ka nebola nájdená."
 msgid "EXIF header not found."
 msgstr "EXIF hlavi�ka nebola nájdená."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:884
 msgid "Unknown encoding."
 msgstr "Neznáme kódovanie."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1168
 msgid "Ignore unknown tags"
 msgstr "Ignorovať neznáme zna�ky."
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1169
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Ignorovať neznáme zna�ky po�as na�ítavania EXIF údajov."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1170
 msgid "Follow specification"
 msgstr "Dodržiavať špecifikáciu"
 
-#: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
-"Pridať opraviť a odstrániť záznamy, aby sme získali EXIF údaje, ktoré "
-"dodržiavajú špecifikáciu."
+#: libexif/exif-data.c:1171
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Pridať opraviť a odstrániť záznamy, aby sme získali EXIF údaje, ktoré dodržiavajú špecifikáciu."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1173
 msgid "Do not change maker note"
 msgstr "Nemeniť poznámku o výrobcovi"
 
-#: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
-"Pri na�ítaní a znovuukladaní EXIF údajov uložiť zna�ku nezmenenú. Bu�te si "
-"vedomý, že zna�ka sa môže poškodiť."
+#: libexif/exif-data.c:1174
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Pri na�ítaní a znovuukladaní EXIF údajov uložiť zna�ku nezmenenú. Bu�te si vedomý, že zna�ka sa môže poškodiť."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
-"Štítok „%s“ ma formát „%s“ (�o je proti špecifikácii) a bol zmenený na "
-"formát „%s“."
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Štítok „%s“ ma formát „%s“ (�o je proti špecifikácii) a bol zmenený na formát „%s“."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
-"Zna�ka „%s“ ma formát „%s“ (�o je proti špecifikácii) a bola zmenená na "
-"formát „%s“."
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Zna�ka „%s“ ma formát „%s“ (�o je proti špecifikácii) a bola zmenená na formát „%s“."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
-"Štítok „UserComment“ mal neplatný formát „%s“. Formát bol zmenený na "
-"„nedefinovaný“."
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Štítok „UserComment“ mal neplatný formát „%s“. Formát bol zmenený na „nedefinovaný“."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
-"Štítok „UserComment“ bol rozšírený na aspoň 8 bajtov, aby podliehal "
-"špecifikácii."
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Štítok „UserComment“ bol rozšírený na aspoň 8 bajtov, aby podliehal špecifikácii."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
-"Zna�ka „UserComment“ nie je prízdna, ale neza�ína identifikátorom formátu. "
-"Toto bolo opravené."
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Zna�ka „UserComment“ nie je prízdna, ale neza�ína identifikátorom formátu. Toto bolo opravené."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
-"Zna�ja „UserComment“ neza�ínala identifikátorom formátu. Toto bolo opravené."
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Zna�ja „UserComment“ neza�ínala identifikátorom formátu. Toto bolo opravené."
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:463
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i bajtov nedefinovaných údajov"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:590
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i bajtov nepodporovaného typu údajov"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:623
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
-"Štítok „%s“ obsahuje údaje neplatného formátu („%s“, o�akávalo sa „%s“)."
+msgstr "Štítok „%s“ obsahuje údaje neplatného formátu („%s“, o�akávalo sa „%s“)."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:636
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr "Štítok „%s“ obsahuje neplatný po�et zložiek (%i, o�akávalo sa %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:650
 msgid "Chunky format"
 msgstr "Kúskový formát"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:650
 msgid "Planar format"
 msgstr "Rovinný formát"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
+#: libexif/exif-entry.c:652 libexif/exif-entry.c:744
 #: test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "nedefinovaný"
 
 # exif-sensingmethod-2
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:652
 msgid "One-chip color area sensor"
 msgstr "jedno�ipový farebný sníma� oblasti"
 
 # exif-sensingmethod-3
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:653
 msgid "Two-chip color area sensor"
 msgstr "dvoj�ipový farebný sníma� oblasti"
 
 # exif-sensingmethod-4
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:653
 msgid "Three-chip color area sensor"
 msgstr "troj�ipový farebný sníma� oblasti"
 
 # exif-sensingmethod-5
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:654
 msgid "Color sequential area sensor"
 msgstr "sekven�ný farebný sníma� oblasti"
 
 # exif-sensingmethod-7
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:654
 msgid "Trilinear sensor"
 msgstr "trilineárny sníma�"
 
 # exif-sensingmethod-5
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:655
 msgid "Color sequential linear sensor"
 msgstr "sekven�ný farebný sníma� oblasti"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Ľavý horný"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Pravý horný"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Pravý spodný"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:658 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Ľavý spodný"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:658
 msgid "Left-top"
 msgstr "Ľavý vrchný"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:658
 msgid "Right-top"
 msgstr "Pravý vrchný"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:659
 msgid "Right-bottom"
 msgstr "Pravý spodný"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:659
 msgid "Left-bottom"
 msgstr "Ľavý spodný"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:661
 msgid "Centered"
 msgstr "Stredný"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:661
 msgid "Co-sited"
 msgstr "Spolu umiestnený"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Reversed mono"
 msgstr "obrátené mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Normal mono"
 msgstr "normálny mono"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:663
 msgid "Palette"
 msgstr "paleta"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:664
 msgid "CieLAB"
 msgstr "CieLAB"
 
 # exif-customrendered-0
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:666
 msgid "Normal process"
 msgstr "bežné spracovanie"
 
 # exif-customrendered-1
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:666
 msgid "Custom process"
 msgstr "vlastné spracovanie"
 
 # exif-exposuremode-0
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:668
 msgid "Auto exposure"
 msgstr "automatická expozícia"
 
 # exif-exposuremode-1
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:668 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "manuálna expozícia"
 
 # exif-exposuremode-2
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:668
 msgid "Auto bracket"
 msgstr "automatická kompenzácia expozície"
 
 # exif-whitebalance-0
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:670
 msgid "Auto white balance"
 msgstr "automatické vyváženie bielej"
 
 # exif-whitebalance-1
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:670
 msgid "Manual white balance"
 msgstr "ru�né vyváženie bielej"
 
 # exif-gaincontrol-1
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:675
 msgid "Low gain up"
 msgstr "nízke zosilnenie"
 
 # exif-gaincontrol-2
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:675
 msgid "High gain up"
 msgstr "vysoké zosilnenie"
 
 # exif-gaincontrol-3
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:676
 msgid "Low gain down"
 msgstr "nízke zoslabenie"
 
 # exif-gaincontrol-4
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:676
 msgid "High gain down"
 msgstr "vysoké zoslabenie"
 
 # exif-saturation-1
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:678
 msgid "Low saturation"
 msgstr "nízka sýtosť"
 
 # exif-saturation-2
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:678 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "vysoká sýtosť"
 
 # exif-sharpness-1
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:679 libexif/exif-entry.c:680
 #: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
-#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:205
+#: libexif/olympus/mnote-olympus-entry.c:214
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "mäkký"
 
 # exif-sharpness-2
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:679 libexif/exif-entry.c:680
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
-#: libexif/olympus/mnote-olympus-entry.c:207
-#: libexif/olympus/mnote-olympus-entry.c:215
+#: libexif/olympus/mnote-olympus-entry.c:204
+#: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/pentax/mnote-pentax-entry.c:107
 msgid "Hard"
 msgstr "tvrdý"
 
 # exif-meteringmode-0
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:714 libexif/exif-entry.c:796
+#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:686
+#: libexif/olympus/mnote-olympus-entry.c:741
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "neznámy"
 
 # exif-meteringmode-1
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:697
 msgid "Avg"
 msgstr "priem"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:698
 msgid "Center-weight"
 msgstr "vážený"
 
 # exif-meteringmode-4
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:700
 msgid "Multi spot"
 msgstr "viac bodov"
 
 # exif-meteringmode-5
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:701
 msgid "Pattern"
 msgstr "vzorka"
 
 # exif-compression-1
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:706
 msgid "Uncompressed"
 msgstr "nekomprimovaný"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:707
 msgid "LZW compression"
 msgstr "LZW kompresia"
 
 # exif-compression-6
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:708 libexif/exif-entry.c:709
 msgid "JPEG compression"
 msgstr "JPEG kompresia"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:710
 msgid "Deflate/ZIP compression"
 msgstr "Deflate/ZIP kompresia"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:711
 msgid "PackBits compression"
 msgstr "PackBits kompresia"
 
 # exif-lightsource-3
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:717
 msgid "Tungsten incandescent light"
 msgstr "volframové inkadescentné svetlo"
 
 # exif-lightsource-9
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:719
 msgid "Fine weather"
 msgstr "pekné po�asie"
 
 # exif-lightsource-10
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:720
 msgid "Cloudy weather"
 msgstr "obla�né po�asie"
 
 # exif-lightsource-13
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:723 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "biely deň, fluorescen�né"
 
 # exif-lightsource-14
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:724
 msgid "Cool white fluorescent"
 msgstr "chladná biela, fluorescen�né"
 
 # exif-lightsource-15
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:725 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "biela, fluorescen�né"
 
 # exif-lightsource-17
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:726
 msgid "Standard light A"
 msgstr "štandardné svetlo A"
 
 # exif-lightsource-18
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:727
 msgid "Standard light B"
 msgstr "štandardné svetlo B"
 
 # exif-lightsource-19
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:728
 msgid "Standard light C"
 msgstr "štandardné svetlo C"
 
 # exif-lightsource-20
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:729
 msgid "D55"
 msgstr "D55"
 
 # exif-lightsource-21
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:730
 msgid "D65"
 msgstr "D65"
 
 # exif-lightsource-22
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:731
 msgid "D75"
 msgstr "D75"
 
 # exif-lightsource-24
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:732
 msgid "ISO studio tungsten"
 msgstr "ISO štúdiový volfrám"
 
 # exif-focalplaneresolutionunit-2
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "Inch"
 msgstr "palcov"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
 msgid "in"
 msgstr "pl"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:741
 msgid "Centimeter"
 msgstr "centimetrov"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:741
 msgid "cm"
 msgstr "cm"
 
 # exif-exposureprogram-2
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:746
 msgid "Normal program"
 msgstr "normálny program"
 
 # exif-exposureprogram-3
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:747
 msgid "Aperture priority"
 msgstr "priorita clony"
 
 # exif-aperturevalue
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:747 libexif/exif-tag.c:550
 msgid "Aperture"
 msgstr "clona"
 
 # exif-exposureprogram-4
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:748
 msgid "Shutter priority"
 msgstr "priorita uzávierky"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:748
 msgid "Shutter"
 msgstr "uzávierka"
 
 # exif-exposureprogram-5
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:749
 msgid "Creative program (biased toward depth of field)"
 msgstr "tvorivý program (prevažuje smerom k hĺbke poľa)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:750
 msgid "Creative"
 msgstr "tvorivý"
 
 # exif-exposureprogram-6
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:751
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr "tvorivý program (prevažuje smerom k rýchlej uzávierke)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:752
 msgid "Action"
 msgstr "ak�ný"
 
 # exif-exposureprogram-7
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:753
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "režim portrét (pre detailné zábery s nezaostreným pozadím)"
 
 # exif-exposureprogram-8
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:755
 msgid "Landscape mode (for landscape photos with the background in focus)"
-msgstr "režim krajinka (pre fotografie krajiny so zaostreným pozadím) "
+msgstr "režim krajinka (pre fotografie krajiny so zaostreným pozadím)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
-#: libexif/olympus/mnote-olympus-entry.c:100
+#: libexif/exif-entry.c:759 libexif/exif-entry.c:764
+#: libexif/olympus/mnote-olympus-entry.c:97
 msgid "Flash did not fire"
 msgstr "blesk sa nespustil"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:759
 msgid "No flash"
 msgstr "Bez blesku"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:760
 msgid "Flash fired"
 msgstr "blesk sa spustil"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
-#: libexif/olympus/mnote-olympus-entry.c:178
-#: libexif/olympus/mnote-olympus-entry.c:212
-#: libexif/olympus/mnote-olympus-entry.c:221
-#: libexif/olympus/mnote-olympus-entry.c:244
+#: libexif/exif-entry.c:760 libexif/olympus/mnote-olympus-entry.c:170
+#: libexif/olympus/mnote-olympus-entry.c:175
+#: libexif/olympus/mnote-olympus-entry.c:209
+#: libexif/olympus/mnote-olympus-entry.c:218
+#: libexif/olympus/mnote-olympus-entry.c:241
 msgid "Yes"
 msgstr "áno"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:761
 msgid "Strobe return light not detected"
 msgstr "vracajúci sa impulz svetla nebol detekovaný"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:761
 msgid "Without strobe"
 msgstr "Bez impulzného svetla"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:763
 msgid "Strobe return light detected"
 msgstr "vracajúci sa impulz svetla bol detekovaný"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:763
 msgid "With strobe"
 msgstr "S impulzným svetlom"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:765
 msgid "Flash fired, compulsory flash mode"
 msgstr "blesk sa spustil, povinný režim blesku"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:766
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
-"blesk sa spustil, povinný režim blesku, vracajúce sa svetlo nedetekované"
+msgstr "blesk sa spustil, povinný režim blesku, vracajúce sa svetlo nedetekované"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:768
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr "blesk sa spustil, povinný režim blesku, vracajúce sa svetlo detekované"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:770
 msgid "Flash did not fire, compulsory flash mode"
 msgstr "blesk sa nespustil, povinný režim blesku"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:771
 msgid "Flash did not fire, auto mode"
 msgstr "blesk sa nespustil, automatický režim blesku"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:772
 msgid "Flash fired, auto mode"
 msgstr "blesk sa spustil, automatický režim blesku"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:773
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
-"blesk sa spustil, automatický režim blesku, vracajúce sa svetlo nedetekované"
+msgstr "blesk sa spustil, automatický režim blesku, vracajúce sa svetlo nedetekované"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:775
 msgid "Flash fired, auto mode, return light detected"
-msgstr ""
-"blesk sa spustil, automatický režim blesku, vracajúce sa svetlo detekované"
+msgstr "blesk sa spustil, automatický režim blesku, vracajúce sa svetlo detekované"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:776
 msgid "No flash function"
 msgstr "bez funkcie blesku"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:777
 msgid "Flash fired, red-eye reduction mode"
 msgstr "blesk sa spustil, korekcia �ervených o�í"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:778
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
-"blesk sa spustil, korekcia �ervených o�í, vracajúce sa svetlo nedetekované"
+msgstr "blesk sa spustil, korekcia �ervených o�í, vracajúce sa svetlo nedetekované"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:780
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
-"blesk sa spustil, korekcia �ervených o�í, vracajúce sa svetlo detekované"
+msgstr "blesk sa spustil, korekcia �ervených o�í, vracajúce sa svetlo detekované"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:782
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "blesk sa spustil, povinný režim blesku, korekcia �ervených o�í"
 
-#: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"blesk sa spustil, povinný režim blesku, korekcia �ervených o�í, vracajúce sa "
-"svetlo nedetekované"
+#: libexif/exif-entry.c:784
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "blesk sa spustil, povinný režim blesku, korekcia �ervených o�í, vracajúce sa svetlo nedetekované"
 
-#: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"blesk sa spustil, povinný režim blesku, korekcia �ervených o�í, vracajúce sa "
-"svetlo nedetekované"
+#: libexif/exif-entry.c:786
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "blesk sa spustil, povinný režim blesku, korekcia �ervených o�í, vracajúce sa svetlo nedetekované"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr "blesk sa nespustil, automatický režim, korekcia �ervených o�í"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:789
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "blesk sa spustil, automatický režim, korekcia �ervených o�í"
 
-#: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"blesk sa nespustil, automatický režim blesku, vracajúce sa svetlo "
-"nedetekované, korekcia �ervených o�í"
+#: libexif/exif-entry.c:790
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "blesk sa nespustil, automatický režim blesku, vracajúce sa svetlo nedetekované, korekcia �ervených o�í"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:792
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"blesk sa nespustil, automatický režim blesku, vracajúce sa svetlo "
-"detekované, korekcia �ervených o�í"
+msgstr "blesk sa nespustil, automatický režim blesku, vracajúce sa svetlo detekované, korekcia �ervených o�í"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:796
 msgid "?"
 msgstr "?"
 
 # exif-subjectdistancerange-2
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:798
 msgid "Close view"
 msgstr "pohľad zblízka"
 
 # exif-subjectdistancerange-3
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:799
 msgid "Distant view"
 msgstr "vzdialený pohľad"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:799
 msgid "Distant"
 msgstr "Vzdialený"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:802
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:803
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:804
 msgid "Uncalibrated"
 msgstr "nekalibrovaný"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:858
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "Neplatná veľkosť záznamu (%i, o�akávalo sa %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:891
 msgid "Unsupported UNICODE string"
 msgstr "Nepodporovaný reťazec UNICODE"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:899
 msgid "Unsupported JIS string"
 msgstr "Nepodporovaný reťazec JIS"
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:915
 msgid "Tag UserComment contains data but is against specification."
 msgstr "Štítok „UserComment“ obsahuje dáta, ale je proti špecifikácii."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:919
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "bajt na pozícii %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:928
 msgid "Unknown Exif Version"
 msgstr "Neznáma verzia Exif"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:932
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif verzia %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:943
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix verzia 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:945
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix verzia 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:947
 msgid "Unknown FlashPix Version"
 msgstr "Neznáma verzia FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:960 libexif/exif-entry.c:973 libexif/exif-entry.c:1629
+#: libexif/exif-entry.c:1634 libexif/exif-entry.c:1638
+#: libexif/exif-entry.c:1643 libexif/exif-entry.c:1644
 msgid "[None]"
 msgstr "[žiadny]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:962
 msgid "(Photographer)"
 msgstr "(fotograf)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:976
 msgid "(Editor)"
 msgstr "(redaktor)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1000 libexif/exif-entry.c:1080
+#: libexif/exif-entry.c:1097 libexif/exif-entry.c:1141
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1001
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1035
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (ekvivalent 35: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1068 libexif/exif-entry.c:1069
 msgid " sec."
 msgstr " sek."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1083
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d sek.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1085
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d sek.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1098
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1108
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
+#: libexif/exif-entry.c:1110 libexif/exif-entry.c:1150
+#: libexif/exif-entry.c:1237 libexif/exif-entry.c:1288
+#: libexif/exif-entry.c:1297 libexif/exif-entry.c:1333
 #: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
 #: libexif/pentax/mnote-pentax-entry.c:350
 #: libexif/pentax/mnote-pentax-entry.c:359
@@ -2423,75 +2373,75 @@ msgstr "DSC"
 msgid "Internal error (unknown value %i)"
 msgstr "Vnútorná chyba (neznáma hodnota %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1118
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1119
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1120
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1121
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1122
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1123
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1124
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1125
 msgid "Reserved"
 msgstr "rezervované"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1148
 msgid "Directly photographed"
 msgstr "Priamo odfotené"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1161
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1163
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1180
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "Vo vzdialenosti %i z (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1189
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "V obdĺžniku (šírka %i, výška %i) okolo (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1195
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "Neo�akávaný po�et zložiek (%li, o�akávalo sa 2, 3 alebo 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1233
 msgid "Sea level"
 msgstr "úroveň mora"
 
 # exif-gpsaltituderef
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1235
 msgid "Sea level reference"
 msgstr "referencia úrovene mora"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1343
 #, c-format
 msgid "Unknown value %i"
 msgstr "neznáma hodnota %i"
@@ -2583,32 +2533,16 @@ msgid "GPS Tag Version"
 msgstr "verzia GPS štítka"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
-"Ozna�uje verziu <GPSInfoIFD>. Verzia sa udáva ako 2.0.0.0. Tento štítok je "
-"povinný, ak je prítomný štítok <GPSInfo>. (Pozn.: Štítok <GPSVersionID> je "
-"uvedený v bajtoch na rozdiel od štítka <ExifVersion>. Ke� je verzia 2.0.0.0, "
-"hodnota štítka je 02000000.H)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Ozna�uje verziu <GPSInfoIFD>. Verzia sa udáva ako 2.0.0.0. Tento štítok je povinný, ak je prítomný štítok <GPSInfo>. (Pozn.: Štítok <GPSVersionID> je uvedený v bajtoch na rozdiel od štítka <ExifVersion>. Ke� je verzia 2.0.0.0, hodnota štítka je 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
 msgstr "Index Interoperability"
 
 #: libexif/exif-tag.c:70
-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 ""
-"Ozna�uje identifkáciu Pravidla interoperability. Použite \"R98\" pre "
-"vyhlásenie pravidiel ExifR98. Použité štyri bajty vrátane ukon�ovacieho "
-"znaku (NULL). Ďalšie zna�ky použité v ExifR98 nájdete v samostatnom zväzku "
-"Recommended Exif Interoperability Rules (ExifR98)."
+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 "Ozna�uje identifkáciu Pravidla interoperability. Použite \"R98\" pre vyhlásenie pravidiel ExifR98. Použité štyri bajty vrátane ukon�ovacieho znaku (NULL). Ďalšie zna�ky použité v ExifR98 nájdete v samostatnom zväzku Recommended Exif Interoperability Rules (ExifR98)."
 
 # exif-gpslatituderef
 #: libexif/exif-tag.c:76
@@ -2616,12 +2550,8 @@ msgid "North or South Latitude"
 msgstr "Severná alebo južná šírka"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
-"Ozna�uje, �i je zemepisná šírka severná alebo južná šírka. ASCII hodnota „N“ "
-"ozna�uje severnú šírku a „S“ južnú šírku."
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Ozna�uje, �i je zemepisná šírka severná alebo južná šírka. ASCII hodnota „N“ ozna�uje severnú šírku a „S“ južnú šírku."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
@@ -2633,18 +2563,8 @@ msgid "Latitude"
 msgstr "zemepisná šírka"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
-"Ozna�uje zemepisnú šírku. Zemepisná šírka je vyjadrená tromi RACION�LNYMI "
-"hodnotami udanými v stupňoch, minútach a sekundách. Stupne, minúty a sekundy "
-"sú vyjadrené vo formáte ddd/1,mm/1,ss/1. Ke� sú použité stupne, minúty a "
-"napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,"
-"mmmm/100,0/1."
+msgid "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."
+msgstr "Ozna�uje zemepisnú šírku. Zemepisná šírka je vyjadrená tromi RACION�LNYMI hodnotami udanými v stupňoch, minútach a sekundách. Stupne, minúty a sekundy sú vyjadrené vo formáte ddd/1,mm/1,ss/1. Ke� sú použité stupne, minúty a napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,mmmm/100,0/1."
 
 # exif-gpslongituderef
 #: libexif/exif-tag.c:91
@@ -2652,12 +2572,8 @@ msgid "East or West Longitude"
 msgstr "východná alebo západná dĺžka"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
-"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."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "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."
 
 # exif-gpslongitude
 #: libexif/exif-tag.c:95
@@ -2665,18 +2581,8 @@ msgid "Longitude"
 msgstr "zemepisná dĺžka"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
-"Ozna�uje zemepisnú dĺžku. Zemepisná dĺžka je vyjadrená tromi RACION�LNYMI "
-"hodnotami udanými v stupňoch, minútach a sekundách. Stupne, minúty a sekundy "
-"sú vyjadrené vo formáte ddd/1,mm/1,ss/1. Ke� sú použité stupne, minúty a "
-"napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,"
-"mmmm/100,0/1."
+msgid "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."
+msgstr "Ozna�uje zemepisnú dĺžku. Zemepisná dĺžka je vyjadrená tromi RACION�LNYMI hodnotami udanými v stupňoch, minútach a sekundách. Stupne, minúty a sekundy sú vyjadrené vo formáte ddd/1,mm/1,ss/1. Ke� sú použité stupne, minúty a napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,mmmm/100,0/1."
 
 # exif-gpsaltituderef
 #: libexif/exif-tag.c:103
@@ -2684,19 +2590,8 @@ msgid "Altitude Reference"
 msgstr "referencia nadmorskej výšky"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
-"Ozna�uje nadmorskú výšku, ktorá sa použije ako referen�ná. Ak je referen�nou "
-"hodnotou úroveň hladiny mora a nadmorská výška je nad hladinou mora, udáva "
-"sa 0. Ak je nadmorská výška pod hladinou mora, udáva sa hodnota 0 a "
-"nadmorská výška sa uvedie ako absolútna hodnota v štítku GSPAltitude. "
-"Referen�ná jednotka sú metre. Všimnite si, že tento štítok je typy BAJT na "
-"rozdiel od iných referen�ných štítkov."
+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 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."
+msgstr "Ozna�uje nadmorskú výšku, ktorá sa použije ako referen�ná. Ak je referen�nou hodnotou úroveň hladiny mora a nadmorská výška je nad hladinou mora, udáva sa 0. Ak je nadmorská výška pod hladinou mora, udáva sa hodnota 0 a nadmorská výška sa uvedie ako absolútna hodnota v štítku GSPAltitude. Referen�ná jednotka sú metre. Všimnite si, že tento štítok je typy BAJT na rozdiel od iných referen�ných štítkov."
 
 # exif-gpsaltitude
 #: libexif/exif-tag.c:110
@@ -2704,92 +2599,56 @@ msgid "Altitude"
 msgstr "nadmorská výška"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
-"Ozna�uje nadmorskú výšku na základe referen�ného GPSAltitudeRef. Nadmorská "
-"výška je vyjadrená ako jedna RACION�LNA hodnota. Referen�ná jednotka sú "
-"metre."
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Ozna�uje nadmorskú výšku na základe referen�ného GPSAltitudeRef. Nadmorská výška je vyjadrená ako jedna RACION�LNA hodnota. Referen�ná jednotka sú metre."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
 msgstr "GPS �as (atómové hodiny)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
-"Indikuje �as ako UTC (Coordinated Universal Time). TimeStamp je vyjadrený "
-"ako tri hodnoty RATIONAL udávajúce hodiny, minúty a sekundy."
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Indikuje �as ako UTC (Coordinated Universal Time). TimeStamp je vyjadrený ako tri hodnoty RATIONAL udávajúce hodiny, minúty a sekundy."
 
 #: libexif/exif-tag.c:118
 msgid "GPS Satellites"
 msgstr "Satelity GPS"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
-"Indicates ktoré GPS satelity boli na merania použité. Táto zna�ka môže "
-"popisovať po�et satelitov, ich ID �ísla, uhol elevácie, azimut, SNR a iné "
-"informácie v zápise ASCII. Formát nie je predpísaný. Ak nie je GPS prijíma� "
-"schopný merania, hodnota tejto zna�ky by mala byť NULL."
+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, 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 shall be set to NULL."
+msgstr "Indicates ktoré GPS satelity boli na merania použité. Táto zna�ka môže popisovať po�et satelitov, ich ID �ísla, uhol elevácie, azimut, SNR a iné informácie v zápise ASCII. Formát nie je predpísaný. Ak nie je GPS prijíma� schopný merania, hodnota tejto zna�ky by mala byť NULL."
 
 #: libexif/exif-tag.c:125
 msgid "GPS Receiver Status"
 msgstr "Stav prijíma�a GPS"
 
 #: libexif/exif-tag.c:126
-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 ""
-"Indikuje stav prijíma�a GPS pri zázname obrázka. „A“ znamená prebiehajúce "
-"meranie a „V“ znamená, že meranie je Interoperability."
+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 "Indikuje stav prijíma�a GPS pri zázname obrázka. „A“ znamená prebiehajúce meranie a „V“ znamená, že meranie je Interoperability."
 
 #: libexif/exif-tag.c:129
 msgid "GPS Measurement Mode"
 msgstr "režim merania GPS"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
-"Indikuje režim merania GPS. „2“ znamená prebiehajúce dvojrozmerné a „3“ "
-"trojrozmerné meranie."
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Indikuje režim merania GPS. „2“ znamená prebiehajúce dvojrozmerné a „3“ trojrozmerné meranie."
 
 #: libexif/exif-tag.c:133
 msgid "Measurement Precision"
 msgstr "presnosť merania"
 
 #: libexif/exif-tag.c:134
-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 ""
-"Indikuje GPS DOP (dátový stupeň presnosti). Hodnota HDOP sa zapisuje po�as "
-"dvojrozmerného merania a PDOP po�as trojrozmerného merania."
+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 "Indikuje GPS DOP (dátový stupeň presnosti). Hodnota HDOP sa zapisuje po�as dvojrozmerného merania a PDOP po�as trojrozmerného merania."
 
 #: libexif/exif-tag.c:137
 msgid "Speed Unit"
 msgstr "jednotky rýchlosti"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
-"Indikuje jednotky vyjadrujúce rýchlosť pohybu GPS. „K“, „M“ a „N“ "
-"predstavujú kilometre za hodinu, míle za hodinu a uzly."
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Indikuje jednotky vyjadrujúce rýchlosť pohybu GPS. „K“, „M“ a „N“ predstavujú kilometre za hodinu, míle za hodinu a uzly."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
@@ -2804,21 +2663,15 @@ msgid "Reference for direction of movement"
 msgstr "referencia smeru pohybu"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"Referencia pre smer pohybu prijíma�a GPS. „T“ zna�í skuto�ný smer a „M“ je "
-"magnetický smer."
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Referencia pre smer pohybu prijíma�a GPS. „T“ zna�í skuto�ný smer a „M“ je magnetický smer."
 
 #: libexif/exif-tag.c:147
 msgid "Direction of Movement"
 msgstr "smer pohybu"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
 msgstr "Zna�í smer pohybu prijíma�a GPS. Rozsah hodnôt je od 0.00 do 359.99."
 
 #: libexif/exif-tag.c:150
@@ -2826,12 +2679,8 @@ msgid "GPS Image Direction Reference"
 msgstr "referencia smeru obrázka podľa GPS"
 
 #: libexif/exif-tag.c:151
-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 ""
-"Referencia pre smer obrázka, ke� bol zachytený. „T“ zna�í skuto�ný smer "
-"obrázka a „M“ je magnetický smer."
+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 "Referencia pre smer obrázka, ke� bol zachytený. „T“ zna�í skuto�ný smer obrázka a „M“ je magnetický smer."
 
 # exif-imagedescription
 #: libexif/exif-tag.c:153
@@ -2839,111 +2688,63 @@ msgid "GPS Image Direction"
 msgstr "smer obrázka podľa GPS"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
-"Zna�í smer obrázka, ke� bol zachytený. Rozsah hodnôt je od 0.00 do 359.99."
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
+msgstr "Zna�í smer obrázka, ke� bol zachytený. Rozsah hodnôt je od 0.00 do 359.99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
 msgstr "použité geodetické prieskumné dáta"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
-"Indikuje geodetické prieskumné dáta použité prijíma�om GPS. Ak sú geodetické "
-"dáta obmedzené na Japonsko, hodnota tejto zna�ky je „TOKYO“ alebo „WGS-84“. "
-"Ak je zaznamenaná zna�ka GPS Info dôrazne sa odporú�a zaznamenať aj túto "
-"zna�ku."
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Indikuje geodetické prieskumné dáta použité prijíma�om GPS. Ak sú geodetické dáta obmedzené na Japonsko, hodnota tejto zna�ky je „TOKYO“ alebo „WGS-84“. Ak je zaznamenaná zna�ka GPS Info dôrazne sa odporú�a zaznamenať aj túto zna�ku."
 
 #: libexif/exif-tag.c:161
 msgid "Reference For Latitude of Destination"
 msgstr "referencia zemepisnej šírky cieľa"
 
 #: libexif/exif-tag.c:162
-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 ""
-"Ozna�uje, �i je zemepisná šírka severná alebo južná šírka. ASCII hodnota „N“ "
-"ozna�uje severnú šírku a „S“ južnú šírku."
+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 "Ozna�uje, �i je zemepisná šírka severná alebo južná šírka. ASCII hodnota „N“ ozna�uje severnú šírku a „S“ južnú šírku."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
 msgstr "zemepisná šírka cieľa"
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
-"Ozna�uje zemepisnú šírku. Zemepisná šírka je vyjadrená tromi RACION�LNYMI "
-"hodnotami udanými v stupňoch, minútach a sekundách. Stupne, minúty a sekundy "
-"sú vyjadrené vo formáte dd/1,mm/1,ss/1. Ke� sú použité stupne, minúty a "
-"napr. zlomky minút sú zadané na dve desatinné miesta, formát je dd/1,"
-"mmmm/100,0/1."
+msgid "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."
+msgstr "Ozna�uje zemepisnú šírku. Zemepisná šírka je vyjadrená tromi RACION�LNYMI hodnotami udanými v stupňoch, minútach a sekundách. Stupne, minúty a sekundy sú vyjadrené vo formáte dd/1,mm/1,ss/1. Ke� sú použité stupne, minúty a napr. zlomky minút sú zadané na dve desatinné miesta, formát je dd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
 msgstr "referencia zemepisnej dĺžky cieľa"
 
 #: libexif/exif-tag.c:174
-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 ""
-"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."
+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 "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."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
 msgstr "zemepisná dĺžka cieľa"
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
-msgstr ""
-"Ozna�uje zemepisnú dĺžku. Zemepisná dĺžka je vyjadrená tromi RACION�LNYMI "
-"hodnotami udanými v stupňoch, minútach a sekundách. Stupne, minúty a sekundy "
-"sú vyjadrené vo formáte ddd/1,mm/1,ss/1. Ke� sú použité stupne, minúty a "
-"napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,"
-"mmmm/100,0/1."
+msgid "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."
+msgstr "Ozna�uje zemepisnú dĺžku. Zemepisná dĺžka je vyjadrená tromi RACION�LNYMI hodnotami udanými v stupňoch, minútach a sekundách. Stupne, minúty a sekundy sú vyjadrené vo formáte ddd/1,mm/1,ss/1. Ke� sú použité stupne, minúty a napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
 msgstr "referencia azimutu cieľa"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"Referencia pre azimut k cieľovému bodu. „T“ zna�í skuto�ný smer a „M“ je "
-"magnetický smer."
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Referencia pre azimut k cieľovému bodu. „T“ zna�í skuto�ný smer a „M“ je magnetický smer."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
 msgstr "azimut cieľa"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
 msgstr "Zna�í azimut k cieľovému bodu. Rozsah hodnôt je od 0.00 do 359.99."
 
 #: libexif/exif-tag.c:193
@@ -2951,12 +2752,8 @@ msgid "Reference for Distance to Destination"
 msgstr "referencia vzdialenosti do cieľa"
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
-"Indikuje jednotku použitú na vyjadrenie vzdialenosti do cieľového bodu. „K“, "
-"„M“ a „N“ predstavujú kilometre, míle a námorné míle."
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr "Indikuje jednotku použitú na vyjadrenie vzdialenosti do cieľového bodu. „K“, „M“ a „N“ predstavujú kilometre, míle a námorné míle."
 
 #: libexif/exif-tag.c:197
 msgid "Distance to Destination"
@@ -2972,54 +2769,44 @@ msgid "Name of GPS Processing Method"
 msgstr "názov metódy spracovania GPS"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
-"Znakový reťazec zaznamenávajúci názov metódy použitej na lokalizáciu. Prvý "
-"bajt ozna�uje použitý znakový kód a po ňom nasleduje názov metódy. Pretože "
-"Typ nie je ASCII, nie je potrebné ukon�enie znakom NULL."
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Znakový reťazec zaznamenávajúci názov metódy použitej na lokalizáciu. Prvý bajt ozna�uje použitý znakový kód a po ňom nasleduje názov metódy. Pretože Typ nie je ASCII, nie je potrebné ukon�enie znakom NULL."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
 msgstr "Názov oblasti GPS"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
-"Znakový reťazec zaznamenávajúci názov použitej oblasti GPS. Prvý bajt "
-"ozna�uje použitý znakový kód a po ňom nasleduje názov oblasti GPS. Pretože "
-"Typ nie je ASCII, nie je potrebné ukon�enie znakom NULL."
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Znakový reťazec zaznamenávajúci názov použitej oblasti GPS. Prvý bajt ozna�uje použitý znakový kód a po ňom nasleduje názov oblasti GPS. Pretože Typ nie je ASCII, nie je potrebné ukon�enie znakom NULL."
 
 #: libexif/exif-tag.c:210
 msgid "GPS Date"
 msgstr "Dátum GPS"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
-"Znakový reťazec zaznamenávajúci dátum a �as vzhľadom na UTC (Coordinated "
-"Universal Time). Formát je „YYYY:MM:DD“. Pretože Typ nie je ASCII, nie je "
-"potrebné ukon�enie znakom NULL."
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "Znakový reťazec zaznamenávajúci dátum a �as vzhľadom na UTC (Coordinated Universal Time). Formát je „YYYY:MM:DD“. Pretože Typ nie je ASCII, nie je potrebné ukon�enie znakom NULL."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
 msgstr "Diferenciálna korekcia GPS"
 
 #: libexif/exif-tag.c:216
-msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+msgid "Indicates whether differential correction is applied to the GPS receiver."
 msgstr "Indikuje, �i sa na prijíma� GPS používa diferenciálna korekcia."
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "Nový typ podsúboru"
 
@@ -3033,12 +2820,8 @@ msgid "Image Width"
 msgstr "šírka obrázka"
 
 #: libexif/exif-tag.c:223
-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 ""
-"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."
+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 "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."
 
 # exif-imagelength
 #: libexif/exif-tag.c:227
@@ -3046,12 +2829,8 @@ msgid "Image Length"
 msgstr "dĺžka obrázka"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"Po�et riadkov obrazových údajov rovný po�tu pixelov na stĺpec. V JPEG "
-"komprimovaných dátach sa namiesto tejto zna�ky používa JPEG zna�ka."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Po�et riadkov obrazových údajov rovný po�tu pixelov na stĺpec. V JPEG komprimovaných dátach sa namiesto tejto zna�ky používa JPEG zna�ka."
 
 # exif-bitspersample
 #: libexif/exif-tag.c:231
@@ -3059,15 +2838,8 @@ msgid "Bits per Sample"
 msgstr "bitov na vzorku"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
-"Po�et bitov na obrazovú zložku. V tomto štandarde má každá zložka 8 bitov, "
-"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."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Po�et bitov na obrazovú zložku. V tomto štandarde má každá zložka 8 bitov, 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."
 
 # exif-compression
 #: libexif/exif-tag.c:237
@@ -3075,14 +2847,8 @@ msgid "Compression"
 msgstr "kompresia"
 
 #: libexif/exif-tag.c:238
-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."
+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."
 
 # exif-photometricinterpretation
 #: libexif/exif-tag.c:244
@@ -3090,12 +2856,8 @@ msgid "Photometric Interpretation"
 msgstr "fotometrická interpretácia"
 
 #: libexif/exif-tag.c:245
-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."
+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."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
@@ -3111,16 +2873,8 @@ msgid "Image Description"
 msgstr "popis obrázka"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
-"Znakový reťazec udávajúci nadpis obrázka. Môže to byť komentár ako \"rodinný "
-"piknik 1988\" alebo podobne. Dvojbajtové znakové sady nie je možné použiť. "
-"Ke� je potrebná dvojbajtová znaková sada, použite Privátnu zna�ku Exif "
-"<UserComment>."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "Znakový reťazec udávajúci nadpis obrázka. Môže to byť komentár ako \"rodinný piknik 1988\" alebo podobne. Dvojbajtové znakové sady nie je možné použiť. Ke� je potrebná dvojbajtová znaková sada, použite Privátnu zna�ku Exif <UserComment>."
 
 # exif-make
 #: libexif/exif-tag.c:260
@@ -3128,14 +2882,8 @@ msgid "Manufacturer"
 msgstr "výrobca"
 
 #: libexif/exif-tag.c:261
-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 ""
-"Výrobca záznamového zariadenia. Toto je výrobca digitálneho fotoaparátu, "
-"skenera, videodigitalizátora alebo iného zariadenia, ktoré vytvorilo "
-"obrázok. Ke� je pole prázdne, výrobca je neznámy."
+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 "Výrobca záznamového zariadenia. Toto je výrobca digitálneho fotoaparátu, skenera, videodigitalizátora alebo iného zariadenia, ktoré vytvorilo obrázok. Ke� je pole prázdne, výrobca je neznámy."
 
 # exif-model
 #: libexif/exif-tag.c:267
@@ -3143,14 +2891,8 @@ msgid "Model"
 msgstr "model"
 
 #: libexif/exif-tag.c:268
-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 ""
-"Názov alebo �íslo modelu zariadenia. Toto je model digitálneho fotoaparátu, "
-"skenera, videodigitalizátora alebo iného zariadenia, ktoré vytvorilo "
-"obrázok. Ke� je pole prázdne, model je neznámy."
+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 "Názov alebo �íslo modelu zariadenia. Toto je model digitálneho fotoaparátu, skenera, videodigitalizátora alebo iného zariadenia, ktoré vytvorilo obrázok. Ke� je pole prázdne, model je neznámy."
 
 # exif-stripoffsets
 #: libexif/exif-tag.c:273
@@ -3158,16 +2900,8 @@ msgid "Strip Offsets"
 msgstr "umiestnenie obrazových dát"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
-"Pre každý prúžok, ofset prúžka v bajtoch. Odporú�a sa ho zvoliť tak, aby "
-"po�et bajtov prúžka neprekro�il 60 kilobajtov. Pri JPEG komprimovaných "
-"dátach tento údaj nie je potrebný a vynechá sa. Pozri aj <StripOffsets> a "
-"<StripByteCounts>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "Pre každý prúžok, ofset prúžka v bajtoch. Odporú�a sa ho zvoliť tak, aby po�et bajtov prúžka neprekro�il 60 kilobajtov. Pri JPEG komprimovaných dátach tento údaj nie je potrebný a vynechá sa. Pozri aj <StripOffsets> a <StripByteCounts>."
 
 # exif-orientation
 #: libexif/exif-tag.c:280
@@ -3184,14 +2918,8 @@ msgid "Samples per Pixel"
 msgstr "vzoriek na pixel"
 
 #: libexif/exif-tag.c:285
-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 ""
-"Po�et zložiek na pixel. Ke�že tento štandard sa vzťahuje na RGB a YCbCr "
-"obrázky, hodnota tejto zna�ky je 3. V JPEG komprimovaných dátach sa namiesto "
-"tejto zna�ky používa JPEG zna�ka."
+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 "Po�et zložiek na pixel. Ke�že tento štandard sa vzťahuje na RGB a YCbCr obrázky, hodnota tejto zna�ky je 3. V JPEG komprimovaných dátach sa namiesto tejto zna�ky používa JPEG zna�ka."
 
 # exif-rowsperstrip
 #: libexif/exif-tag.c:290
@@ -3199,15 +2927,8 @@ msgid "Rows per Strip"
 msgstr "riadkov na prúžok"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
-"Po�et riadkov na prúžok. Toto je po�et obrazových riadkov v jednom prúžku, "
-"ke� sa obrázok delí na prúžky. Pri JPEG komprimovaných dátach tento údaj nie "
-"je potrebný a vynechá sa. Pozri aj <StripOffsets> a <StripByteCounts>."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Po�et riadkov na prúžok. Toto je po�et obrazových riadkov v jednom prúžku, ke� sa obrázok delí na prúžky. Pri JPEG komprimovaných dátach tento údaj nie je potrebný a vynechá sa. Pozri aj <StripOffsets> a <StripByteCounts>."
 
 # exif-stripbytecounts
 #: libexif/exif-tag.c:297
@@ -3215,12 +2936,8 @@ msgid "Strip Byte Count"
 msgstr "bajtov na komprimovaný prúžok"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
-"Celkový po�et bajtov na každý komprimovaný prúžok. Pre JPEG komprimované "
-"dáta tento údaj nie je potrebný a vynechá sa."
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Celkový po�et bajtov na každý komprimovaný prúžok. Pre JPEG komprimované dáta tento údaj nie je potrebný a vynechá sa."
 
 # exif-xresolution
 #: libexif/exif-tag.c:301
@@ -3228,12 +2945,8 @@ msgid "X-Resolution"
 msgstr "horizontálne rozlíšenie"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
-"Po�et pixelov na <ResolutionUnit> v smere <ImageWidth>. Ke� je rozlíšenie "
-"obrázka neznáme, použije sa 72 [dpi]."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Po�et pixelov na <ResolutionUnit> v smere <ImageWidth>. Ke� je rozlíšenie obrázka neznáme, použije sa 72 [dpi]."
 
 # exif-xresolution
 #: libexif/exif-tag.c:306
@@ -3241,12 +2954,8 @@ msgid "Y-Resolution"
 msgstr "horizontálne rozlíšenie"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"Po�et pixelov na <ResolutionUnit> v smere <ImageLength>. Použije sa rovnaká "
-"hodnota ako <XResolution>."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Po�et pixelov na <ResolutionUnit> v smere <ImageLength>. Použije sa rovnaká hodnota ako <XResolution>."
 
 # exif-planarconfiguration
 #: libexif/exif-tag.c:311
@@ -3254,15 +2963,8 @@ msgid "Planar Configuration"
 msgstr "rovinná konfigurácia"
 
 #: libexif/exif-tag.c:312
-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 ""
-"Ozna�uje, �i sa obrazové zložky zaznamenávajú v kúskovom alebo rovinnom "
-"formáte. V JPEG komprimovaných dátach sa namiesto tejto zna�ky používa JPEG "
-"zna�ka. Ak toto pole neexistuje, štandardná hodnota pre TIFF sa predpokladá "
-"1 (kúskový)."
+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 "Ozna�uje, �i sa obrazové zložky zaznamenávajú v kúskovom alebo rovinnom formáte. V JPEG komprimovaných dátach sa namiesto tejto zna�ky používa JPEG zna�ka. Ak toto pole neexistuje, štandardná hodnota pre TIFF sa predpokladá 1 (kúskový)."
 
 # exif-resolutionunit
 #: libexif/exif-tag.c:317
@@ -3270,14 +2972,8 @@ msgid "Resolution Unit"
 msgstr "jednotka rozlíšenia"
 
 #: libexif/exif-tag.c:318
-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 ""
-"Jednotka pre meranie <XResolution> and <YResolution>. Rovnaká jednotka sa "
-"používa pre <XResolution> aj <YResolution>. Ak je rozlíšenie obrázka "
-"neznáme, použije sa 2 (palce)."
+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 "Jednotka pre meranie <XResolution> and <YResolution>. Rovnaká jednotka sa používa pre <XResolution> aj <YResolution>. Ak je rozlíšenie obrázka neznáme, použije sa 2 (palce)."
 
 # exif-transferfunction
 #: libexif/exif-tag.c:323
@@ -3285,14 +2981,8 @@ msgid "Transfer Function"
 msgstr "prenosová funkcia"
 
 #: libexif/exif-tag.c:324
-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 ""
-"Prenosová funkcia obrázka, popísaná tabuľkou. Bežne táto zna�ka nie je "
-"potrebná, ke�že farebný priestor je uvedený v informa�nej zna�ke farebného "
-"priestoru (<ColorSpace>)."
+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 "Prenosová funkcia obrázka, popísaná tabuľkou. Bežne táto zna�ka nie je potrebná, ke�že farebný priestor je uvedený v informa�nej zna�ke farebného priestoru (<ColorSpace>)."
 
 # exif-software
 #: libexif/exif-tag.c:328
@@ -3300,16 +2990,8 @@ msgid "Software"
 msgstr "softvér"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
-"Táto zna�ka zaznamenáva názov a verziu softvéru alebo firmvéru fotoaparátu "
-"alebo zariadenia, ktoré bolo použité pri tvorbe obrázka. Podrobný formát nie "
-"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."
+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 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."
+msgstr "Táto zna�ka zaznamenáva názov a verziu softvéru alebo firmvéru fotoaparátu alebo zariadenia, ktoré bolo použité pri tvorbe obrázka. Podrobný formát nie 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."
 
 # exif-datetime
 #: libexif/exif-tag.c:336
@@ -3317,12 +2999,8 @@ msgid "Date and Time"
 msgstr "dátum a �as"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"Dátum a �as vytvorenia obrázka. V tomto štandarde (EXIF-2.1) je to dátum a "
-"�as zmeny súboru."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "Dátum a �as vytvorenia obrázka. V tomto štandarde (EXIF-2.1) je to dátum a �as zmeny súboru."
 
 # exif-artist
 #: libexif/exif-tag.c:340
@@ -3330,16 +3008,8 @@ msgid "Artist"
 msgstr "Autor"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
-"Táto zna�ka zaznamenáva vlastníka fotoaparátu, fotografa alebo tvorcu "
-"obrázka. Presný formát nie je špecifikovaný, ale odporú�a sa, aby kvôli "
-"interoperabilite bola informácia zapísaná ako v dolu uvedenom príklade. Ke� "
-"je pole prázdne, umelec je neznámy."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "Táto zna�ka zaznamenáva vlastníka fotoaparátu, fotografa alebo tvorcu obrázka. Presný formát nie je špecifikovaný, ale odporú�a sa, aby kvôli interoperabilite bola informácia zapísaná ako v dolu uvedenom príklade. Ke� je pole prázdne, umelec je neznámy."
 
 # exif-whitepoint
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
@@ -3347,14 +3017,8 @@ msgid "White Point"
 msgstr "biely bod"
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
-"Chromaticita bieleho bodu obrázka. Bežne nie je táto zna�ka potrebná, ke�že "
-"farebný priestor je uvedený v informa�nej zna�ke farebného priestoru "
-"(<ColorSpace>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Chromaticita bieleho bodu obrázka. Bežne nie je táto zna�ka potrebná, ke�že farebný priestor je uvedený v informa�nej zna�ke farebného priestoru (<ColorSpace>)."
 
 # exif-primarychromaticities
 #: libexif/exif-tag.c:353
@@ -3362,14 +3026,8 @@ msgid "Primary Chromaticities"
 msgstr "primárne chromaticity"
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
-msgstr ""
-"Chromaticity troch primárnych farieb obrázka. Bežne nie je táto zna�ka "
-"potrebná, ke�že farebný priestor je uvedený v informa�nej zna�ke farebného "
-"priestoru (<ColorSpace>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Chromaticity troch primárnych farieb obrázka. Bežne nie je táto zna�ka potrebná, ke�že farebný priestor je uvedený v informa�nej zna�ke farebného priestoru (<ColorSpace>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
@@ -3385,12 +3043,8 @@ msgid "JPEG Interchange Format"
 msgstr "formát JPEG"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
-"Pozícia za�iato�ného bajtu (SOI) komprimovaných JPEG dát náhľadu. Nepoužíva "
-"sa pre JPEG dáta primárneho obrázka."
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "Pozícia za�iato�ného bajtu (SOI) komprimovaných JPEG dát náhľadu. Nepoužíva sa pre JPEG dáta primárneho obrázka."
 
 # exif-jpeginterchangeformatlength
 #: libexif/exif-tag.c:372
@@ -3398,18 +3052,8 @@ msgid "JPEG Interchange Format Length"
 msgstr "dĺžka JPEG dát"
 
 #: libexif/exif-tag.c:373
-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 ""
-"Po�et bajtov komprimovaných JPEG dát náhľadu. Nepoužíva sa pre JPEG dáta "
-"primárneho obrázka. JPEG náhľady sa nerozdeľujú ale zaznamenávajú sa ako "
-"súvislý bitový tok JPEG od SOI po EOI. Zna�ky Appn a COM sa nezaznamenávajú. "
-"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."
+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 "Po�et bajtov komprimovaných JPEG dát náhľadu. Nepoužíva sa pre JPEG dáta primárneho obrázka. JPEG náhľady sa nerozdeľujú ale zaznamenávajú sa ako súvislý bitový tok JPEG od SOI po EOI. Zna�ky Appn a COM sa nezaznamenávajú. 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."
 
 # exif-ycbcrcoefficients
 #: libexif/exif-tag.c:382
@@ -3417,18 +3061,8 @@ msgid "YCbCr Coefficients"
 msgstr "koeficienty YCbCr"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
-"Matica koeficientov transformácie obrazových dát z RGB na YCbCr. V TIFF nie "
-"je definovaná štandardná hodnota; ale tu sa používa hodnota uvedená v "
-"„Pokyny ohľadne farebného priestoru“. Farebný priestor je deklarovaný "
-"informa�ným štítkom farebného priestoru, pri�om štandardnou hodnotou je tá, "
-"ktorá dáva optimálnu charakteristiku interoperability tohto stavu."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "Matica koeficientov transformácie obrazových dát z RGB na YCbCr. V TIFF nie je definovaná štandardná hodnota; ale tu sa používa hodnota uvedená v „Pokyny ohľadne farebného priestoru“. Farebný priestor je deklarovaný informa�ným štítkom farebného priestoru, pri�om štandardnou hodnotou je tá, ktorá dáva optimálnu charakteristiku interoperability tohto stavu."
 
 # exif-ycbcrsubsampling
 #: libexif/exif-tag.c:392
@@ -3436,12 +3070,8 @@ msgid "YCbCr Sub-Sampling"
 msgstr "podvzorkovanie YCbCr"
 
 #: libexif/exif-tag.c:393
-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 ""
-"Vzorkovací pomer zložiek chrominancie v pomere k svietivosti. V dátach "
-"komprimovaných JPEG sa namiesto tohto štítka používa zna�ka JPEG."
+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 "Vzorkovací pomer zložiek chrominancie v pomere k svietivosti. V dátach komprimovaných JPEG sa namiesto tohto štítka používa zna�ka JPEG."
 
 # exif-ycbcrpositioning
 #: libexif/exif-tag.c:398
@@ -3449,30 +3079,8 @@ msgid "YCbCr Positioning"
 msgstr "poloha YCbCr"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
-"Poloha zložiek chrominancie vzhľadom ku zložke svietivosti. Toto pole je "
-"ur�ené iba pre komprimované dáta JPEG alebo nekomprimované dáta YCbCr. "
-"Štandard TIFF je 1 (centrované), ale ke� Y:Cb:Cr = 4:2:2 odporú�a sa v tomto "
-"štandarde použiť pre záznam dát 2 (na rovnakom mieste), aby sa zlepšila "
-"kvalita obrazu pri zobrazovaní na televíznych systémoch. Ke� toto pole "
-"neexistuje, �ítacie zariadenie bude predpokladať štandard TIFF. V prípade, "
-"že Y:Cb:Cr = 4:2:0 sa odporú�a štandard TIFF (centrované). Ak �ítacie "
-"zariadenie nedokáže naraz podporovať oba druhy <YCbCrPositioning>, bude sa "
-"držať štandardu TIFF nezávisle od hodnoty v tomto poli. Uprednostňuje sa, "
-"aby �ítacie zariadenia podporovali obe polohy - centrované aj na rovnakom "
-"mieste."
+msgid "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."
+msgstr "Poloha zložiek chrominancie vzhľadom ku zložke svietivosti. Toto pole je ur�ené iba pre komprimované dáta JPEG alebo nekomprimované dáta YCbCr. Štandard TIFF je 1 (centrované), ale ke� Y:Cb:Cr = 4:2:2 odporú�a sa v tomto štandarde použiť pre záznam dát 2 (na rovnakom mieste), aby sa zlepšila kvalita obrazu pri zobrazovaní na televíznych systémoch. Ke� toto pole neexistuje, �ítacie zariadenie bude predpokladať štandard TIFF. V prípade, že Y:Cb:Cr = 4:2:0 sa odporú�a štandard TIFF (centrované). Ak �ítacie zariadenie nedokáže naraz podporovať oba druhy <YCbCrPositioning>, bude sa držať štandardu TIFF nezávisle od hodnoty v tomto poli. Uprednostňuje sa, aby �ítacie zariadenia podporovali obe polohy - centrované aj na rovnakom mieste."
 
 # exif-referenceblackwhite
 #: libexif/exif-tag.c:414
@@ -3480,18 +3088,8 @@ msgid "Reference Black/White"
 msgstr "referen�ná �ierna/biela"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
-"Referen�ná hodnota �ierneho bodu a referen�ná hodnota bieleho bodu. TIFF "
-"neudáva štandardné hodnoty, ale nižšie uvedené hodnoty sú tu dané ako "
-"štandardy. Farebný priestor sa deklaruje v informa�nom štítku farebného "
-"priestoru, pri�om štandardnou hodnotou je tá, ktorá dáva optimálnu "
-"charakteristiku interoperability tohto stavu."
+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 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."
+msgstr "Referen�ná hodnota �ierneho bodu a referen�ná hodnota bieleho bodu. TIFF neudáva štandardné hodnoty, ale nižšie uvedené hodnoty sú tu dané ako štandardy. Farebný priestor sa deklaruje v informa�nom štítku farebného priestoru, pri�om štandardnou hodnotou je tá, ktorá dáva optimálnu charakteristiku interoperability tohto stavu."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
@@ -3507,14 +3105,8 @@ msgid "CFA Pattern"
 msgstr "vzorka CFA"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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."
+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."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
@@ -3526,35 +3118,8 @@ msgid "Copyright"
 msgstr "autorské práva"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
-"Informácia o autorských právach. V tomto štandarde štítok ozna�uje aj práva "
-"fotografa aj redaktora. Je to informácia o autorských právach osoby �i "
-"organizácie, ktorá si nárokuje práva na obrázok. Do tohto poľa patrí "
-"vyhlásenie autorských práv vrátane dátumu; napr. \"Copyright, John Smith, "
-"20xx. Všetky práva vyhradené.\". V tomto štandarde pole obsahuje ako "
-"autorské práva fotografa, tak aj redaktora, pri�om každé je samostatnou "
-"�asťou záznamu. Ke� existuje jasný rozdiel medzi autorskými právami "
-"fotografa a redaktora, majú byť zapísané v poradí najskôr fotograf, potom "
-"redaktor, oddelené znakom NULL (v takom prípade, ke�že štítok tiež kon�í "
-"znakom NULL, obsahuje dva znaky NULL) (pozri príklad 1). Ke� sa udáva iba "
-"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."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Informácia o autorských právach. V tomto štandarde štítok ozna�uje aj práva fotografa aj redaktora. Je to informácia o autorských právach osoby �i organizácie, ktorá si nárokuje práva na obrázok. Do tohto poľa patrí vyhlásenie autorských práv vrátane dátumu; napr. \"Copyright, John Smith, 20xx. Všetky práva vyhradené.\". V tomto štandarde pole obsahuje ako autorské práva fotografa, tak aj redaktora, pri�om každé je samostatnou �asťou záznamu. Ke� existuje jasný rozdiel medzi autorskými právami fotografa a redaktora, majú byť zapísané v poradí najskôr fotograf, potom redaktor, oddelené znakom NULL (v takom prípade, ke�že štítok tiež kon�í znakom NULL, obsahuje dva znaky NULL) (pozri príklad 1). Ke� sa udáva iba 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."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
@@ -3574,14 +3139,8 @@ msgid "Image Resources Block"
 msgstr "blok obrazových prostriedkov"
 
 #: libexif/exif-tag.c:477
-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 ""
-"Ukazovateľ na Exif IFD. Interoperabilita, Exif IFD má rovnakú štruktúru ako "
-"š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."
+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 "Ukazovateľ na Exif IFD. Interoperabilita, Exif IFD má rovnakú štruktúru ako š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."
 
 # exif-exposuremode
 #: libexif/exif-tag.c:485
@@ -3589,12 +3148,8 @@ msgid "Exposure Program"
 msgstr "Program expozície"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"Trieda programu, ktorý fotoaparát používa na nastavenie expozície pri fotení "
-"obrázka."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "Trieda programu, ktorý fotoaparát používa na nastavenie expozície pri fotení obrázka."
 
 # exif-spectralsensitivity
 #: libexif/exif-tag.c:490
@@ -3602,26 +3157,16 @@ msgid "Spectral Sensitivity"
 msgstr "spektrálna citlivosť"
 
 #: libexif/exif-tag.c:491
-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 ""
-"Ozna�uje spektrálnu citlivosť každého z kanálov použitého fotoaparátu. "
-"Hodnota štítka je ASCII reťazec kompatibilný so štandardom vyvinutým "
-"Technickou komisiou ASTM."
+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 "Ozna�uje spektrálnu citlivosť každého z kanálov použitého fotoaparátu. Hodnota štítka je ASCII reťazec kompatibilný so štandardom vyvinutým Technickou komisiou ASTM."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
 msgstr "Ukazovateľ IFD GPS info"
 
 #: libexif/exif-tag.c:497
-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 ""
-"Ukazovateľ na GPS Info IFD. Štruktúra interoperability GPS Info IFD, rovnako "
-"ako pri Exif IFD, neobsahuje obrazové dáta."
+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 "Ukazovateľ na GPS Info IFD. Štruktúra interoperability GPS Info IFD, rovnako ako pri Exif IFD, neobsahuje obrazové dáta."
 
 # exif-isospeedratings
 #: libexif/exif-tag.c:503
@@ -3629,12 +3174,8 @@ msgid "ISO Speed Ratings"
 msgstr "rýchlostné ohodnotenie ISO"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
-"Ozna�uje ISO rýchlosť a ISO zemepisnú šírku fotoaparátu alebo vstupného "
-"zariadenia podľa špecifikácie ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Ozna�uje ISO rýchlosť a ISO zemepisnú šírku fotoaparátu alebo vstupného zariadenia podľa špecifikácie ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
@@ -3642,14 +3183,8 @@ msgstr "Optoelektronická konverzná funkcia"
 
 # exif-oecf
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-msgstr ""
-"Ozna�uje optoelektronickú konverznú funkciu (OECF) podľa špecifikácie ISO "
-"14524. <OECF> je vzťah medzi optickým vstupom fotoaparátu a hodnotami "
-"obrázka."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+msgstr "Ozna�uje optoelektronickú konverznú funkciu (OECF) podľa špecifikácie ISO 14524. <OECF> je vzťah medzi optickým vstupom fotoaparátu a hodnotami obrázka."
 
 #: libexif/exif-tag.c:513
 msgid "Time Zone Offset"
@@ -3665,12 +3200,8 @@ msgid "Exif Version"
 msgstr "verzia exif štítka"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
-"Podporovaná verzia tohto štandardu. Neexistencia tohto poľa znamená "
-"nekonformnosť so štandardom."
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "Podporovaná verzia tohto štandardu. Neexistencia tohto poľa znamená nekonformnosť so štandardom."
 
 # exif-datetimeoriginal
 #: libexif/exif-tag.c:520
@@ -3678,12 +3209,8 @@ msgid "Date and Time (Original)"
 msgstr "dátum a �as (originálu)"
 
 #: libexif/exif-tag.c:521
-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 ""
-"Dátum a �as, kedy boli vytvorené pôvodné obrazové dáta. Pre digitálny "
-"fotoaparát je to dátum a �as zachytenia a zaznamenania obrázka."
+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 "Dátum a �as, kedy boli vytvorené pôvodné obrazové dáta. Pre digitálny fotoaparát je to dátum a �as zachytenia a zaznamenania obrázka."
 
 # exif-datetimedigitized
 #: libexif/exif-tag.c:526
@@ -3700,20 +3227,8 @@ msgid "Components Configuration"
 msgstr "Konfigurácia komponentov"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
-"Informácia špecifická pre kompresné dáta. Kanály každej zložky sú zoradené v "
-"poradí d 1. po 4. zložku. Pre nekomprimované dáta je poradie dát dané "
-"štítkom <PhotometricInterpretation>. Avšak ke�že <PhotometricInterpretation> "
-"dokáže vyjadriť iba poradie Y, Cb a Cr, tento štítok je použiteľný v "
-"prípadoch, kedy komprimované dáta používajú iné komponenty ako Y, Cb, a Cr a "
-"na to, aby sa umožnila podpora iných poradí."
+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 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."
+msgstr "Informácia špecifická pre kompresné dáta. Kanály každej zložky sú zoradené v poradí d 1. po 4. zložku. Pre nekomprimované dáta je poradie dát dané štítkom <PhotometricInterpretation>. Avšak ke�že <PhotometricInterpretation> dokáže vyjadriť iba poradie Y, Cb a Cr, tento štítok je použiteľný v prípadoch, kedy komprimované dáta používajú iné komponenty ako Y, Cb, a Cr a na to, aby sa umožnila podpora iných poradí."
 
 # exif-compressedbitsperpixel
 #: libexif/exif-tag.c:541
@@ -3721,12 +3236,8 @@ msgid "Compressed Bits per Pixel"
 msgstr "komprimované bity na pixel"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
-"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."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "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."
 
 # exif-shutterspeedvalue
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
@@ -3734,12 +3245,8 @@ msgid "Shutter Speed"
 msgstr "Rýchlosť uzávierky"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
-"Rýchlosť uzávierky. Jednotka je nastavenie APEX (Aditívny systém "
-"fotografickej expozície)."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Rýchlosť uzávierky. Jednotka je nastavenie APEX (Aditívny systém fotografickej expozície)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
@@ -3751,12 +3258,8 @@ msgid "Brightness"
 msgstr "jas"
 
 #: libexif/exif-tag.c:554
-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 ""
-"Hodnota jasu. Jednotka je hodnota APEX. Bežne sa udáva v rozsahu -99.99 až "
-"99.99."
+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 "Hodnota jasu. Jednotka je hodnota APEX. Bežne sa udáva v rozsahu -99.99 až 99.99."
 
 # exif-exposurebiasvalue
 #: libexif/exif-tag.c:558
@@ -3764,12 +3267,8 @@ msgid "Exposure Bias"
 msgstr "expozi�né skreslenie"
 
 #: libexif/exif-tag.c:559
-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."
+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."
 
 # FUZZY exif-aperturevalue
 #: libexif/exif-tag.c:562
@@ -3777,12 +3276,8 @@ msgid "Maximum Aperture Value"
 msgstr "maximálna hodnota clony"
 
 #: libexif/exif-tag.c:563
-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 ""
-"Najmenšie �íslo F šošoviek. Jednotka je hodnota APEX. Bežne sa udáva v "
-"rozsahu -99.99 až 99.99."
+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 "Najmenšie �íslo F šošoviek. Jednotka je hodnota APEX. Bežne sa udáva v rozsahu -99.99 až 99.99."
 
 # exif-subjectdistance
 #: libexif/exif-tag.c:568
@@ -3807,19 +3302,12 @@ msgid "The kind of light source."
 msgstr "Druh svetelného zdroja."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
-msgstr ""
-"Tento štítok sa zaznamenáva, ke� je obrázok odfotený pri impulznom svetle "
-"(blesk)."
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
+msgstr "Tento štítok sa zaznamenáva, ke� je obrázok odfotený pri impulznom svetle (blesk)."
 
 #: libexif/exif-tag.c:582
-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 ""
-"Skuto�ná ohnisková vzdialenosť šošoviek v mm. Nerobí sa konverzia na "
-"ohniskovú vzdialenosť fotoaprátu s 35 mm filmom."
+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 "Skuto�ná ohnisková vzdialenosť šošoviek v mm. Nerobí sa konverzia na ohniskovú vzdialenosť fotoaprátu s 35 mm filmom."
 
 # exif-subjectarea
 #: libexif/exif-tag.c:585
@@ -3827,11 +3315,8 @@ msgid "Subject Area"
 msgstr "oblasť subjektu"
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
-msgstr ""
-"Tento štítok ozna�uje polohu a plochu hlavného subjektu v celkovej scéne."
+msgid "This tag indicates the location and area of the main subject in the overall scene."
+msgstr "Tento štítok ozna�uje polohu a plochu hlavného subjektu v celkovej scéne."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
@@ -3843,12 +3328,8 @@ msgid "Maker Note"
 msgstr "poznámka výrobcu"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Štítok pre výrobcov zariadení zapisujúcich exif informácie pre uloženie "
-"akejkoľvek potrebnej informácie. Obsah je na výrobcovi."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Štítok pre výrobcov zariadení zapisujúcich exif informácie pre uloženie akejkoľvek potrebnej informácie. Obsah je na výrobcovi."
 
 # exif-usercomment
 #: libexif/exif-tag.c:595
@@ -3856,43 +3337,8 @@ msgid "User Comment"
 msgstr "komentár používateľa"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
-"Štítok, kde používatelia exif môžu zapísať kľú�ové slová alebo komentár k "
-"obrázku naviac k <ImageDescription> a bez obmedzení znakovej sady ako pri "
-"štítku <ImageDescription>. Znakový kód použitý v štítku <UserComment> je "
-"identifikovaný na základe ID kódu v pevnej 8-bajtovej oblasti na za�iatku "
-"štítku. Nevyužitá �asť oblasti sa doplní znakmi NULL (\"00.h\"). ID kódy sú "
-"pridelené na základe registrácie. Spôsoby ur�enia a referencií každého "
-"znakového kódu sú udané v Tabuľke 6. Hodnota CountN sa ur�í na základe 8 "
-"bajtov v oblasti znakového kódu a po�tu bajtov v �asti používateľského "
-"komentára. Ke�že TYPE nie je ASCII, nie je potrebné ukon�enie pomocou NULL "
-"(pozri Obr. 9). ID kód oblasti <UserComment> môže byť Definovaný kód ako JIS "
-"alebo ASCII alebo môže byť Nedefinovaný. Nedefinovaný názov je UndefinedText "
-"a ID kód sa vyplní 8 bajtami znaku \"NULL\" (\"00.H\"). Čítacie zariadenie "
-"exif, ktoré �íta štítok <UserComment> musí mať funkciu na ur�enie ID kódu. "
-"Táto funkcia sa nevyžaduje v �ítacích zariadeniach exif, ktoré nevyužívajú "
-"štítok <UserComment>. Ke� sa vyhradí oblasť <UserComment>, odporú�a sa, aby "
-"ID kód bol ASCII a nasledovná �asť používateľského komentára bola vyplnená "
-"prázdnymi znakmi [20.H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "Štítok, kde používatelia exif môžu zapísať kľú�ové slová alebo komentár k obrázku naviac k <ImageDescription> a bez obmedzení znakovej sady ako pri štítku <ImageDescription>. Znakový kód použitý v štítku <UserComment> je identifikovaný na základe ID kódu v pevnej 8-bajtovej oblasti na za�iatku štítku. Nevyužitá �asť oblasti sa doplní znakmi NULL (\"00.h\"). ID kódy sú pridelené na základe registrácie. Spôsoby ur�enia a referencií každého znakového kódu sú udané v Tabuľke 6. Hodnota CountN sa ur�í na základe 8 bajtov v oblasti znakového kódu a po�tu bajtov v �asti používateľského komentára. Ke�že TYPE nie je ASCII, nie je potrebné ukon�enie pomocou NULL (pozri Obr. 9). ID kód oblasti <UserComment> môže byť Definovaný kód ako JIS alebo ASCII alebo môže byť Nedefinovaný. Nedefinovaný názov je UndefinedText a ID kód sa vyplní 8 bajtami znaku \"NULL\" (\"00.H\"). Čítacie zariadenie exif, ktoré �íta štítok <UserComment> musí mať funkciu na ur�enie ID kódu. Táto funkcia sa nevyžaduje v �ítacích zariadeniach exif, ktoré nevyužívajú štítok <UserComment>. Ke� sa vyhradí oblasť <UserComment>, odporú�a sa, aby ID kód bol ASCII a nasledovná �asť používateľského komentára bola vyplnená prázdnymi znakmi [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
@@ -3908,10 +3354,8 @@ msgid "Sub-second Time (Original)"
 msgstr "dátum a �as (originálu)"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
-msgstr ""
-"Štítok, ktorý sa používa na záznam zlomkov sekundy štítka <DateTimeOriginal>."
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr "Štítok, ktorý sa používa na záznam zlomkov sekundy štítka <DateTimeOriginal>."
 
 # exif-datetimedigitized
 #: libexif/exif-tag.c:629
@@ -3919,11 +3363,8 @@ msgid "Sub-second Time (Digitized)"
 msgstr "dátum a �as (digitalizácie)"
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
-msgstr ""
-"Štítok, ktorý sa používa na záznam zlomkov sekundy štítka "
-"<DateTimeDigitized>."
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr "Štítok, ktorý sa používa na záznam zlomkov sekundy štítka <DateTimeDigitized>."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
@@ -3938,8 +3379,7 @@ msgid "XP Comment"
 msgstr "XP komentár"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr "Znakový reťazec obsahujúci komentár k obrázku v kódovaní UTF-16LE."
 
 #: libexif/exif-tag.c:644
@@ -3947,9 +3387,7 @@ msgid "XP Author"
 msgstr "XP autor"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
 msgstr "Znakový reťazec obsahujúci meno tvorcu obrázka v kódovaní UTF-16LE."
 
 #: libexif/exif-tag.c:649
@@ -3957,12 +3395,8 @@ msgid "XP Keywords"
 msgstr "XP kľú�ové slová"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
-"Znakový reťazec obsahujúci kľú�ové slová popisujúce obrázok v kódovaní "
-"UTF-16LE."
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "Znakový reťazec obsahujúci kľú�ové slová popisujúce obrázok v kódovaní UTF-16LE."
 
 #: libexif/exif-tag.c:654
 msgid "XP Subject"
@@ -3982,125 +3416,40 @@ msgid "Color Space"
 msgstr "farebný priestor"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
-"Štítok informácie o farebnom priestore je vždy zaznamenaný ako špecifikátor "
-"farebného priestoru. Normálne sa na definíciu farebného priestoru používa "
-"sRGB (=1) na základe podmienok a prostredia PC monitora. Ak je použitý iný "
-"farebný priestor ako sRGB, nastaví sa Nekalibrovaný (=FFFF.H). S obrazovými "
-"údajmi zaznamenanými ako Nekalibrované je možné pracovať ako s sRGB ke� sa "
-"skonvertujú na FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "Štítok informácie o farebnom priestore je vždy zaznamenaný ako špecifikátor farebného priestoru. Normálne sa na definíciu farebného priestoru používa sRGB (=1) na základe podmienok a prostredia PC monitora. Ak je použitý iný farebný priestor ako sRGB, nastaví sa Nekalibrovaný (=FFFF.H). S obrazovými údajmi zaznamenanými ako Nekalibrované je možné pracovať ako s sRGB ke� sa skonvertujú na FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
 msgstr "vodorovný rozmer pixla"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
-"Informácia špecifická komprimovaným dátam. Ke� sa zaznamená komprimovaný "
-"súbor, platná šírka zmysluplného obrázka sa musí zaznamenať do tohto štítka, "
-"�i je alebo nie je prítomná výplň alebo zna�ka reštart. Tento štítok by "
-"nemal existovať v nekomprimovanom súbore."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Informácia špecifická komprimovaným dátam. Ke� sa zaznamená komprimovaný súbor, platná šírka zmysluplného obrázka sa musí zaznamenať do tohto štítka, �i je alebo nie je prítomná výplň alebo zna�ka reštart. Tento štítok by nemal existovať v nekomprimovanom súbore."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
 msgstr "zvislý rozmer pixla"
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
-"Informácia špecifická komprimovaným dátam. Ke� sa zaznamená komprimovaný "
-"súbor, platná výška zmysluplného obrázka sa musí zaznamenať do tohto štítka, "
-"�i je alebo nie je prítomná výplň alebo zna�ka reštart. Tento štítok by "
-"nemal existovať v nekomprimovanom súbore. Pretože doplňovanie dát nie je "
-"potrebné v zvislom smere, po�et riadkov zaznamenaných v tomto platnom štítku "
-"výšky obrázka bude v skuto�nosti rovnaký ako ten, ktorý je zaznamenaný v SOF."
+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, 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."
+msgstr "Informácia špecifická komprimovaným dátam. Ke� sa zaznamená komprimovaný súbor, platná výška zmysluplného obrázka sa musí zaznamenať do tohto štítka, �i je alebo nie je prítomná výplň alebo zna�ka reštart. Tento štítok by nemal existovať v nekomprimovanom súbore. Pretože doplňovanie dát nie je potrebné v zvislom smere, po�et riadkov zaznamenaných v tomto platnom štítku výšky obrázka bude v skuto�nosti rovnaký ako ten, ktorý je zaznamenaný v SOF."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
 msgstr "súvisiaci zvukový súbor"
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
-"Tento štítok sa používa na zaznamenanie zvukového súboru, ktorý sa vzťahuje "
-"na obrazové dáta. Jediná rela�ná informácia, ktorá sa tu zaznamenáva je "
-"názov zvukového súboru a jeho rozšírenie (ASCII reťazec pozostávajúci z 8 "
-"znakov + „.“ + 3 znaky). Cesta sa nezaznamenáva. Podmienky vzťahujúce sa na "
-"zvukový záznam sú uvedené v špecifikácii. Pri použití tohto štítka musia byť "
-"zvukové súbory zaznamenané v súlade s formátom zvuku Exif. Zapisovacie "
-"zariadenia tiež môžu ukladať dáta ako zvuk v rámci APP2 ako dáta "
-"rozširujúceho FlashPix toku. Zvukové súbory musia byť zaznamenané v súlade s "
-"Exif zvukovým formátom. Mapovanie Exif obrazových súborov a zvukových "
-"súborov sa robí akýmkoľvek z troch spôsobov, [1], [2] and [3]. Ak sa mapuje "
-"viacero súborov na jeden súbor ako v prípadoch [2] �i [3] tejto tabuľky, "
-"vyššie uvedený formát sa používa na záznam iba jedného názvu zvukového "
-"súboru. Ak je viacero zvukových súborov, udáva sa prvý zaznamenaný. V "
-"prípade [3], napr. pre Exif obrazový súbor \"DSC00001.JPG\" sa udáva ako "
-"zvukový súbor iba \"SND00001.WAV\". Ke� existujú tri Exif zvukové súbory "
-"\"SND00001.WAV\", \"SND00002.WAV\" a \"SND00003.WAV\", ozna�uje názov Exif "
-"obrazového súboru pre každý z nich, \"DSC00001.JPG\". Kombináciou viacerých "
-"rela�ných informácií je možná podpora rôznych prehrávacích schopností. "
-"Metóda využitia rela�nej informácie sa ponecháva na implementáciu na strane "
-"prehráva�a. Ke�že táto informácia je znakový reťazec ASCII, je ukon�ená "
-"znakom NULL. Ke� sa tento štítok použije na mapovanie zvukových súborov, "
-"vzťah zvukového súboru na obrazové dáta sa tiež musí ozna�iť na konci "
-"zvukového súboru."
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Tento štítok sa používa na zaznamenanie zvukového súboru, ktorý sa vzťahuje na obrazové dáta. Jediná rela�ná informácia, ktorá sa tu zaznamenáva je názov zvukového súboru a jeho rozšírenie (ASCII reťazec pozostávajúci z 8 znakov + „.“ + 3 znaky). Cesta sa nezaznamenáva. Podmienky vzťahujúce sa na zvukový záznam sú uvedené v špecifikácii. Pri použití tohto štítka musia byť zvukové súbory zaznamenané v súlade s formátom zvuku Exif. Zapisovacie zariadenia tiež môžu ukladať dáta ako zvuk v rámci APP2 ako dáta rozširujúceho FlashPix toku. Zvukové súbory musia byť zaznamenané v súlade s Exif zvukovým formátom. Mapovanie Exif obrazových súborov a zvukových súborov sa robí akýmkoľvek z troch spôsobov, [1], [2] and [3]. Ak sa mapuje viacero súborov na jeden súbor ako v prípadoch [2] �i [3] tejto tabuľky, vyššie uvedený formát sa používa na záznam iba jedného názvu zvukového súboru. Ak je viacero zvukových súborov, udáva sa prvý zaznamenaný. V prípade [3], napr. pre Exif obrazový súbor \"DSC00001.JPG\" sa udáva ako zvukový súbor iba \"SND00001.WAV\". Ke� existujú tri Exif zvukové súbory \"SND00001.WAV\", \"SND00002.WAV\" a \"SND00003.WAV\", ozna�uje názov Exif obrazového súboru pre každý z nich, \"DSC00001.JPG\". Kombináciou viacerých rela�ných informácií je možná podpora rôznych prehrávacích schopností. Metóda využitia rela�nej informácie sa ponecháva na implementáciu na strane prehráva�a. Ke�že táto informácia je znakový reťazec ASCII, je ukon�ená znakom NULL. Ke� sa tento štítok použije na mapovanie zvukových súborov, vzťah zvukového súboru na obrazové dáta sa tiež musí ozna�iť na konci zvukového súboru."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
 msgstr "Ukazovateľ interoperability IFD"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
-"IFD interoperability sa skladá zo štítkov ukladajúcich informácie na "
-"zaistenie interoperability a ukazuje naň nasledujúci štítok nachádzajúci sa "
-"v Exif IFD. Štruktúra IFD interoperability je rovnaká ako IFD štruktúra "
-"definovaná v TIFF, ale neobsahuje obrazové údaje charakteristicky porovnané "
-"s normálnym TIFF IFD."
+msgid "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."
+msgstr "IFD interoperability sa skladá zo štítkov ukladajúcich informácie na zaistenie interoperability a ukazuje naň nasledujúci štítok nachádzajúci sa v Exif IFD. Štruktúra IFD interoperability je rovnaká ako IFD štruktúra definovaná v TIFF, ale neobsahuje obrazové údaje charakteristicky porovnané s normálnym TIFF IFD."
 
 # exif-flashenergy
 #: libexif/exif-tag.c:729
@@ -4108,12 +3457,8 @@ msgid "Flash Energy"
 msgstr "energia blesku"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
-"Ozna�uje energiu elektronického dosvietenia v �ase zachytenia obrázka meranú "
-"v Beam Candle Power Seconds (BCPS)."
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Ozna�uje energiu elektronického dosvietenia v �ase zachytenia obrázka meranú v Beam Candle Power Seconds (BCPS)."
 
 # exif-spatialfrequencyresponse
 #: libexif/exif-tag.c:734
@@ -4121,14 +3466,8 @@ msgid "Spatial Frequency Response"
 msgstr "priestorová frekven�ná odozva"
 
 #: libexif/exif-tag.c:735
-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 ""
-"Tento štítok zaznamenáva tabuľku priestorovej frekven�nej odozvy zariadenia "
-"a hodnoty PFO v smere šírky obrázka a v diagonálnom smere podľa špecifikácie "
-"ISO 12233."
+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 "Tento štítok zaznamenáva tabuľku priestorovej frekven�nej odozvy zariadenia a hodnoty PFO v smere šírky obrázka a v diagonálnom smere podľa špecifikácie ISO 12233."
 
 # exif-focalplanexresolution
 #: libexif/exif-tag.c:741
@@ -4136,12 +3475,8 @@ msgid "Focal Plane X-Resolution"
 msgstr "horizontálne rozlíšenie ohniskovej roviny"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Tento štítok ozna�uje po�et pixelov šírky obrázka (X) na "
-"<FocalPlaneResolutionUnit> v ohniskovej rovine fotoaparátu."
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Tento štítok ozna�uje po�et pixelov šírky obrázka (X) na <FocalPlaneResolutionUnit> v ohniskovej rovine fotoaparátu."
 
 # exif-focalplanexresolution
 #: libexif/exif-tag.c:746
@@ -4149,12 +3484,8 @@ msgid "Focal Plane Y-Resolution"
 msgstr "horizontálne rozlíšenie ohniskovej roviny"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Tento štítok ozna�uje po�et pixelov výšky obrázka (Y) na "
-"<FocalPlaneResolutionUnit> v ohniskovej rovine fotoaparátu."
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Tento štítok ozna�uje po�et pixelov výšky obrázka (Y) na <FocalPlaneResolutionUnit> v ohniskovej rovine fotoaparátu."
 
 # exif-focalplaneresolutionunit
 #: libexif/exif-tag.c:751
@@ -4162,12 +3493,8 @@ msgid "Focal Plane Resolution Unit"
 msgstr "jednotka rozlíšenia v ohniskovej rovine"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
-"Tento štítok ozna�uje jednotky, v ktorých je merané <FocalPlaneXResolution> "
-"a <FocalPlaneYResolution>. Táto hodnota je rovnaká ako <ResolutionUnit>."
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Tento štítok ozna�uje jednotky, v ktorých je merané <FocalPlaneXResolution> a <FocalPlaneYResolution>. Táto hodnota je rovnaká ako <ResolutionUnit>."
 
 # exif-subjectlocation
 #: libexif/exif-tag.c:757
@@ -4175,17 +3502,8 @@ msgid "Subject Location"
 msgstr "umiestnenie subjektu"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
-"Tento štítok ozna�uje umiestnenie hlavného subjektu na scéne. Hodnota tohto "
-"štítku predstavuje pixel v strede hlavného subjektu vzhľadom na ľavý okraj, "
-"pred procesom rotácie podľa štítka <Rotation>. Prvá hodnota ozna�uje �íslo X "
-"stĺpca a druhá ozna�uje �íslo Y riadku."
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Tento štítok ozna�uje umiestnenie hlavného subjektu na scéne. Hodnota tohto štítku predstavuje pixel v strede hlavného subjektu vzhľadom na ľavý okraj, pred procesom rotácie podľa štítka <Rotation>. Prvá hodnota ozna�uje �íslo X stĺpca a druhá ozna�uje �íslo Y riadku."
 
 # exif-exposureindex
 #: libexif/exif-tag.c:765
@@ -4193,12 +3511,8 @@ msgid "Exposure Index"
 msgstr "Expozi�ný index"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
-msgstr ""
-"Tento štítok ozna�uje expozi�ný index zvolený na fotoaparáte alebo vstupnom "
-"zariadení v �ase zachytenia obrázka."
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Tento štítok ozna�uje expozi�ný index zvolený na fotoaparáte alebo vstupnom zariadení v �ase zachytenia obrázka."
 
 # exif-sensingmethod
 #: libexif/exif-tag.c:769
@@ -4207,9 +3521,7 @@ msgstr "snímacia metóda"
 
 #: libexif/exif-tag.c:770
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr ""
-"Tento štítok ozna�uje typ obrazového sníma�a vstupného fotoaparátu alebo "
-"vstupného zariadenia."
+msgstr "Tento štítok ozna�uje typ obrazového sníma�a vstupného fotoaparátu alebo vstupného zariadenia."
 
 # exif-filesource
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
@@ -4217,12 +3529,8 @@ msgid "File Source"
 msgstr "zdroj súboru"
 
 #: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"Tento štítok ozna�uje zdroj obrázka. Ak obrázok zaznamenal DSC, tento štítok "
-"musí byť vždy nastavený na 3, �o zna�í, že obrázok bol nahraný na DSC."
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Tento štítok ozna�uje zdroj obrázka. Ak obrázok zaznamenal DSC, tento štítok musí byť vždy nastavený na 3, �o zna�í, že obrázok bol nahraný na DSC."
 
 # exif-scenetype
 #: libexif/exif-tag.c:778
@@ -4230,13 +3538,8 @@ msgid "Scene Type"
 msgstr "typ scény"
 
 #: libexif/exif-tag.c:779
-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 ""
-"Tento štítok ozna�uje typ scény. Ak obrázok zaznamenal DSC, tento štítok "
-"musí byť vždy nastavený na 1, �o zna�í, že obrázok bol priamo "
-"odfotografovaný."
+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 "Tento štítok ozna�uje typ scény. Ak obrázok zaznamenal DSC, tento štítok musí byť vždy nastavený na 1, �o zna�í, že obrázok bol priamo odfotografovaný."
 
 # exif-customrendered
 #: libexif/exif-tag.c:789
@@ -4244,31 +3547,16 @@ msgid "Custom Rendered"
 msgstr "ru�né spracovanie obrazu"
 
 #: libexif/exif-tag.c:790
-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 ""
-"Tento štítok ozna�uje použitie špeciálneho spracovania obrazových dát ako "
-"spracovanie zamerané na výstup. Po vykonaní špeciálneho spracovania sa od "
-"�ítacieho zariadenia o�akáva, že vypne alebo minimalizuje akékoľvek �alšie "
-"spracovanie."
+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 "Tento štítok ozna�uje použitie špeciálneho spracovania obrazových dát ako spracovanie zamerané na výstup. Po vykonaní špeciálneho spracovania sa od �ítacieho zariadenia o�akáva, že vypne alebo minimalizuje akékoľvek �alšie spracovanie."
 
 #: libexif/exif-tag.c:796
-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 ""
-"Tento štítok ozna�uje aký expozi�ný režim bol zvolený pri odfotení obrázka. "
-"V režime automatickej kompenzácie expozície fotoaparát nafotí sériu snímok "
-"rovnakej scény pri rozli�ných nastaveniach expozície."
+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 "Tento štítok ozna�uje aký expozi�ný režim bol zvolený pri odfotení obrázka. V režime automatickej kompenzácie expozície fotoaparát nafotí sériu snímok rovnakej scény pri rozli�ných nastaveniach expozície."
 
 #: libexif/exif-tag.c:801
 msgid "This tag indicates the white balance mode set when the image was shot."
-msgstr ""
-"Tento štítok ozna�uje aký režim vyváženia bielej bol zvolený pri odfotení "
-"obrázka."
+msgstr "Tento štítok ozna�uje aký režim vyváženia bielej bol zvolený pri odfotení obrázka."
 
 # exif-digitalzoomratio
 #: libexif/exif-tag.c:805
@@ -4276,13 +3564,8 @@ msgid "Digital Zoom Ratio"
 msgstr "pomer digitálneho priblíženia"
 
 #: libexif/exif-tag.c:806
-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 ""
-"Tento štítok ozna�uje pomer digitálneho priblíženia v �ase zachytenia "
-"snímky. Ak je zaznamenaná hodnota 0, nebolo použité digitálne priblíženie."
+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 "Tento štítok ozna�uje pomer digitálneho priblíženia v �ase zachytenia snímky. Ak je zaznamenaná hodnota 0, nebolo použité digitálne priblíženie."
 
 # exif-focallengthin35mmfilm
 #: libexif/exif-tag.c:811
@@ -4290,14 +3573,8 @@ msgid "Focal Length in 35mm Film"
 msgstr "ohnisková vzdialenosť na 35 mm filme"
 
 #: libexif/exif-tag.c:812
-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 ""
-"Tento štítok ozna�uje ohniskovú vzdialenosť ekvivalentnú fotoaparátu s 35 mm "
-"filmom. Hodnota 0 znamená, že ohnisková vzdialenosť je neznáma. Všimnite si, "
-"že tento štítok sa líši od štítka FocalLength."
+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 "Tento štítok ozna�uje ohniskovú vzdialenosť ekvivalentnú fotoaparátu s 35 mm filmom. Hodnota 0 znamená, že ohnisková vzdialenosť je neznáma. Všimnite si, že tento štítok sa líši od štítka FocalLength."
 
 # exif-scenecapturetype
 #: libexif/exif-tag.c:818
@@ -4305,14 +3582,8 @@ msgid "Scene Capture Type"
 msgstr "typ zachytenia scény"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
-"Tento štítok ozna�uje typ zachytenej scény. Tiež je možné ho použiť na "
-"zaznamenanie režimu, v ktorom bol obrázok odfotený. Všimnite si, že tento "
-"štítok sa líši od štítka <SceneType>."
+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 scene type <SceneType> tag."
+msgstr "Tento štítok ozna�uje typ zachytenej scény. Tiež je možné ho použiť na zaznamenanie režimu, v ktorom bol obrázok odfotený. Všimnite si, že tento štítok sa líši od štítka <SceneType>."
 
 # exif-gaincontrol
 #: libexif/exif-tag.c:824
@@ -4324,28 +3595,16 @@ msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "Tento štítok ozna�uje stupeň celkového zosilnenia obrazu."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Tento štítok ozna�uje smer spracovania kontrastu, ktorý použil fotoaparát "
-"pri zachytení obrázka."
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Tento štítok ozna�uje smer spracovania kontrastu, ktorý použil fotoaparát pri zachytení obrázka."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Tento štítok ozna�uje smer spracovania sýtosti, ktorý použil fotoaparát pri "
-"zachytení obrázka."
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Tento štítok ozna�uje smer spracovania sýtosti, ktorý použil fotoaparát pri zachytení obrázka."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Tento štítok ozna�uje smer spracovania ostrosti, ktorý použil fotoaparát pri "
-"zachytení obrázka."
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Tento štítok ozna�uje smer spracovania ostrosti, ktorý použil fotoaparát pri zachytení obrázka."
 
 # exif-devicesettingdescription
 #: libexif/exif-tag.c:841
@@ -4353,14 +3612,8 @@ msgid "Device Setting Description"
 msgstr "opis nastavení zariadenia"
 
 #: libexif/exif-tag.c:842
-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 ""
-"Tento štítok ozna�uje informácie o podmienkach fotografovania konkrétnym "
-"modelom fotoaparátu. Štítok sa používa iba na ozna�enie podmienok "
-"fotografovania v �ítacom zariadení."
+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 "Tento štítok ozna�uje informácie o podmienkach fotografovania konkrétnym modelom fotoaparátu. Štítok sa používa iba na ozna�enie podmienok fotografovania v �ítacom zariadení."
 
 # exif-subjectdistancerange
 #: libexif/exif-tag.c:848
@@ -4377,14 +3630,8 @@ msgid "Image Unique ID"
 msgstr "jedine�ný ID obrázka"
 
 #: libexif/exif-tag.c:852
-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 ""
-"Tento štítok ozna�uje jedine�ný identifikátor priradený každému obrázku. Je "
-"zaznamenaný ako ASCII reťazec zodpovedajúci hexadecimálnemu zápisu 128-"
-"bitového �ísla."
+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 "Tento štítok ozna�uje jedine�ný identifikátor priradený každému obrázku. Je zaznamenaný ako ASCII reťazec zodpovedajúci hexadecimálnemu zápisu 128-bitového �ísla."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
@@ -4407,16 +3654,8 @@ msgid "Padding"
 msgstr "doplnenie"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
-"Táto zna�ka vyhradzuje priestor, ktorý je možné neskôr znova využiť pri "
-"doplnení �alších metadát. Nové metadáta je možné zapísať na miesto "
-"nahradením tejto zna�ky menším dátovým prvkom a použitím znovu získaného "
-"priestoru na uloženie nových alebo rozšírených metadátových štítkov."
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Táto zna�ka vyhradzuje priestor, ktorý je možné neskôr znova využiť pri doplnení �alších metadát. Nové metadáta je možné zapísať na miesto nahradením tejto zna�ky menším dátovým prvkom a použitím znovu získaného priestoru na uloženie nových alebo rozšírených metadátových štítkov."
 
 # FUZZY exif-sharpness-1
 #: libexif/fuji/mnote-fuji-entry.c:62
@@ -4710,456 +3949,456 @@ msgstr "Číslo rámca"
 msgid "Invalid format '%s', expected '%s' or '%s'."
 msgstr "Neplatný formát „%s“, o�akával sa „%s“ alebo „%s“."
 
-#: libexif/olympus/mnote-olympus-entry.c:92
+#: libexif/olympus/mnote-olympus-entry.c:89
 msgid "AF non D lens"
 msgstr "šošovky AF nie D"
 
-#: libexif/olympus/mnote-olympus-entry.c:94
+#: libexif/olympus/mnote-olympus-entry.c:91
 msgid "AF-D or AF-S lens"
 msgstr "šošovky AF-D alebo AF-S"
 
-#: libexif/olympus/mnote-olympus-entry.c:95
+#: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF-D G lens"
 msgstr "šošovky AF-D G"
 
-#: libexif/olympus/mnote-olympus-entry.c:96
+#: libexif/olympus/mnote-olympus-entry.c:93
 msgid "AF-D VR lens"
 msgstr "šošovky AF-D VR"
 
-#: libexif/olympus/mnote-olympus-entry.c:97
+#: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D G VR lens"
 msgstr "šošovky AF-D G VR"
 
-#: libexif/olympus/mnote-olympus-entry.c:101
+#: libexif/olympus/mnote-olympus-entry.c:98
 msgid "Flash unit unknown"
 msgstr "jednotka blesku nerozpoznaná"
 
-#: libexif/olympus/mnote-olympus-entry.c:102
+#: libexif/olympus/mnote-olympus-entry.c:99
 msgid "Flash is external"
 msgstr "blesk je externý"
 
-#: libexif/olympus/mnote-olympus-entry.c:103
+#: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash is on camera"
 msgstr "blesk je na fotoaparáte"
 
-#: libexif/olympus/mnote-olympus-entry.c:106
+#: libexif/olympus/mnote-olympus-entry.c:103
 msgid "VGA basic"
 msgstr "VGA základné"
 
-#: libexif/olympus/mnote-olympus-entry.c:107
+#: libexif/olympus/mnote-olympus-entry.c:104
 msgid "VGA normal"
 msgstr "VGA normálne"
 
-#: libexif/olympus/mnote-olympus-entry.c:108
+#: libexif/olympus/mnote-olympus-entry.c:105
 msgid "VGA fine"
 msgstr "VGA jemné"
 
-#: libexif/olympus/mnote-olympus-entry.c:109
+#: libexif/olympus/mnote-olympus-entry.c:106
 msgid "SXGA basic"
 msgstr "SXGA základné"
 
-#: libexif/olympus/mnote-olympus-entry.c:110
+#: libexif/olympus/mnote-olympus-entry.c:107
 msgid "SXGA normal"
 msgstr "SXGA normálne"
 
-#: libexif/olympus/mnote-olympus-entry.c:111
+#: libexif/olympus/mnote-olympus-entry.c:108
 msgid "SXGA fine"
 msgstr "SXGA jemné"
 
-#: libexif/olympus/mnote-olympus-entry.c:112
+#: libexif/olympus/mnote-olympus-entry.c:109
 msgid "2 Mpixel basic"
 msgstr "2 MPixel základné"
 
-#: libexif/olympus/mnote-olympus-entry.c:113
+#: libexif/olympus/mnote-olympus-entry.c:110
 msgid "2 Mpixel normal"
 msgstr "2 MPixel normálne"
 
-#: libexif/olympus/mnote-olympus-entry.c:114
+#: libexif/olympus/mnote-olympus-entry.c:111
 msgid "2 Mpixel fine"
 msgstr "2 MPixel jemné"
 
-#: libexif/olympus/mnote-olympus-entry.c:117
+#: libexif/olympus/mnote-olympus-entry.c:114
 msgid "Color"
 msgstr "farba"
 
-#: libexif/olympus/mnote-olympus-entry.c:122
+#: libexif/olympus/mnote-olympus-entry.c:119
 msgid "Bright+"
 msgstr "jas+"
 
-#: libexif/olympus/mnote-olympus-entry.c:123
+#: libexif/olympus/mnote-olympus-entry.c:120
 msgid "Bright-"
 msgstr "jas-"
 
-#: libexif/olympus/mnote-olympus-entry.c:124
+#: libexif/olympus/mnote-olympus-entry.c:121
 msgid "Contrast+"
 msgstr "kontrast+"
 
-#: libexif/olympus/mnote-olympus-entry.c:125
+#: libexif/olympus/mnote-olympus-entry.c:122
 msgid "Contrast-"
 msgstr "kontrast-"
 
-#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:125
 msgid "ISO 80"
 msgstr "ISO 80"
 
-#: libexif/olympus/mnote-olympus-entry.c:129
+#: libexif/olympus/mnote-olympus-entry.c:126
 msgid "ISO 160"
 msgstr "ISO 160"
 
-#: libexif/olympus/mnote-olympus-entry.c:130
+#: libexif/olympus/mnote-olympus-entry.c:127
 msgid "ISO 320"
 msgstr "ISO 320"
 
-#: libexif/olympus/mnote-olympus-entry.c:131
-#: libexif/olympus/mnote-olympus-entry.c:249
+#: libexif/olympus/mnote-olympus-entry.c:128
+#: libexif/olympus/mnote-olympus-entry.c:246
 msgid "ISO 100"
 msgstr "ISO 100"
 
-#: libexif/olympus/mnote-olympus-entry.c:135
+#: libexif/olympus/mnote-olympus-entry.c:132
 msgid "Preset"
 msgstr "prednastavené"
 
-#: libexif/olympus/mnote-olympus-entry.c:137
+#: libexif/olympus/mnote-olympus-entry.c:134
 msgid "Incandescence"
 msgstr "inkadescencia"
 
-#: libexif/olympus/mnote-olympus-entry.c:138
+#: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Fluorescence"
 msgstr "fluorescencia"
 
-#: libexif/olympus/mnote-olympus-entry.c:140
+#: libexif/olympus/mnote-olympus-entry.c:137
 msgid "SpeedLight"
 msgstr "rýchlosvetlo"
 
-#: libexif/olympus/mnote-olympus-entry.c:143
+#: libexif/olympus/mnote-olympus-entry.c:140
 msgid "No fisheye"
 msgstr "rybie oko vypnuté"
 
-#: libexif/olympus/mnote-olympus-entry.c:144
+#: libexif/olympus/mnote-olympus-entry.c:141
 msgid "Fisheye on"
 msgstr "rybie oko zapnuté"
 
-#: libexif/olympus/mnote-olympus-entry.c:147
+#: libexif/olympus/mnote-olympus-entry.c:144
 msgid "Normal, SQ"
 msgstr "normálny, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:148
+#: libexif/olympus/mnote-olympus-entry.c:145
 msgid "Normal, HQ"
 msgstr "normálny, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:149
+#: libexif/olympus/mnote-olympus-entry.c:146
 msgid "Normal, SHQ"
 msgstr "normálny, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:150
+#: libexif/olympus/mnote-olympus-entry.c:147
 msgid "Normal, RAW"
 msgstr "normálny, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:151
+#: libexif/olympus/mnote-olympus-entry.c:148
 msgid "Normal, SQ1"
 msgstr "normálny, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:152
+#: libexif/olympus/mnote-olympus-entry.c:149
 msgid "Normal, SQ2"
 msgstr "normálny, SQ2"
 
 # exif-exposureprogram-2
-#: libexif/olympus/mnote-olympus-entry.c:153
+#: libexif/olympus/mnote-olympus-entry.c:150
 msgid "Normal, super high"
 msgstr "normálny, supervysoká"
 
-#: libexif/olympus/mnote-olympus-entry.c:154
+#: libexif/olympus/mnote-olympus-entry.c:151
 msgid "Normal, standard"
 msgstr "normálny, štandardná"
 
-#: libexif/olympus/mnote-olympus-entry.c:155
+#: libexif/olympus/mnote-olympus-entry.c:152
 msgid "Fine, SQ"
 msgstr "jemný, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:156
+#: libexif/olympus/mnote-olympus-entry.c:153
 msgid "Fine, HQ"
 msgstr "jemný, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:157
+#: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Fine, SHQ"
 msgstr "jemný, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:158
+#: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, RAW"
 msgstr "jemný, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:159
+#: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, SQ1"
 msgstr "jemný, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:160
+#: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SQ2"
 msgstr "jemný, SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:161
+#: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, super high"
 msgstr "jemný, supervysoká"
 
-#: libexif/olympus/mnote-olympus-entry.c:162
+#: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Super fine, SQ"
 msgstr "superjemný, SQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:163
+#: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Super fine, HQ"
 msgstr "superjemný, HQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:164
+#: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Super fine, SHQ"
 msgstr "superjemný, SHQ"
 
-#: libexif/olympus/mnote-olympus-entry.c:165
+#: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, RAW"
 msgstr "superjemný, RAW"
 
-#: libexif/olympus/mnote-olympus-entry.c:166
+#: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, SQ1"
 msgstr "superjemný, SQ1"
 
-#: libexif/olympus/mnote-olympus-entry.c:167
+#: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SQ2"
 msgstr "superjemný, SQ2"
 
-#: libexif/olympus/mnote-olympus-entry.c:168
+#: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, super high"
 msgstr "superjemný, supervysoká"
 
-#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, high"
 msgstr "superjemný, high"
 
-#: libexif/olympus/mnote-olympus-entry.c:172
-#: libexif/olympus/mnote-olympus-entry.c:177
-#: libexif/olympus/mnote-olympus-entry.c:211
-#: libexif/olympus/mnote-olympus-entry.c:220
-#: libexif/olympus/mnote-olympus-entry.c:243
+#: libexif/olympus/mnote-olympus-entry.c:169
+#: libexif/olympus/mnote-olympus-entry.c:174
+#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/olympus/mnote-olympus-entry.c:240
 msgid "No"
 msgstr "nie"
 
-#: libexif/olympus/mnote-olympus-entry.c:183
+#: libexif/olympus/mnote-olympus-entry.c:180
 msgid "On (Preset)"
 msgstr "Zapnuté (predvolené)"
 
-#: libexif/olympus/mnote-olympus-entry.c:188
+#: libexif/olympus/mnote-olympus-entry.c:185
 msgid "Fill"
 msgstr "výplň"
 
-#: libexif/olympus/mnote-olympus-entry.c:195
+#: libexif/olympus/mnote-olympus-entry.c:192
 msgid "Internal + external"
 msgstr "Interný + externý"
 
-#: libexif/olympus/mnote-olympus-entry.c:224
+#: libexif/olympus/mnote-olympus-entry.c:221
 msgid "Interlaced"
 msgstr "Prekladaný"
 
-#: libexif/olympus/mnote-olympus-entry.c:225
+#: libexif/olympus/mnote-olympus-entry.c:222
 msgid "Progressive"
 msgstr "Progresívne"
 
-#: libexif/olympus/mnote-olympus-entry.c:231
+#: libexif/olympus/mnote-olympus-entry.c:228
 #: libexif/pentax/mnote-pentax-entry.c:85
 #: libexif/pentax/mnote-pentax-entry.c:139
 msgid "Best"
 msgstr "najlepší"
 
 # FUZZY exif-exposuremode-0
-#: libexif/olympus/mnote-olympus-entry.c:232
+#: libexif/olympus/mnote-olympus-entry.c:229
 msgid "Adjust exposure"
 msgstr "nastavenie expozície"
 
-#: libexif/olympus/mnote-olympus-entry.c:235
+#: libexif/olympus/mnote-olympus-entry.c:232
 msgid "Spot focus"
 msgstr "bodové zaostrenie"
 
-#: libexif/olympus/mnote-olympus-entry.c:236
+#: libexif/olympus/mnote-olympus-entry.c:233
 msgid "Normal focus"
 msgstr "bežné zaostrenie"
 
-#: libexif/olympus/mnote-olympus-entry.c:239
+#: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Record while down"
 msgstr "Zaznamenávať po�as vypnutia"
 
-#: libexif/olympus/mnote-olympus-entry.c:240
+#: libexif/olympus/mnote-olympus-entry.c:237
 msgid "Press start, press stop"
 msgstr "Stla�te štart, stla�te stop"
 
-#: libexif/olympus/mnote-olympus-entry.c:248
+#: libexif/olympus/mnote-olympus-entry.c:245
 msgid "ISO 50"
 msgstr "ISO 50"
 
-#: libexif/olympus/mnote-olympus-entry.c:250
+#: libexif/olympus/mnote-olympus-entry.c:247
 msgid "ISO 200"
 msgstr "ISO 200"
 
-#: libexif/olympus/mnote-olympus-entry.c:251
+#: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 400"
 msgstr "ISO 400"
 
-#: libexif/olympus/mnote-olympus-entry.c:255
+#: libexif/olympus/mnote-olympus-entry.c:252
 #: libexif/pentax/mnote-pentax-entry.c:168
 msgid "Sport"
 msgstr "Å¡port"
 
-#: libexif/olympus/mnote-olympus-entry.c:256
+#: libexif/olympus/mnote-olympus-entry.c:253
 msgid "TV"
 msgstr "TV"
 
-#: libexif/olympus/mnote-olympus-entry.c:258
+#: libexif/olympus/mnote-olympus-entry.c:255
 msgid "User 1"
 msgstr "Použ. 1"
 
-#: libexif/olympus/mnote-olympus-entry.c:259
+#: libexif/olympus/mnote-olympus-entry.c:256
 msgid "User 2"
 msgstr "Použ. 2"
 
-#: libexif/olympus/mnote-olympus-entry.c:260
+#: libexif/olympus/mnote-olympus-entry.c:257
 msgid "Lamp"
 msgstr "Lampa"
 
-#: libexif/olympus/mnote-olympus-entry.c:263
+#: libexif/olympus/mnote-olympus-entry.c:260
 msgid "5 frames/sec"
 msgstr "5 rámcov/sek"
 
-#: libexif/olympus/mnote-olympus-entry.c:264
+#: libexif/olympus/mnote-olympus-entry.c:261
 msgid "10 frames/sec"
 msgstr "10 rámcov/sek"
 
-#: libexif/olympus/mnote-olympus-entry.c:265
+#: libexif/olympus/mnote-olympus-entry.c:262
 msgid "15 frames/sec"
 msgstr "15 rámcov/sek"
 
-#: libexif/olympus/mnote-olympus-entry.c:266
+#: libexif/olympus/mnote-olympus-entry.c:263
 msgid "20 frames/sec"
 msgstr "20 rámcov/sek"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:378
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "korekcia �ervenej %f, korekcia modrej %f"
 
-#: libexif/olympus/mnote-olympus-entry.c:388
-msgid "No manual focus selection"
-msgstr "bez výberu automatického zaostrenia"
-
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:386
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f metrov"
 
+#: libexif/olympus/mnote-olympus-entry.c:388
+msgid "No manual focus selection"
+msgstr "bez výberu automatického zaostrenia"
+
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:414
 msgid "AF position: center"
 msgstr "poloha AZ: stred"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:415
 msgid "AF position: top"
 msgstr "poloha AZ: hore"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:416
 msgid "AF position: bottom"
 msgstr "poloha AZ: dolu"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:417
 msgid "AF position: left"
 msgstr "poloha AZ: vľavo"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: right"
 msgstr "poloha AZ: vpravo"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: upper-left"
 msgstr "poloha AZ: vyššie vľavo"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: upper-right"
 msgstr "poloha AZ: vyššie vpravo"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: lower-left"
 msgstr "poloha AZ: nižšie vľavo"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: lower-right"
 msgstr "poloha AZ: nižšie vpravo"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: far left"
 msgstr "poloha AZ: celkom vľavo"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: far right"
 msgstr "poloha AZ: celkom vpravo"
 
 # AF = automatické zaostrenie
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "Unknown AF position"
 msgstr "neznáma poloha AZ"
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:436
+#: libexif/olympus/mnote-olympus-entry.c:506
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "Vnútorná chyba (neznáma hodnota %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:444
+#: libexif/olympus/mnote-olympus-entry.c:514
 #, c-format
 msgid "Unknown value %hi"
 msgstr "neznáma hodnota %hi"
 
 # exif-meteringmode-0
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:539
+#: libexif/olympus/mnote-olympus-entry.c:559
 #, c-format
 msgid "Unknown %hu"
 msgstr "neznámy %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:556
 msgid "2 sec."
 msgstr "2 sek."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:595
 msgid "Fast"
 msgstr "rýchlo"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:699
 msgid "Automatic"
 msgstr "automatika"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:729
 #, c-format
 msgid "Manual: %liK"
 msgstr "Manuálny: %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:732
 msgid "Manual: unknown"
 msgstr "Ru�né: neznáme"
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:738
 msgid "One-touch"
 msgstr "jedným dotykom"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:794
+#: libexif/olympus/mnote-olympus-entry.c:804
 msgid "Infinite"
 msgstr "nekone�no"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:812
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i bajtov neznámych údajov:"
diff --git a/po/sq.gmo b/po/sq.gmo
deleted file mode 100644
index e018d4d..0000000
--- a/po/sq.gmo
+++ /dev/null
diff --git a/po/sq.po b/po/sq.po
index 7edb4d3..dcf9445 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
 "PO-Revision-Date: 2009-11-25 15:23+0000\n"
 "Last-Translator: Vilson Gjeci <vilsongjeci@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
@@ -40,7 +40,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -51,14 +51,14 @@ msgstr "Makro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -87,15 +87,15 @@ msgstr "Superfin"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -127,8 +127,8 @@ msgstr "Auto"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -148,8 +148,7 @@ msgstr ""
 msgid "Auto, red-eye reduction"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr ""
 
@@ -271,9 +270,8 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -285,7 +283,7 @@ msgid "Manual"
 msgstr "Manuale"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -314,7 +312,7 @@ msgid "Sepia"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -341,8 +339,7 @@ msgstr "Vivid"
 msgid "Neutral"
 msgstr "Neutral"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr ""
 
@@ -424,7 +421,7 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Asnjë"
@@ -437,8 +434,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "Të Tjera"
 
@@ -488,11 +485,11 @@ msgstr "800"
 msgid "Default"
 msgstr "I Parazgjedhur"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "Pikë"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Mesatarja"
 
@@ -500,11 +497,11 @@ msgstr "Mesatarja"
 msgid "Evaluative"
 msgstr "Vlerësues"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "I Pjesshëm"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr ""
 
@@ -516,7 +513,7 @@ msgstr "I panjohur"
 msgid "Very close"
 msgstr "Shumë afër"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Afër"
 
@@ -610,7 +607,7 @@ msgstr "Tokina AF193-2 19-35mm f/3.5-4.5"
 
 #: libexif/canon/mnote-canon-entry.c:208
 msgid "Canon EF 100-300mm F5.6L"
-msgstr ""
+msgstr "Canon EF 100-300mm F5.6L"
 
 #: libexif/canon/mnote-canon-entry.c:209
 msgid "Sigma 50mm f/2.8 EX or 28mm f/1.8"
@@ -630,7 +627,7 @@ msgstr "Canon EF 80-200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:213
 msgid "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
-msgstr ""
+msgstr "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
 
 #: libexif/canon/mnote-canon-entry.c:214
 msgid "Cosina 100mm f/3.5 Macro AF"
@@ -646,16 +643,15 @@ msgstr "Canon EF 50mm f/1.8 MkII"
 
 #: libexif/canon/mnote-canon-entry.c:217
 msgid "Tamron SP AF 300mm f/2.8 LD IF"
-msgstr ""
+msgstr "Tamron SP AF 300mm f/2.8 LD IF"
 
 #: libexif/canon/mnote-canon-entry.c:218
 msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
-msgstr ""
+msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -667,16 +663,15 @@ msgstr "Canon EF 28-80mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:222
 msgid "Canon EF 28-105mm f/4-5.6"
-msgstr ""
+msgstr "Canon EF 28-105mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon EF-S 18-55mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -688,15 +683,15 @@ msgstr "Canon TS-E 24mm f/3.5L"
 
 #: libexif/canon/mnote-canon-entry.c:227
 msgid "Canon TS-E 45mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 45mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:228
 msgid "Canon TS-E 90mm f/2.8"
-msgstr ""
+msgstr "Canon TS-E 90mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:229
 msgid "Canon EF 50mm f/1.0L"
-msgstr ""
+msgstr "Canon EF 50mm f/1.0L"
 
 #: libexif/canon/mnote-canon-entry.c:230
 msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
@@ -704,7 +699,7 @@ msgstr "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
 
 #: libexif/canon/mnote-canon-entry.c:231
 msgid "Canon EF 600mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 600mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:232
 msgid "Canon EF 200mm f/1.8L"
@@ -716,7 +711,7 @@ msgstr "Canon EF 300mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:234
 msgid "Canon EF 85mm f/1.2L"
-msgstr ""
+msgstr "Canon EF 85mm f/1.2L"
 
 #: libexif/canon/mnote-canon-entry.c:235
 msgid "Canon EF 400mm f/2.8L"
@@ -728,11 +723,11 @@ msgstr "Canon EF 500mm f/4.5L"
 
 #: libexif/canon/mnote-canon-entry.c:237
 msgid "Canon EF 300mm f/2.8L IS"
-msgstr ""
+msgstr "Canon EF 300mm f/2.8L IS"
 
 #: libexif/canon/mnote-canon-entry.c:238
 msgid "Canon EF 500mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 500mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:239
 msgid "Canon EF 100mm f/2"
@@ -748,7 +743,7 @@ msgstr "Canon EF 200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:242
 msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
-msgstr ""
+msgstr "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
 
 #: libexif/canon/mnote-canon-entry.c:243
 msgid "Canon EF 35-350mm f/3.5-5.6L"
@@ -784,7 +779,7 @@ msgstr "Canon EF 70-200mm f/2.8 L + x2"
 
 #: libexif/canon/mnote-canon-entry.c:251
 msgid "Canon EF 28mm f/1.8 USM"
-msgstr ""
+msgstr "Canon EF 28mm f/1.8 USM"
 
 #: libexif/canon/mnote-canon-entry.c:252
 msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
@@ -820,7 +815,7 @@ msgstr "Canon EF 35mm f/1.4L"
 
 #: libexif/canon/mnote-canon-entry.c:260
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
-msgstr ""
+msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:261
 msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
@@ -860,7 +855,7 @@ msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
 
 #: libexif/canon/mnote-canon-entry.c:270
 msgid "Canon EF 28-200mm f/3.5-5.6"
-msgstr ""
+msgstr "Canon EF 28-200mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:271
 msgid "Canon EF 90-300mm f/4.5-5.6"
@@ -868,19 +863,19 @@ msgstr "Canon EF 90-300mm f/4.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:272
 msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:273
 msgid "Canon EF 70-200mm f/2.8L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:274
 msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
 
 #: libexif/canon/mnote-canon-entry.c:275
 msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
-msgstr ""
+msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
 
 #: libexif/canon/mnote-canon-entry.c:276
 msgid "Canon EF 16-35mm f/2.8L"
@@ -896,40 +891,39 @@ msgstr "Canon EF 17-40mm f/4L"
 
 #: libexif/canon/mnote-canon-entry.c:279
 msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:280
 msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:281
 msgid "Canon EF-S10-22mm F3.5-4.5 USM"
-msgstr ""
+msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
 
 #: libexif/canon/mnote-canon-entry.c:282
 msgid "Canon EF-S60mm F2.8 Macro USM"
-msgstr ""
+msgstr "Canon EF-S60mm F2.8 Macro USM"
 
 #: libexif/canon/mnote-canon-entry.c:283
 msgid "Canon EF 24-105mm f/4L IS"
-msgstr ""
+msgstr "Canon EF 24-105mm f/4L IS"
 
 #: libexif/canon/mnote-canon-entry.c:284
 msgid "Canon EF 70-300mm F4-5.6 IS USM"
-msgstr ""
+msgstr "Canon EF 70-300mm F4-5.6 IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:285
 msgid "Canon EF 50mm F1.2L USM"
-msgstr ""
+msgstr "Canon EF 50mm F1.2L USM"
 
 #: libexif/canon/mnote-canon-entry.c:286
 msgid "Canon EF 70-200mm f/4L IS USM"
-msgstr ""
+msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 200mm f/2.8L II"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -1030,32 +1024,32 @@ msgid "Sunny"
 msgstr "Me Diell"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Me re"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Tungsten"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Fluoreshent"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Flash"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Hija"
@@ -1077,7 +1071,7 @@ msgid "PC set 3"
 msgstr "PC skena 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Fluoreshente e dritës së ditës"
@@ -1090,7 +1084,7 @@ msgstr "E Parazgjedhur 1"
 msgid "Custom 2"
 msgstr "E Parazgjedhur 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1155,22 +1149,22 @@ msgid "Rotated by software"
 msgstr "E rrotulluar nga programi"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Nga e majta në të djathtë"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Nga e djathta në të majtë"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Nga fundi në krye"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Nga kreu në fund"
 
@@ -1180,7 +1174,7 @@ msgstr "2x2 matrix (në drejtim të akrepave të orës)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1198,9 +1192,8 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1255,37 +1248,44 @@ msgstr ""
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr ""
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr ""
 
@@ -1293,8 +1293,7 @@ msgstr ""
 msgid "Settings (Second Part)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Panorama"
@@ -1349,8 +1348,8 @@ msgstr "Cilësia"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr ""
 
@@ -1361,9 +1360,8 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr ""
 
@@ -1382,25 +1380,24 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Ngopja"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1410,7 +1407,7 @@ msgstr "Ndriçimi"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr ""
@@ -1423,7 +1420,7 @@ msgstr ""
 msgid "AF Point"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr ""
 
@@ -1530,7 +1527,7 @@ msgid "Exposure Compensation"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1570,11 +1567,12 @@ msgstr ""
 msgid "Focus Distance Lower"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr ""
@@ -1623,45 +1621,45 @@ msgstr ""
 msgid "Intel"
 msgstr ""
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr ""
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr ""
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr ""
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr ""
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr ""
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 msgstr ""
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr ""
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1706,195 +1704,193 @@ msgid ""
 "fixed."
 msgstr ""
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr ""
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr ""
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr ""
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr ""
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr ""
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr ""
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr ""
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr ""
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr ""
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr ""
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr ""
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr ""
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr ""
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr ""
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr ""
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr ""
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1902,178 +1898,178 @@ msgstr ""
 msgid "Hard"
 msgstr ""
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr ""
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr ""
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr ""
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr ""
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr ""
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr ""
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr ""
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr ""
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr ""
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr ""
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr ""
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr ""
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr ""
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr ""
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr ""
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr ""
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr ""
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr ""
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr ""
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr ""
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr ""
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr ""
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr ""
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr ""
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr ""
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr ""
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr ""
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr ""
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr ""
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr ""
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr ""
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr ""
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr ""
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr ""
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr ""
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr ""
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr ""
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2081,305 +2077,303 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr ""
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr ""
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr ""
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr ""
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr ""
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr ""
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr ""
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr ""
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr ""
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr ""
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr ""
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr ""
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr ""
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr ""
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr ""
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr ""
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr ""
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr ""
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr ""
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr ""
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr ""
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr ""
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr ""
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr ""
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr ""
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr ""
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr ""
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr ""
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr ""
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr ""
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr ""
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr ""
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr ""
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr ""
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr ""
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr ""
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr ""
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr ""
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr ""
@@ -2465,11 +2459,11 @@ msgstr ""
 msgid "The data provided does not follow the specification."
 msgstr ""
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr ""
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2477,11 +2471,11 @@ msgid ""
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr ""
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2489,25 +2483,25 @@ msgid ""
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr ""
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2516,21 +2510,21 @@ msgid ""
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2539,44 +2533,44 @@ msgid ""
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr ""
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr ""
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2585,101 +2579,101 @@ msgid ""
 "the tag shall be set to NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr ""
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr ""
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr ""
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr ""
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr ""
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr ""
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr ""
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr ""
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2687,22 +2681,22 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 ""
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2712,21 +2706,21 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2736,49 +2730,49 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2786,70 +2780,80 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr ""
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr ""
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr ""
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr ""
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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 ""
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr ""
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr ""
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2857,40 +2861,40 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr ""
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 ""
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr ""
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr ""
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr ""
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr ""
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2898,33 +2902,33 @@ msgid ""
 "is to be used."
 msgstr ""
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr ""
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 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 ""
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr ""
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 ""
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr ""
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2932,30 +2936,30 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr ""
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr ""
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 ""
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr ""
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -2963,74 +2967,74 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr ""
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 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 ""
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr ""
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 ""
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr ""
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3038,21 +3042,21 @@ msgid ""
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr ""
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 msgstr ""
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr ""
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3060,51 +3064,51 @@ msgid ""
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr ""
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr ""
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr ""
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr ""
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3113,11 +3117,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr ""
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3126,21 +3130,21 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr ""
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3155,11 +3159,11 @@ msgid ""
 "both centered and co-sited positioning."
 msgstr ""
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr ""
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3168,34 +3172,34 @@ msgid ""
 "Interoperability these conditions."
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr ""
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr ""
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 ""
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr ""
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr ""
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3214,122 +3218,118 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr ""
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr ""
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr ""
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr ""
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr ""
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr ""
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr ""
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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 ""
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3339,120 +3339,120 @@ msgid ""
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr ""
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr ""
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 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 ""
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr ""
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr ""
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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 ""
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr ""
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr ""
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr ""
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr ""
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr ""
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 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 ""
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr ""
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr ""
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3474,86 +3474,86 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr ""
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr ""
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr ""
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr ""
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3562,11 +3562,11 @@ msgid ""
 "be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3574,11 +3574,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3588,11 +3588,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3617,11 +3617,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3630,62 +3630,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr ""
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr ""
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3694,176 +3694,176 @@ msgid ""
 "number."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr ""
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr ""
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr ""
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr ""
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr ""
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr ""
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr ""
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr ""
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4041,17 +4041,11 @@ msgstr ""
 msgid "Wide2 (400%)"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr ""
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr ""
@@ -4477,117 +4471,117 @@ msgstr ""
 msgid "20 frames/sec"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr ""
@@ -4689,8 +4683,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr ""
 
@@ -4862,13 +4855,11 @@ msgstr ""
 msgid "White Balance Setting"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr ""
 
@@ -5216,10 +5207,20 @@ msgstr ""
 msgid "Digital filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:385
 #, c-format
-msgid "Internal error (unknown value %i %i)"
+msgid "Internal error (unknown value %hi %hi)"
 msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
diff --git a/po/sr.gmo b/po/sr.gmo
deleted file mode 100644
index a26c64c..0000000
--- a/po/sr.gmo
+++ /dev/null
diff --git a/po/sr.po b/po/sr.po
index 655a7d2..9d9266e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
 "PO-Revision-Date: 2010-04-24 08:59+0000\n"
 "Last-Translator: Marko Uskokovic <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -38,7 +38,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "�еи�праван број елемената (%i, очекивао �ам %i или %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -49,14 +49,14 @@ msgstr "Макро"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -85,15 +85,15 @@ msgstr "Супер фино"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -125,8 +125,8 @@ msgstr "�утомат�ки"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -146,8 +146,7 @@ msgstr "Споро у�клађивање"
 msgid "Auto, red-eye reduction"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr ""
 
@@ -269,9 +268,8 @@ msgstr "Потпуна аутоматика"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -283,7 +281,7 @@ msgid "Manual"
 msgstr "Ручно"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -312,7 +310,7 @@ msgid "Sepia"
 msgstr "Сепиа"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -339,8 +337,7 @@ msgstr "Живопи�но"
 msgid "Neutral"
 msgstr "�еутрлно"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "И�кључен блиц"
 
@@ -422,7 +419,7 @@ msgstr ""
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "�ишта"
@@ -435,8 +432,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "Друго"
 
@@ -486,11 +483,11 @@ msgstr "800"
 msgid "Default"
 msgstr "Подразумевано"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "Ме�то"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Про�ечно"
 
@@ -498,11 +495,11 @@ msgstr "Про�ечно"
 msgid "Evaluative"
 msgstr "Процена"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Делимично"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr "Про�ечна тежина центра"
 
@@ -514,7 +511,7 @@ msgstr "�епознато"
 msgid "Very close"
 msgstr "Веома близу"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Близу"
 
@@ -651,9 +648,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -672,9 +668,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -925,9 +920,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 200mm f/2.8L II"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -1028,32 +1022,32 @@ msgid "Sunny"
 msgstr "Сунчано"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Облачно"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Волфрам"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Флура�центно"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "Блиц"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "Сенка"
@@ -1075,7 +1069,7 @@ msgid "PC set 3"
 msgstr "PC �куп 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Дневно флуро�центно"
@@ -1088,7 +1082,7 @@ msgstr "Прилагођено 1"
 msgid "Custom 2"
 msgstr "Прилагођено 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1153,22 +1147,22 @@ msgid "Rotated by software"
 msgstr "Окренуће програм"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Лево на де�но"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "Де�но на лево"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Одоздо нагоре"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Одозго надоле"
 
@@ -1178,7 +1172,7 @@ msgstr "2x2 матрица (у �меру кретања �ата)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1196,9 +1190,8 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1253,37 +1246,44 @@ msgstr "Монохромо"
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i бајтова непознатих података"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Жижна даљина"
 
@@ -1291,8 +1291,7 @@ msgstr "Жижна даљина"
 msgid "Settings (Second Part)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr "Панорама"
@@ -1347,8 +1346,8 @@ msgstr "Квалитет"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "Мод блица"
 
@@ -1359,9 +1358,8 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "Жижни мод"
 
@@ -1380,25 +1378,24 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "Дигитално увећање"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Супротно�т"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "За�ићено�т"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1408,7 +1405,7 @@ msgstr "Оштрина"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "Мод мерења"
@@ -1421,7 +1418,7 @@ msgstr ""
 msgid "AF Point"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Мод о�ветљења"
 
@@ -1528,7 +1525,7 @@ msgid "Exposure Compensation"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1568,11 +1565,12 @@ msgstr ""
 msgid "Focus Distance Lower"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "ФБрој"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr "Време о�ветљења"
@@ -1621,35 +1619,35 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr "Подаци �у премали да бих дозволио EXIF податке."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr "�и�ам пронашао EXIF ознаку."
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr "EXIF заглавље није пронађено."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr "�епознато шифровање."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr "Занемари непозанте ознаке."
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr "Занемари непозанте ознаке док учитаваш EXIF податке."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr "У�клади �а техничким подацима"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
@@ -1657,11 +1655,11 @@ msgstr ""
 "Додај, и�прави или уклони уно�е не би ли добио EXIF податке у �кладу �а "
 "техничким подацима."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr ""
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1714,196 +1712,194 @@ msgid ""
 "fixed."
 msgstr ""
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr ""
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr ""
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
 "Етикета '%s' �адржи податке у неи�правном облику ( '%s', а тражи �е '%s')."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr "Етикета  '%s �адржи неи�праван број елемената (%i, уме�то %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr ""
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "�еодређено"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "Једночипни �ензор обла�ти боје"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr "Двочипни �ензор обла�ти боје"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr "Трочипни �ензор обла�ти боје"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr "Сензор �еквенцијалног про�тора боја"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr "Про�трани �ензор"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr "Сензор линеарног про�тора боја"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Горе - лево"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Горе - де�но"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Доле - де�но"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Доле - лево"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr "Обрнути моно"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr "�ормални моно"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Палета"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "�ормални по�тупак"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "Прилагођени по�тупак"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr "�утомат�ко о�ветљење"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "Ручно о�ветљење"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr "�утомат�ка потпора"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr "�утомат�ка равнотежа беле"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr "Ручно уравнотеживање беле"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr "Повећај ни�ке прагове"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr "Ви�оки �кок"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr "Смањи ни�ке прагове"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr "Смањи ви�оке прагове"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "Мала за�ићено�т"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Велика за�ићено�т"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "Меко"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1911,178 +1907,178 @@ msgstr "Меко"
 msgid "Hard"
 msgstr "Тешко"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "�епознато"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr ""
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr ""
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr ""
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Шаблон"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "�е�абијено"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "LZW �ажимање"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "JPEG �ажимање"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr "И�пумпати/ЗИП �ажимање"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr "PackBits �ажимање"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr "Волфрам�ко ужарено �ветло"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Лепо време"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Облачно време"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "Дневно бело флуро�центно"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr "Хладно бело флуро�центно"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "Бело флуро�центно"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "Стандардно �ветло �"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "Стандардно �ветло В"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "Стандардно �ветло С"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr "ISO �тудио волфрам"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "Инч"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "in"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Центиметар"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "�ормални програм"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr "Предно�т отвора"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "Отвор"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr "Предно�т затварача"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr "Затварач"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr "Стваралачки програм (�клоно дубини поља)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr "Стваралчко"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr "Стваралачки програм (�клоно брзом затварању)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "�кција"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "Поптретни мод (за �ликање изблиза код којих позадина није у жижи)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "Пејзажни мод (за пејзажне фотографије код којих је позадина у жижи)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "Блиц није бље�нуо"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr ""
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr ""
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2090,308 +2086,306 @@ msgstr ""
 msgid "Yes"
 msgstr "Да"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr ""
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr "Погледа изблиза"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr "Удаљен поглед"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr "�еподешено"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "�еи�правна величина уно�а (%i, тражи �е %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr "�еподржан UNICODE �тринг"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr "�еподржан JIS �тринг"
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 #, fuzzy
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 "Етикета 'Коментар кори�ника' је проширено на најмање 8 бајтова не би "
 "и�поштовали �пецификацију."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr "Бајт на позицији %i: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr "�епозната верзија Exif"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif верзија %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix верзија 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix верзија 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr "�епозната верзија FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[�ишта]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "(Фотограф)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Уредник)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr " (35 одговара: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " sec."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Унутрашња грешка (непозната вредно�т %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr ""
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr ""
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr "У оквиру раздаљине %i of (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr "У оквиру правоугаоника (ширина %i, ви�ина %i) око (x,y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr "�еочекиван број елемена (%li, тражи �е 2, 3, или 4)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr ""
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr ""
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr ""
@@ -2477,11 +2471,11 @@ msgstr "Оштећени подаци"
 msgid "The data provided does not follow the specification."
 msgstr "Про�леђени подаци ни�у у �кладу �а техничким подацима."
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr ""
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2493,11 +2487,11 @@ msgstr ""
 "<GPSVersionID> �е изражава у бајтовима, за разлику од етикете <ExifVersion>."
 "�ко је верзија 2.0.0.0, вредно�т етикете је 02000000.H)."
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr ""
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2509,11 +2503,11 @@ msgstr ""
 "терминациони код (NULL). Погледајте за�ебно поглавље за препоручена правила "
 "интероперабилно�ти Exif �тандарда (ExifR98) за о�тале ознаке."
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr "Северна или јужна географ�ка дужина"
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -2521,15 +2515,15 @@ msgstr ""
 "Означава �еверну или јужну геогр. ширину. ASCII �лово 'N' означава �еверну, "
 "a 'S' јужну ширину.."
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr ""
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Географ�ка ширина"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2543,11 +2537,11 @@ msgstr ""
 "минутима, и минути �у, рецимо, изражени у две децимале, облик је dd/1,"
 "mmmm/100,0/1."
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr "И�точна или западна геогр. дужина"
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -2555,11 +2549,11 @@ msgstr ""
 "Означава и�точну или западну геогр. дужину.  ASCII �лово 'E' је за и�точну, "
 "a 'W' за западну дужину."
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Географ�ка дужина"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2573,29 +2567,29 @@ msgstr ""
 "минутима, и минути �у, рецимо, изражени у две децимале, облик је dd/1,"
 "mmmm/100,0/1."
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 "Означава ви�ину у одно�у на обележивач ви�ине. �ко �е мери у одно�у на ниво "
 "мора, и ви�ина је изнад нивоа мора, по�тавља �е 0. �ко је ви�ина и�под нивоа "
 "мора, по�тавља �е 1 и на ви�ину �е гледа као на ап�олутну вредно�т у етикети "
-"GSPAltitude. Јединица �у метри. Ова етикета је типа BYTE, за разлику од "
+"GPSAltitude. Јединица �у метри. Ова етикета је типа BYTE, за разлику од "
 "других етикета упућивача."
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr "Ви�ина"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -2603,21 +2597,21 @@ msgstr ""
 "Означава ви�ину у одно�у на упућивач у GPSAltitudeRef. Ви�ина �е изражава "
 "као рационални број. Јединица �у метри."
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr ""
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2626,101 +2620,101 @@ msgid ""
 "the tag shall be set to NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr ""
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr ""
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr ""
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr ""
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr ""
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr ""
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr ""
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr ""
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2728,22 +2722,22 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 ""
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2753,21 +2747,21 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2777,49 +2771,49 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2827,50 +2821,60 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr ""
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr ""
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr ""
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "Општа назнака вр�те података која �е налази у овом подфајлу."
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Ширина �лике"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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."
@@ -2878,11 +2882,11 @@ msgstr ""
 "Број колона у подацима �лике, једнак броју пик�ела по реду. У JPEG �ажетим "
 "подацима, JPEG етикета �е кори�ти уме�то ове етикете."
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr "Дужина �лике"
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -2890,11 +2894,11 @@ msgstr ""
 "Број редова података �лике. У JPEG �ажетим подацима, JPEG етикета �е кори�ти "
 "уме�то ове етикете."
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr "Битова по узорку"
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2905,11 +2909,11 @@ msgstr ""
 "бита, тако да је вредно�т етикете 8. Погледајте <SamplesPerPixel>. Код JPEG "
 "�ажимања, JPEG обелиживач �е кори�ти уме�то ове етикете."
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr "Сажимање"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 "
@@ -2919,11 +2923,11 @@ msgstr ""
 "�ажета, ознака није неопходна и изо�тављена је. Када �личице за преглед "
 "кори�те JPEG �ажимање, вредно�т етикете је 6."
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr "Фотометриј�ко пред�тављање"
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -2931,19 +2935,19 @@ msgstr ""
 "Са�тав пик�ела. Код JPEG �ажетих података, JPEG обележивач �е кори�ти уме�то "
 "ове етикете."
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr "Редо�лед фајлова"
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Име документа"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr "Опи� �лике"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2955,11 +2959,11 @@ msgstr ""
 "�ко је потребно да �е они кори�те, куца �е у Exif Private етикети "
 "<UserComment>."
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr "Произвођач"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -2969,11 +2973,11 @@ msgstr ""
 "дигитајзер или друге опреме која �е кори�ти за �тварање �лика. �ко је поље "
 "празно, �матра �е да је непознато."
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Модел"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 "
@@ -2983,11 +2987,11 @@ msgstr ""
 "видео дигитајзер или друге опреме која �е кори�ти за �тварање �лика. �ко је "
 "поље празно, �матра �е да је непознато."
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr "Штампане траке"
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2998,19 +3002,19 @@ msgstr ""
 "вредно�т мања од 64 килобајта. Код JPEG �ажетих података, ознака није "
 "неопходна и изо�тављена је. Погледајте и <RowsPerStrip> и <StripByteCounts>"
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr "Положај"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "Положај �лике у �ми�лу редова и колона."
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr "Узорака по пик�елу"
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 "
@@ -3020,11 +3024,11 @@ msgstr ""
 "�лике, вредно�т етикете је 3. Код JPEG �ажетих података, JPEG обележивач �е "
 "кори�ти уме�то ове етикете."
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr "Редова по траци"
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -3035,11 +3039,11 @@ msgstr ""
 "JPEG �ажетих података, ознака није неопходна и изо�тављена је. Погледајте и "
 "<StripOffsets> и <StripByteCounts>"
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr "Број бајтова на траци"
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
@@ -3047,11 +3051,11 @@ msgstr ""
 "Укупан број бајтова за �ваку траку. Код JPEG �ажетих података, ознака није "
 "неопходна и изо�тављена је."
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -3059,11 +3063,11 @@ msgstr ""
 "Број пик�ела по <ResolutionUnit> у <ImageWidth> правцу. �ко је непозната "
 "резолуција, 72 [dpi] је по�тављено."
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -3071,11 +3075,11 @@ msgstr ""
 "Број пик�ела по <ResolutionUnit> у <ImageWidth> правцу. По�тавља �е и�та "
 "вредно�т као у <XResolution>."
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr "Ра�поред Планара"
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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. "
@@ -3085,11 +3089,11 @@ msgstr ""
 "облику. У JPEG компре�ованим фајловима биће коришћен JPEG маркер уме�то ове "
 "ознаке. �ко ово поље не по�тоји, кори�ти �е TIFF вредно�ти 1 (раштркано)."
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr "Јединица резолуције"
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -3099,11 +3103,11 @@ msgstr ""
 "за <XResolution> и <YResolution>. �ко је непозната резолуција �лике, "
 "по�тавља �е 2 (инча)."
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr "Функција прено�а"
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 "
@@ -3112,11 +3116,11 @@ msgstr ""
 "Функција прено�а за �лику, опи�ана у табуларном �тилу. Обично ова ознака "
 "ниеј неопходна, обзиром да је палета боја означена помоћу <ColorSpace>."
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Софтвер"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3128,11 +3132,11 @@ msgstr ""
 "препоручљиво да буде �лично примеру који је приказан доле. �ко �е поље "
 "о�тави празно, �матра �е да је непознато."
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Датум и време"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
@@ -3140,11 +3144,11 @@ msgstr ""
 "Време и датум �ликања фотографије. У овом �тандарду (EXIF-2.1) то је датум и "
 "време измене фајла."
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Уметник"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3156,43 +3160,43 @@ msgstr ""
 "унета као што је пример који је приказан доле. �ко �е поље о�тави празно, "
 "�матра �е да је непознато."
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Бела тачка"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr "Главна нијан�ирано�т"
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 "Одређено од �тране Adobe корпорације за омогићавање TIFF Trees у оквиру TIFF "
 "фајла."
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr "Домет прено�а"
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr "JPEG формат"
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
@@ -3200,11 +3204,11 @@ msgstr ""
 "Ра�пон према �тартном бајту (SOI) JPEG компре�ованог умањеног приказа �лике. "
 "Ово �е не кори�ти као примарни податак JPEG �лике."
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr "JPEG формат дужине"
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3219,11 +3223,11 @@ msgstr ""
 "бити запи�ани у не више од 64 килобајтова, укључујући и �ве по�тале податке "
 "који �е запи�ују у APP1."
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr "YCbCr коефицијенти"
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3232,11 +3236,11 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr "YCbCr Sub-Sampling"
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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."
@@ -3244,11 +3248,11 @@ msgstr ""
 "Одно� узорака делова хромирања у одно�у на јачину о�ветљења. Код JPEG "
 "�ажетих података, JPEG обележивач �е кори�ти уме�то ове етикете."
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr "YCbCr положај"
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3274,11 +3278,11 @@ msgstr ""
 "пољу. Препоручљиво је да читачи буту �по�обни и за центрирано и за co-sited "
 "позиционирање."
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr "Референтни ниво црно/беле"
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3291,19 +3295,19 @@ msgstr ""
 "деклари�ана у информационој ознаци за палету боја, а подразумеване вредно�ти "
 "�у оне које дају оптималне карактери�тике �лике."
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr "XML �куп"
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr "XMP метаподаци"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr "CFA шаблон"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 "
@@ -3313,15 +3317,15 @@ msgstr ""
 "кори�ти �ензор оп�ега боја на једном чипу. �ема утицаја на �ве методе "
 "�ензора."
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Стање батерије"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "Copyright"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3354,23 +3358,19 @@ msgstr ""
 "правима уређивача (погледајте пример 3). Када је поље празно, �матра �е да "
 "аутор�ка права ни�у позната."
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Време о�ветљења у �екундама (sec)."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr "F број."
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr "Блок ре�ур�а �лике"
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 "
@@ -3380,21 +3380,21 @@ msgstr ""
 "као код IFD-а наведеног у TIFF-у, али не �адржи податке �лике  као у �лучају "
 "TIFF-а."
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr ""
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr "Програм�ка кла�а коју апарат кори�ти да поде�и о�ветљење када �лика."
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr "Спектрална о�етљиво�т"
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 "
@@ -3404,11 +3404,11 @@ msgstr ""
 "Вредно�т етикете је ASCII �тринг које је у �кладу �а �тандардном који је "
 "развио ASTM технчки комитет."
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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."
@@ -3416,11 +3416,11 @@ msgstr ""
 "Показивач на GPS Info IFD. Интероперабилна �труктура GPS Info IFD-а као код "
 "Exif IFD али не �адржи податке �лике."
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr "Стопа ISO брзине"
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -3428,30 +3428,30 @@ msgstr ""
 "Означава ISO брзину и ISO обим апарата или улазног уређаја као што је "
 "прецизирано у ISO 12232."
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr ""
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr ""
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr "Exif верзија"
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -3459,11 +3459,11 @@ msgstr ""
 "Верзија овог �тандарда је подржана. �епо�тојање овог поља је од�тупање од "
 "прилагођено�ти овом �тандарду."
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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."
@@ -3471,19 +3471,19 @@ msgstr ""
 "Датум и време прављења првобитне фотографије. За дигиталне фото-апарате "
 "памте �е датум и време �ликања."
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3499,11 +3499,11 @@ msgstr ""
 "ознака је обезбеђена када компре�овани подаци кори�те компоненте другације "
 "од Y, Cb, и Cr и да би �е обезбедила подршка за друге �еквенце."
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr "Сажети бити по пик�елу"
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -3511,11 +3511,11 @@ msgstr ""
 "Информације везане за �ажете податке. Мод за �ажимање који �е кори�ти за "
 "�ажимање �лика �е мери у јединици битови по пик�елу."
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr ""
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -3523,15 +3523,15 @@ msgstr ""
 "Брзина затварача. Јединица је у  APEX (Additive System of Photographic "
 "Exposure) подешавању."
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Отвор �очива. Јединица је у APEX вредно�ти."
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Светлина"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -3539,11 +3539,11 @@ msgstr ""
 "Вредно�т �ветлине. Јединица је вредно�т APEX-а. Обично је у оп�егу -99.99 to "
 "99.99."
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr "�агиб о�ветљења"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -3551,11 +3551,11 @@ msgstr ""
 "Претпо�тавка о�ветљења. Јединица је вредно�т APEX-а. Обично је у оп�егу "
 "-99.99 to 99.99."
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr ""
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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."
@@ -3563,34 +3563,34 @@ msgstr ""
 "�ајмањи број F �очива. Јединица је вредно�т APEX-а. Обично је у оп�егу 00.00 "
 "to 99.99, али није ограничена у овом оп�егу."
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr "Удаљено�т �убјекта"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr "Удаљено�т �убјекта у метрима."
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr "Мод за мерење."
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "Извор �ветла"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr "Вр�та извора"
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "Ова етикета �е попуни када �е фотографише уз помоћ електрон�ког блица "
 "(�троба)."
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -3598,26 +3598,26 @@ msgstr ""
 "Стварна жижна даљина �очива у mm. �ема претварања за жижну даљину 35 mm "
 "филм�ке камере."
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr "Обла�т �убјекта"
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 "Ова етикета означава положај и ме�то главног �убјекта на �веобухватној �лици."
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr "TIFF/EP �тандардни ID"
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr "Белешка аутора"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -3625,11 +3625,11 @@ msgstr ""
 "Етикета за призвођача Exif у којој �мешта жељене информације. Садржај зави�и "
 "од произвођача."
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "Белешка кори�ника"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3651,86 +3651,86 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr "Етикета која памти делиће �екунде за етикету <DateTime>."
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr "Етикета која памти делиће �екунде за етикету <DateTimeOriginal>."
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr "Етикета која памти делиће �екунде за етикету <DateTimeDigitized>."
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr "XP на�лов"
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr "XP примедба"
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr "XP аутор"
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr "XP кључне речи"
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr "XP �убјекат"
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "Верзија FlashPix формата подржана од FPXR фајла."
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Палета боја"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3744,11 +3744,11 @@ msgstr ""
 "по�тавља �е Uncalibrated (=FFFF.H) - некалибри�ан. Подаци �лике �ачуване као "
 "Uncalibrated могу �е третирати као sRGB када �е конвертују у FlashPix."
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3760,11 +3760,11 @@ msgstr ""
 "ознаци, без обзира на то да ли по�тоје поравњавајући подаци или маркер "
 "ре�тарта. Ова ознака не би требало да �е налази у некомпре�ованом фајлу."
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3774,11 +3774,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3803,11 +3803,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3816,11 +3816,11 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr "Стање енергије блица"
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -3828,42 +3828,42 @@ msgstr ""
 "Означава вредно�т �троба (блица) када је �лика направљена и мери �е Beam "
 "Candle Power Seconds (BCPS)."
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr "Про�торни одговор уче�тано�ти"
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -3871,11 +3871,11 @@ msgstr ""
 "Означава јединицу мере за <FocalPlaneXResolution> и <FocalPlaneYResolution>. "
 "Ова вредно�т је и�та као код <ResolutionUnit>."
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr "Положај �убјеката"
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3888,30 +3888,30 @@ msgstr ""
 "окретања у етикети 'Окретање'. Прва вредно�т означава број X колоне, а "
 "друга   Y"
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 "Означава вредно�т о�ветљења на апарату или улазном уређају када је у�ликано."
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr "Означава тип �ензора на апарату или улазном уређају."
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Извор фајла"
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -3919,11 +3919,11 @@ msgstr ""
 "Означава извор фотографије. �ко је DSC у�ликао фотографију, вредно�т етикете "
 "мора увек бити 3, означавајући да је фотографија у�ликана на DSC."
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr "Вр�та призора"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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."
@@ -3931,33 +3931,33 @@ msgstr ""
 "Означава вр�ту призора. �ко је DSC у�ликао фотографију, вредно�т етикете "
 "мора увек бити 1, означавајући да је фотографија непо�редно у�ликана."
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr "Прилагођено рендеровање"
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr "Ова етикета означава вредно�т мода равнотеже беле када је у�ликано."
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr "Одно� дигитално увећања"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 "
@@ -3966,22 +3966,22 @@ msgstr ""
 "Ова етикета означава вредно�т дигиталног увећања када је �ликано. Вредно�т 0 "
 "означава да дигитално увећање није коришћено."
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr ""
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
@@ -3991,15 +3991,15 @@ msgstr ""
 "запамти мод у којем је �ликано. Приметите да �е разликује од етикете типа "
 "�лике <SceneType>."
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr "Задобиј контролу"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -4007,7 +4007,7 @@ msgstr ""
 "Етикета означава �мер обраде контра�та који је апарат применио када је "
 "у�ликао."
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -4015,37 +4015,37 @@ msgstr ""
 "Етикета означава �мер обраде за�ићења који је апарат применио када је "
 "у�ликао."
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 "Етикета означава �мер обраде оштрине која је апарат применио када је у�ликао."
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr ""
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr "Оп�ег удаљено�ти �убјекта"
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr "Ова етикета означава удаљено�т �убјекта."
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr "Једин�твени ID �лике"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 "
@@ -4054,27 +4054,27 @@ msgstr ""
 "Етикета једин�твено обележава �ваку фотографију. Памти �е као ASCII �тринг "
 "који је једнак хек�адецималној бележењу и �талне је дужине од 128 битова."
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr "Гама"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr "Показује вредно�т коефицијента гаме."
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4252,17 +4252,11 @@ msgstr ""
 msgid "Wide2 (400%)"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr "%i бајтова непознатих података"
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr ""
@@ -4688,117 +4682,117 @@ msgstr ""
 msgid "20 frames/sec"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr "�ије изабрано ручно подешавање жиже"
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f метара"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "�епозната вредно�т %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "�утомат�ко"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr "Један додир"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr "бе�коначно"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i бајтова непознатих података: "
@@ -4900,8 +4894,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr ""
 
@@ -5073,13 +5066,11 @@ msgstr ""
 msgid "White Balance Setting"
 msgstr "Подешавање равнотеже беле"
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr ""
 
@@ -5427,11 +5418,21 @@ msgstr "3008x2008 или 3040x2024"
 msgid "Digital filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Унутрашња грешка (непозната вредно�т %i %i)"
+msgid "Internal error (unknown value %hu)"
+msgstr "Унутрашња грешка (непозната вредно�т %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Унутрашња грешка (непозната вредно�т %hu %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
+#, c-format
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Унутрашња грешка (непозната вредно�т %hi %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5634,6 +5635,9 @@ msgstr ""
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
+#~ msgid "FNumber"
+#~ msgstr "ФБрој"
+
 #~ msgid "Tag UserComment does not comply with standard but contains data."
 #~ msgstr ""
 #~ "За�тавица Кори�ничкиКоментар �е не уклапа �а �тандардом, већ �адржи "
diff --git a/po/stamp-po b/po/stamp-po
deleted file mode 100644
index 9788f70..0000000
--- a/po/stamp-po
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/po/sv.gmo b/po/sv.gmo
deleted file mode 100644
index 30c7eb2..0000000
--- a/po/sv.gmo
+++ /dev/null
diff --git a/po/sv.po b/po/sv.po
index 71391e8..49fbb93 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,20 +1,23 @@
 # Swedish translation for libexif
-# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+# Copyright © 2007, 2009, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libexif package.
 # Daniel Nylander <po@danielnylander.se>, 2007, 2009.
+# Sebastian Rasmussen <sebras@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.20\n"
+"Project-Id-Version: libexif 0.6.22-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2011-01-05 12:18+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"POT-Creation-Date: 2016-09-02 00:46+0200\n"
+"PO-Revision-Date: 2016-09-04 22:36+0800\n"
+"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -140,16 +143,14 @@ msgstr "Minskning av röda ögon"
 
 #: libexif/canon/mnote-canon-entry.c:87
 msgid "Slow synchro"
-msgstr ""
+msgstr "LÃ¥ngsam synk"
 
 #: libexif/canon/mnote-canon-entry.c:88
-#, fuzzy
 msgid "Auto, red-eye reduction"
-msgstr "Auto + minskning av röda ögon"
+msgstr "Auto, minskning av röda ögon"
 
 #: libexif/canon/mnote-canon-entry.c:89
 #: libexif/pentax/mnote-pentax-entry.c:200
-#, fuzzy
 msgid "On, red-eye reduction"
 msgstr "På, minskning av röda ögon"
 
@@ -160,7 +161,7 @@ msgstr "Extern blixt"
 #: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
 #: libexif/canon/mnote-canon-entry.c:297
 msgid "Single"
-msgstr ""
+msgstr "Enkel"
 
 #: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
 #: libexif/canon/mnote-canon-entry.c:298
@@ -173,7 +174,7 @@ msgstr "Film"
 
 #: libexif/canon/mnote-canon-entry.c:94
 msgid "Continuous, speed priority"
-msgstr ""
+msgstr "Kontinuerlig, hastighetsprioritet"
 
 #: libexif/canon/mnote-canon-entry.c:95
 msgid "Continuous, low"
@@ -185,15 +186,15 @@ msgstr "Kontinuerlig, hög"
 
 #: libexif/canon/mnote-canon-entry.c:97
 msgid "One-shot AF"
-msgstr ""
+msgstr "Enkelbildstagning AF"
 
 #: libexif/canon/mnote-canon-entry.c:98
 msgid "AI servo AF"
-msgstr ""
+msgstr "AI servo-AF"
 
 #: libexif/canon/mnote-canon-entry.c:99
 msgid "AI focus AF"
-msgstr ""
+msgstr "AF fokus-AF"
 
 #: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103
 msgid "Manual focus"
@@ -203,7 +204,7 @@ msgstr "Manuellt fokus"
 #: libexif/canon/mnote-canon-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:212
 msgid "Pan focus"
-msgstr ""
+msgstr "Panoreringsfokus"
 
 #: libexif/canon/mnote-canon-entry.c:105
 msgid "JPEG"
@@ -267,7 +268,7 @@ msgstr "Bredbild"
 
 #: libexif/canon/mnote-canon-entry.c:120
 msgid "Full auto"
-msgstr ""
+msgstr "Fullständig auto"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
@@ -334,7 +335,7 @@ msgstr "Svart och vit"
 
 #: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
 msgid "Vivid"
-msgstr ""
+msgstr "Livfull"
 
 #: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
 #: libexif/canon/mnote-canon-entry.c:434
@@ -353,11 +354,11 @@ msgstr "LÃ¥ng slutare"
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
 #: libexif/olympus/mnote-olympus-entry.c:174
 msgid "Super macro"
-msgstr ""
+msgstr "Supermakro"
 
 #: libexif/canon/mnote-canon-entry.c:138
 msgid "Foliage"
-msgstr ""
+msgstr "Lövverk"
 
 #: libexif/canon/mnote-canon-entry.c:139
 msgid "Indoor"
@@ -390,7 +391,7 @@ msgstr "Barn och djur"
 
 #: libexif/canon/mnote-canon-entry.c:145
 msgid "Night snapshot"
-msgstr ""
+msgstr "Nattlig ögonblicksbild"
 
 #: libexif/canon/mnote-canon-entry.c:146
 msgid "Digital macro"
@@ -405,14 +406,12 @@ msgid "Still image"
 msgstr "Stillbild"
 
 #: libexif/canon/mnote-canon-entry.c:149
-#, fuzzy
 msgid "Color accent"
-msgstr "Färgrymd"
+msgstr "Färgbetoning"
 
 #: libexif/canon/mnote-canon-entry.c:150
-#, fuzzy
 msgid "Color swap"
-msgstr "Färger"
+msgstr "Färgväxling"
 
 #: libexif/canon/mnote-canon-entry.c:151
 msgid "Aquarium"
@@ -460,7 +459,7 @@ msgstr "LÃ¥g"
 
 #: libexif/canon/mnote-canon-entry.c:166
 msgid "Auto high"
-msgstr ""
+msgstr "Auto hög"
 
 #: libexif/canon/mnote-canon-entry.c:168
 msgid "50"
@@ -492,7 +491,7 @@ msgstr "Standard"
 
 #: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
 msgid "Spot"
-msgstr ""
+msgstr "Punkt"
 
 #: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
 msgid "Average"
@@ -500,7 +499,7 @@ msgstr "Genomsnitt"
 
 #: libexif/canon/mnote-canon-entry.c:176
 msgid "Evaluative"
-msgstr ""
+msgstr "Utvärderande"
 
 #: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
 msgid "Partial"
@@ -508,7 +507,7 @@ msgstr "Delvis"
 
 #: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
 msgid "Center-weighted average"
-msgstr ""
+msgstr "Centrumviktat medelvärde"
 
 #: libexif/canon/mnote-canon-entry.c:181
 msgid "Not known"
@@ -524,11 +523,11 @@ msgstr "Nära"
 
 #: libexif/canon/mnote-canon-entry.c:185
 msgid "Middle range"
-msgstr ""
+msgstr "Medelintervall"
 
 #: libexif/canon/mnote-canon-entry.c:186
 msgid "Far range"
-msgstr ""
+msgstr "Avlägset intervall"
 
 #: libexif/canon/mnote-canon-entry.c:189
 #: libexif/pentax/mnote-pentax-entry.c:210
@@ -537,7 +536,7 @@ msgstr "Oändlighet"
 
 #: libexif/canon/mnote-canon-entry.c:190
 msgid "Manual AF point selection"
-msgstr ""
+msgstr "Manuell AF-punktsval"
 
 #: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
 msgid "None (MF)"
@@ -545,7 +544,7 @@ msgstr "Ingen (MF)"
 
 #: libexif/canon/mnote-canon-entry.c:192
 msgid "Auto-selected"
-msgstr ""
+msgstr "Autovald"
 
 #: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:224
@@ -557,7 +556,7 @@ msgstr "Höger"
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
 msgid "Center"
-msgstr ""
+msgstr "Centrera"
 
 #: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
 #: libexif/pentax/mnote-pentax-entry.c:220
@@ -567,11 +566,11 @@ msgstr "Vänster"
 
 #: libexif/canon/mnote-canon-entry.c:196
 msgid "Auto AF point selection"
-msgstr ""
+msgstr "Auto AF-punktsval"
 
 #: libexif/canon/mnote-canon-entry.c:197
 msgid "Easy shooting"
-msgstr ""
+msgstr "Lätt tagning"
 
 #: libexif/canon/mnote-canon-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:163
@@ -631,9 +630,8 @@ msgid "Canon EF 80-200mm f/2.8L"
 msgstr "Canon EF 80-200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:213
-#, fuzzy
 msgid "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
-msgstr "Tokina AT-X280AF PRO 28-80mm F2.8 ASPHERISK"
+msgstr "Tokina AT-X280AF PRO 28-80mm F2.8 asfärisk"
 
 #: libexif/canon/mnote-canon-entry.c:214
 msgid "Cosina 100mm f/3.5 Macro AF"
@@ -656,9 +654,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 eller Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -677,9 +674,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -930,9 +926,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -948,15 +943,15 @@ msgstr "E-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:292
 msgid "FP sync enabled"
-msgstr ""
+msgstr "FP-synkronisering aktiverad"
 
 #: libexif/canon/mnote-canon-entry.c:293
 msgid "2nd-curtain sync used"
-msgstr ""
+msgstr "Andra ridåsynkronisering använd"
 
 #: libexif/canon/mnote-canon-entry.c:294
 msgid "FP sync used"
-msgstr ""
+msgstr "FP-synkronisering använd"
 
 #: libexif/canon/mnote-canon-entry.c:295
 #: libexif/olympus/mnote-olympus-entry.c:193
@@ -970,24 +965,23 @@ msgstr "Extern"
 
 #: libexif/canon/mnote-canon-entry.c:299
 msgid "Normal AE"
-msgstr ""
+msgstr "Normal AE"
 
 #: libexif/canon/mnote-canon-entry.c:300
 msgid "Exposure compensation"
-msgstr ""
+msgstr "Exponeringskompensering"
 
 #: libexif/canon/mnote-canon-entry.c:301
 msgid "AE lock"
-msgstr ""
+msgstr "AE-lås"
 
 #: libexif/canon/mnote-canon-entry.c:302
-#, fuzzy
 msgid "AE lock + exposure compensation"
-msgstr "Exponeringskompensering"
+msgstr "AE-lås + exponeringskompensering"
 
 #: libexif/canon/mnote-canon-entry.c:303
 msgid "No AE"
-msgstr ""
+msgstr "Ingen AE"
 
 #: libexif/canon/mnote-canon-entry.c:306
 msgid "On, shot only"
@@ -1070,21 +1064,21 @@ msgstr "Manuell temperatur (Kelvin)"
 
 #: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
 msgid "PC set 1"
-msgstr ""
+msgstr "PC inställning 1"
 
 #: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "PC set 2"
-msgstr ""
+msgstr "PC inställning 2"
 
 #: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "PC set 3"
-msgstr ""
+msgstr "PC inställning 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
 #: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
-msgstr ""
+msgstr "Dagsljus fluorescerande"
 
 #: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
 msgid "Custom 1"
@@ -1103,19 +1097,16 @@ msgid "Night scene"
 msgstr "Nattscen"
 
 #: libexif/canon/mnote-canon-entry.c:355
-#, fuzzy
 msgid "Center-right"
-msgstr "Stearinljus"
+msgstr "Centrum höger"
 
 #: libexif/canon/mnote-canon-entry.c:357
-#, fuzzy
 msgid "Left-right"
-msgstr "Vänster till höger"
+msgstr "Vänster-höger"
 
 #: libexif/canon/mnote-canon-entry.c:358
-#, fuzzy
 msgid "Left-center"
-msgstr "centrerad"
+msgstr "Vänstercentrerad"
 
 #: libexif/canon/mnote-canon-entry.c:359
 msgid "All"
@@ -1123,19 +1114,19 @@ msgstr "Allt"
 
 #: libexif/canon/mnote-canon-entry.c:361
 msgid "On (shot 1)"
-msgstr ""
+msgstr "PÃ¥ (tagning 1)"
 
 #: libexif/canon/mnote-canon-entry.c:362
 msgid "On (shot 2)"
-msgstr ""
+msgstr "PÃ¥ (tagning 2)"
 
 #: libexif/canon/mnote-canon-entry.c:363
 msgid "On (shot 3)"
-msgstr ""
+msgstr "PÃ¥ (tagning 3)"
 
 #: libexif/canon/mnote-canon-entry.c:365
 msgid "EOS high-end"
-msgstr ""
+msgstr "EOS högkvalitet"
 
 #: libexif/canon/mnote-canon-entry.c:366
 msgid "Compact"
@@ -1143,7 +1134,7 @@ msgstr "Kompakt"
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
-msgstr ""
+msgstr "EOS mellankvalitet"
 
 #: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotate 90 CW"
@@ -1174,16 +1165,16 @@ msgstr "Höger till vänster"
 #: libexif/canon/mnote-canon-entry.c:386
 #: libexif/olympus/mnote-olympus-entry.c:618
 msgid "Bottom to top"
-msgstr ""
+msgstr "Nederkant till överkant"
 
 #: libexif/canon/mnote-canon-entry.c:387
 #: libexif/olympus/mnote-olympus-entry.c:621
 msgid "Top to bottom"
-msgstr ""
+msgstr "Överkant till nederkant"
 
 #: libexif/canon/mnote-canon-entry.c:388
 msgid "2x2 matrix (clockwise)"
-msgstr ""
+msgstr "2x2-matris (medurs)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
@@ -1215,29 +1206,27 @@ msgstr "Dagsljus"
 
 #: libexif/canon/mnote-canon-entry.c:422
 msgid "Set 1"
-msgstr ""
+msgstr "Uppsättning 1"
 
 #: libexif/canon/mnote-canon-entry.c:423
 msgid "Set 2"
-msgstr ""
+msgstr "Uppsättning 2"
 
 #: libexif/canon/mnote-canon-entry.c:424
 msgid "Set 3"
-msgstr ""
+msgstr "Uppsättning 3"
 
 #: libexif/canon/mnote-canon-entry.c:425
-#, fuzzy
 msgid "User def. 1"
-msgstr "Användare 1"
+msgstr "Användardefinierad 1"
 
 #: libexif/canon/mnote-canon-entry.c:426
-#, fuzzy
 msgid "User def. 2"
-msgstr "Användare 2"
+msgstr "Användardefinierad 2"
 
 #: libexif/canon/mnote-canon-entry.c:427
 msgid "User def. 3"
-msgstr ""
+msgstr "Användardefinierad 3"
 
 #: libexif/canon/mnote-canon-entry.c:428
 msgid "External 1"
@@ -1253,7 +1242,7 @@ msgstr "Extern 3"
 
 #: libexif/canon/mnote-canon-entry.c:435
 msgid "Faithful"
-msgstr ""
+msgstr "Trogen"
 
 #: libexif/canon/mnote-canon-entry.c:436
 #: libexif/olympus/mnote-olympus-entry.c:118
@@ -1365,7 +1354,7 @@ msgstr "Blixtläge"
 
 #: libexif/canon/mnote-canon-tag.c:60 libexif/pentax/mnote-pentax-tag.c:101
 msgid "Drive Mode"
-msgstr ""
+msgstr "Körläge"
 
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
@@ -1386,7 +1375,7 @@ msgstr "Bildstorlek"
 
 #: libexif/canon/mnote-canon-tag.c:64
 msgid "Easy Shooting Mode"
-msgstr ""
+msgstr "Lätt tagningsläge"
 
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
@@ -1422,15 +1411,15 @@ msgstr "ISO"
 #: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
-msgstr "Mätläge"
+msgstr "Mätningsläge"
 
 #: libexif/canon/mnote-canon-tag.c:71 libexif/olympus/mnote-olympus-tag.c:133
 msgid "Focus Range"
-msgstr "Fokusvidd"
+msgstr "Fokusintervall"
 
 #: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
 msgid "AF Point"
-msgstr ""
+msgstr "AF-punkt"
 
 #: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
 msgid "Exposure Mode"
@@ -1439,19 +1428,19 @@ msgstr "Exponeringsläge"
 #: libexif/canon/mnote-canon-tag.c:74 libexif/olympus/mnote-olympus-tag.c:61
 #: libexif/pentax/mnote-pentax-tag.c:106
 msgid "Lens Type"
-msgstr "Linstyp"
+msgstr "Objektivtyp"
 
 #: libexif/canon/mnote-canon-tag.c:75
 msgid "Long Focal Length of Lens"
-msgstr "Lång brännvidd för lins"
+msgstr "Lång brännvidd för objektiv"
 
 #: libexif/canon/mnote-canon-tag.c:76
 msgid "Short Focal Length of Lens"
-msgstr "Kort brännvidd för lins"
+msgstr "Kort brännvidd för objektiv"
 
 #: libexif/canon/mnote-canon-tag.c:77
 msgid "Focal Units per mm"
-msgstr ""
+msgstr "Fokalenheter per mm"
 
 #: libexif/canon/mnote-canon-tag.c:78
 msgid "Maximal Aperture"
@@ -1478,18 +1467,16 @@ msgid "Image Stabilization"
 msgstr "Bildstabilisering"
 
 #: libexif/canon/mnote-canon-tag.c:85
-#, fuzzy
 msgid "Display Aperture"
-msgstr "Bländare"
+msgstr "Visa bländare"
 
 #: libexif/canon/mnote-canon-tag.c:86
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Källbredd för zoom"
 
 #: libexif/canon/mnote-canon-tag.c:87
-#, fuzzy
 msgid "Zoom Target Width"
-msgstr "Bildbredd"
+msgstr "Zoommålbredd"
 
 #: libexif/canon/mnote-canon-tag.c:88
 msgid "Photo Effect"
@@ -1497,7 +1484,7 @@ msgstr "Fotoeffekt"
 
 #: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
 msgid "Manual Flash Output"
-msgstr ""
+msgstr "Manuell blixtutmatning"
 
 #: libexif/canon/mnote-canon-tag.c:90
 msgid "Color Tone"
@@ -1509,33 +1496,31 @@ msgstr "Bränntyp"
 
 #: libexif/canon/mnote-canon-tag.c:93
 msgid "Focal Plane X Size"
-msgstr ""
+msgstr "X-storlek för fokalplan"
 
 #: libexif/canon/mnote-canon-tag.c:94
 msgid "Focal Plane Y Size"
-msgstr ""
+msgstr "Y-storlek för fokalplan"
 
 #: libexif/canon/mnote-canon-tag.c:95
 msgid "Auto ISO"
-msgstr ""
+msgstr "Auto-ISO"
 
 #: libexif/canon/mnote-canon-tag.c:96
 msgid "Shot ISO"
-msgstr ""
+msgstr "Tagen ISO"
 
 #: libexif/canon/mnote-canon-tag.c:97
 msgid "Measured EV"
-msgstr ""
+msgstr "Mätt EV"
 
 #: libexif/canon/mnote-canon-tag.c:98
-#, fuzzy
 msgid "Target Aperture"
-msgstr "Bländare"
+msgstr "Målbländare"
 
 #: libexif/canon/mnote-canon-tag.c:99
-#, fuzzy
 msgid "Target Exposure Time"
-msgstr "Bländartid"
+msgstr "Exponeringstid för mål"
 
 #: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
 #: libexif/pentax/mnote-pentax-tag.c:81
@@ -1559,35 +1544,34 @@ msgid "Sequence Number"
 msgstr "Sekvensnummer"
 
 #: libexif/canon/mnote-canon-tag.c:104
-#, fuzzy
 msgid "Flash Guide Number"
-msgstr "Blixt finns i kamera"
+msgstr "Blixtguidetal"
 
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
 msgid "Flash Exposure Compensation"
-msgstr ""
+msgstr "Exponeringskompensering för blixt"
 
 #: libexif/canon/mnote-canon-tag.c:107
-#, fuzzy
 msgid "AE Bracketing"
-msgstr "AE-inställning"
+msgstr "AE-gaffling"
 
 #: libexif/canon/mnote-canon-tag.c:108
 msgid "AE Bracket Value"
-msgstr ""
+msgstr "AE-gafflingsvärde"
 
 #: libexif/canon/mnote-canon-tag.c:109
 msgid "Focus Distance Upper"
-msgstr ""
+msgstr "Fokusavstånd övre"
 
 #: libexif/canon/mnote-canon-tag.c:110
 msgid "Focus Distance Lower"
-msgstr ""
+msgstr "Fokusavstånd nedre"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "FNummer"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:469
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "F-nummer"
 
 #: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
 #: libexif/pentax/mnote-pentax-tag.c:78
@@ -1595,42 +1579,36 @@ msgid "Exposure Time"
 msgstr "Slutartid"
 
 #: libexif/canon/mnote-canon-tag.c:113
-#, fuzzy
 msgid "Bulb Duration"
-msgstr "Illustrationer"
+msgstr "Varaktighet för blixt"
 
 #: libexif/canon/mnote-canon-tag.c:114
 msgid "Camera Type"
 msgstr "Kameratyp"
 
 #: libexif/canon/mnote-canon-tag.c:115
-#, fuzzy
 msgid "Auto Rotate"
-msgstr "Automatisk"
+msgstr "Automatisk rotation"
 
 #: libexif/canon/mnote-canon-tag.c:116
-#, fuzzy
 msgid "ND Filter"
-msgstr "Digitalt filter?"
+msgstr "ND-filter"
 
 #: libexif/canon/mnote-canon-tag.c:119
-#, fuzzy
 msgid "Panorama Frame"
-msgstr "Panorama"
+msgstr "Panoramaram"
 
 #: libexif/canon/mnote-canon-tag.c:120
-#, fuzzy
 msgid "Panorama Direction"
-msgstr "Panorama"
+msgstr "Panoramariktning"
 
 #: libexif/canon/mnote-canon-tag.c:121
 msgid "Tone Curve"
 msgstr "Tonkurva"
 
 #: libexif/canon/mnote-canon-tag.c:122
-#, fuzzy
 msgid "Sharpness Frequency"
-msgstr "Skärpa"
+msgstr "Skärpningsfrekvens"
 
 #: libexif/canon/mnote-canon-tag.c:124
 msgid "Picture Style"
@@ -1646,11 +1624,11 @@ msgstr "Intel"
 
 #: libexif/exif-data.c:780
 msgid "Size of data too small to allow for EXIF data."
-msgstr ""
+msgstr "Storlek på data för liten för att tillåta EXIF-data."
 
 #: libexif/exif-data.c:841
 msgid "EXIF marker not found."
-msgstr ""
+msgstr "EXIF-markör hittades inte."
 
 #: libexif/exif-data.c:868
 msgid "EXIF header not found."
@@ -1673,59 +1651,43 @@ msgid "Follow specification"
 msgstr "Följ specifikation"
 
 #: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Lägg till, korrigera och tag bort poster för att få EXIF-data som följer specifikationen."
 
 #: libexif/exif-data.c:1183
 msgid "Do not change maker note"
-msgstr ""
+msgstr "Ändra inte tillverkaranteckning"
 
 #: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Vid inläsning och omsparning av Exif-data kommer tillverkaranteckningen att vara oförändrad. Var medveten om att tillverkaranteckningen kan bli korrupt."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Taggen �%s� var på formatet �%s� (vilket inte är enligt specifikation) och har ändrats till formatet �%s�."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Taggen �%s� är på formatet �%s� (vilket inte är enligt specifikation) men kan inte ändras till formatet �%s�."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Taggen �UserComment� har ett ogiltigt format �%s�. Formatet har ställs in till �undefined�."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Taggen �Usercomment� har expanderats till åtminstone 8 byte för att följa specifikationen."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Taggen �UserComment� är inte tom men börjar inte med en formatidentifierare. Detta har åtgärdats."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Taggen �UserComment� började inte med en formatidentifierare. Detta har fixats."
 
 #: libexif/exif-entry.c:462
 #, c-format
@@ -1735,27 +1697,25 @@ msgstr "%i byte odefinierat data"
 #: libexif/exif-entry.c:585
 #, c-format
 msgid "%i bytes unsupported data type"
-msgstr "%i byte av datatyp som inte stöds "
+msgstr "%i byte av datatyp som inte stöds"
 
 #: libexif/exif-entry.c:642
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
+msgstr "Taggen �%s� innehåller data i ett ogiltigt format (�%s�, förväntade �%s�)."
 
 #: libexif/exif-entry.c:655
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr ""
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "Taggen �%s� innehåller ett ogiltigt antal komponenter (%i, förväntade %i)."
 
 #: libexif/exif-entry.c:669
 msgid "Chunky format"
-msgstr ""
+msgstr "Uppstyckat format"
 
 #: libexif/exif-entry.c:669
-#, fuzzy
 msgid "Planar format"
-msgstr "Panorama"
+msgstr "Planärt format"
 
 #: libexif/exif-entry.c:671 libexif/exif-entry.c:763
 #: test/nls/test-codeset.c:54
@@ -1764,69 +1724,66 @@ msgstr "Inte definierad"
 
 #: libexif/exif-entry.c:671
 msgid "One-chip color area sensor"
-msgstr ""
+msgstr "En-chips färgområdessensor"
 
 #: libexif/exif-entry.c:672
 msgid "Two-chip color area sensor"
-msgstr ""
+msgstr "Två-chips färgområdessensor"
 
 #: libexif/exif-entry.c:672
 msgid "Three-chip color area sensor"
-msgstr ""
+msgstr "Tre-chips färgområdessensor"
 
 #: libexif/exif-entry.c:673
 msgid "Color sequential area sensor"
-msgstr ""
+msgstr "Sekventiell färgområdessensor"
 
 #: libexif/exif-entry.c:673
 msgid "Trilinear sensor"
-msgstr ""
+msgstr "Trilinjär sensor"
 
 #: libexif/exif-entry.c:674
 msgid "Color sequential linear sensor"
-msgstr ""
+msgstr "Linjär sekventiell färgsensor"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
-msgstr ""
+msgstr "Övre vänster"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
-msgstr ""
+msgstr "Övre höger"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
-msgstr ""
+msgstr "Nedre höger"
 
 #: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
-msgstr ""
+msgstr "Nedre vänster"
 
 #: libexif/exif-entry.c:677
-#, fuzzy
 msgid "Left-top"
-msgstr "Vänster"
+msgstr "Vänster toppen"
 
 #: libexif/exif-entry.c:677
-#, fuzzy
 msgid "Right-top"
-msgstr "Höger"
+msgstr "Höger toppen"
 
 #: libexif/exif-entry.c:678
 msgid "Right-bottom"
-msgstr ""
+msgstr "Höger nedre"
 
 #: libexif/exif-entry.c:678
 msgid "Left-bottom"
-msgstr ""
+msgstr "Vänster nedre"
 
 #: libexif/exif-entry.c:680
-#, fuzzy
 msgid "Centered"
-msgstr "centrerad"
+msgstr "Centrerad"
 
+# sebras: PÃ¥ samma plats?
 #: libexif/exif-entry.c:680
-#, fuzzy
 msgid "Co-sited"
 msgstr "Nära"
 
@@ -1876,7 +1833,7 @@ msgstr "Manuell exponering"
 
 #: libexif/exif-entry.c:687
 msgid "Auto bracket"
-msgstr ""
+msgstr "Autogaffling"
 
 #: libexif/exif-entry.c:689
 msgid "Auto white balance"
@@ -1888,19 +1845,19 @@ msgstr "Manuell vitbalans"
 
 #: libexif/exif-entry.c:694
 msgid "Low gain up"
-msgstr ""
+msgstr "Låg förstärkning upp"
 
 #: libexif/exif-entry.c:694
 msgid "High gain up"
-msgstr ""
+msgstr "Hög förstärkning upp"
 
 #: libexif/exif-entry.c:695
 msgid "Low gain down"
-msgstr ""
+msgstr "Låg förstärkning ner"
 
 #: libexif/exif-entry.c:695
 msgid "High gain down"
-msgstr ""
+msgstr "Hög förstärkning ner"
 
 #: libexif/exif-entry.c:697
 msgid "Low saturation"
@@ -1937,17 +1894,16 @@ msgid "Unknown"
 msgstr "Okänd"
 
 #: libexif/exif-entry.c:716
-#, fuzzy
 msgid "Avg"
-msgstr "medel"
+msgstr "Medel"
 
 #: libexif/exif-entry.c:717
 msgid "Center-weight"
-msgstr ""
+msgstr "Centrumvikt"
 
 #: libexif/exif-entry.c:719
 msgid "Multi spot"
-msgstr ""
+msgstr "Fler-punkter"
 
 #: libexif/exif-entry.c:720
 msgid "Pattern"
@@ -1975,7 +1931,7 @@ msgstr "PackBits-komprimering"
 
 #: libexif/exif-entry.c:736
 msgid "Tungsten incandescent light"
-msgstr ""
+msgstr "Glödlampsljus"
 
 #: libexif/exif-entry.c:738
 msgid "Fine weather"
@@ -1988,28 +1944,28 @@ msgstr "Molnigt väder"
 #: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
-msgstr ""
+msgstr "Dagsljus vitt fluorescerande"
 
 #: libexif/exif-entry.c:743
 msgid "Cool white fluorescent"
-msgstr ""
+msgstr "Kallt vitt fluorescerande"
 
 #: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
-msgstr ""
+msgstr "Vitt fluorescerande"
 
 #: libexif/exif-entry.c:745
 msgid "Standard light A"
-msgstr ""
+msgstr "Standardljus A"
 
 #: libexif/exif-entry.c:746
 msgid "Standard light B"
-msgstr ""
+msgstr "Standardljus B"
 
 #: libexif/exif-entry.c:747
 msgid "Standard light C"
-msgstr ""
+msgstr "Standardljus C"
 
 #: libexif/exif-entry.c:748
 msgid "D55"
@@ -2025,7 +1981,7 @@ msgstr "D75"
 
 #: libexif/exif-entry.c:751
 msgid "ISO studio tungsten"
-msgstr ""
+msgstr "ISO studioglödlampa"
 
 #: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Inch"
@@ -2065,15 +2021,15 @@ msgstr "Slutare"
 
 #: libexif/exif-entry.c:768
 msgid "Creative program (biased toward depth of field)"
-msgstr ""
+msgstr "Kreativt program (inriktat mot bilddjup)"
 
 #: libexif/exif-entry.c:769
 msgid "Creative"
-msgstr ""
+msgstr "Kreativt"
 
 #: libexif/exif-entry.c:770
 msgid "Creative program (biased toward fast shutter speed)"
-msgstr ""
+msgstr "Kreativt program (inriktat mot snabb slutartid)"
 
 #: libexif/exif-entry.c:771
 msgid "Action"
@@ -2081,11 +2037,11 @@ msgstr "Åtgärd"
 
 #: libexif/exif-entry.c:772
 msgid "Portrait mode (for closeup photos with the background out of focus)"
-msgstr ""
+msgstr "Stående läge (för närbildsfoton med bakgrunden ut fokus)"
 
 #: libexif/exif-entry.c:774
 msgid "Landscape mode (for landscape photos with the background in focus)"
-msgstr ""
+msgstr "Liggande (för liggande foton med bakgrunden i fokus)"
 
 #: libexif/exif-entry.c:778 libexif/exif-entry.c:783
 #: libexif/olympus/mnote-olympus-entry.c:100
@@ -2093,9 +2049,8 @@ msgid "Flash did not fire"
 msgstr "Blixt inte utlöst"
 
 #: libexif/exif-entry.c:778
-#, fuzzy
 msgid "No flash"
-msgstr "ingen blixt"
+msgstr "Ingen blixt"
 
 #: libexif/exif-entry.c:779
 msgid "Flash fired"
@@ -2111,19 +2066,19 @@ msgstr "Ja"
 
 #: libexif/exif-entry.c:780
 msgid "Strobe return light not detected"
-msgstr ""
+msgstr "Spegling från strobljus inte detekterat"
 
 #: libexif/exif-entry.c:780
 msgid "Without strobe"
-msgstr ""
+msgstr "Utan strobljus"
 
 #: libexif/exif-entry.c:782
 msgid "Strobe return light detected"
-msgstr ""
+msgstr "Spegling från strobljus detekterat"
 
 #: libexif/exif-entry.c:782
 msgid "With strobe"
-msgstr ""
+msgstr "Med strobljus"
 
 #: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode"
@@ -2131,12 +2086,11 @@ msgstr "Blixt avfyrad, tvingat blixtläge"
 
 #: libexif/exif-entry.c:785
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
-"Blixt utlöst, tvingat blixtläge, återreflekterat blixtljus inte upptäckt"
+msgstr "Blixt utlöst, tvingat blixtläge, reflekterat blixtljus inte upptäckt"
 
 #: libexif/exif-entry.c:787
 msgid "Flash fired, compulsory flash mode, return light detected"
-msgstr "Blixt utlöst, tvingat blixtläge, återreflekterat blixtljus upptäckt"
+msgstr "Blixt utlöst, tvingat blixtläge, reflekterat blixtljus upptäckt"
 
 #: libexif/exif-entry.c:789
 msgid "Flash did not fire, compulsory flash mode"
@@ -2152,12 +2106,11 @@ msgstr "Blixt utlöst, automatiskt läge"
 
 #: libexif/exif-entry.c:792
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
-"Blixt utlöst, automatiskt läge, återreflekterat blixtljus inte upptäckt"
+msgstr "Blixt utlöst, automatiskt läge, reflekterat blixtljus inte upptäckt"
 
 #: libexif/exif-entry.c:794
 msgid "Flash fired, auto mode, return light detected"
-msgstr "Blixt utlöst, automatiskt läge, återreflekterat blixtljus upptäckt"
+msgstr "Blixt utlöst, automatiskt läge, reflekterat blixtljus upptäckt"
 
 #: libexif/exif-entry.c:795
 msgid "No flash function"
@@ -2169,33 +2122,23 @@ msgstr "Blixt utlöst, minskning av röda ögon"
 
 #: libexif/exif-entry.c:797
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
-"Blixt utlöst, minskning av röda ögon, återreflekterat blixtljus inte upptäckt"
+msgstr "Blixt utlöst, minskning av röda ögon, reflekterat blixtljus inte upptäckt"
 
 #: libexif/exif-entry.c:799
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
-"Blixt utlöst, minskning av röda ögon, återreflekterat blixtljus upptäckt"
+msgstr "Blixt utlöst, minskning av röda ögon, reflekterat blixtljus upptäckt"
 
 #: libexif/exif-entry.c:801
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "Blixt utlöst, tvingat blixtläge, minskning av röda ögon"
 
 #: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"Blixt utlöst, tvingat blixtläge, minskning av röda ögon, återreflekterat "
-"blixtljus inte upptäckt"
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "Blixt utlöst, tvingat blixtläge, minskning av röda ögon, reflekterat blixtljus inte upptäckt"
 
 #: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"Blixt utlöst, tvingat blixtläge, minskning av röda ögon, återreflekterat "
-"blixtljus upptäckt"
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "Blixt utlöst, tvingat blixtläge, minskning av röda ögon, reflekterat blixtljus upptäckt"
 
 #: libexif/exif-entry.c:807
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
@@ -2206,17 +2149,12 @@ msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "Blixt utlöst, automatiskt läge, minskning av röda ögon"
 
 #: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"Blixt utlöst, automatiskt läge, återreflekterat blixtljus inte upptäckt, "
-"minskning av röda ögon"
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "Blixt utlöst, automatiskt läge, reflekterat blixtljus inte upptäckt, minskning av röda ögon"
 
 #: libexif/exif-entry.c:811
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"Blixt utlöst, automatiskt läge, återreflekterat blixtljus upptäckt, "
-"minskning av röda ögon"
+msgstr "Blixt utlöst, automatiskt läge, reflekterat blixtljus upptäckt, minskning av röda ögon"
 
 #: libexif/exif-entry.c:815
 msgid "?"
@@ -2224,15 +2162,15 @@ msgstr "?"
 
 #: libexif/exif-entry.c:817
 msgid "Close view"
-msgstr ""
+msgstr "Stäng vy"
 
 #: libexif/exif-entry.c:818
 msgid "Distant view"
-msgstr ""
+msgstr "Vidsträckt vy"
 
 #: libexif/exif-entry.c:818
 msgid "Distant"
-msgstr ""
+msgstr "Fjärran"
 
 #: libexif/exif-entry.c:821
 msgid "sRGB"
@@ -2249,7 +2187,7 @@ msgstr "Okalibrerad"
 #: libexif/exif-entry.c:878
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
-msgstr ""
+msgstr "Ogiltig poststorlek (%i, förväntade %li x %i)."
 
 #: libexif/exif-entry.c:911
 msgid "Unsupported UNICODE string"
@@ -2261,12 +2199,12 @@ msgstr "JIS-strängen stöds inte"
 
 #: libexif/exif-entry.c:935
 msgid "Tag UserComment contains data but is against specification."
-msgstr ""
+msgstr "Tagg UserComment innehåller data men följer inte specifikationen."
 
 #: libexif/exif-entry.c:939
 #, c-format
 msgid "Byte at position %i: 0x%02x"
-msgstr ""
+msgstr "Byte vid position %i: 0x%02x"
 
 #: libexif/exif-entry.c:947
 msgid "Unknown Exif Version"
@@ -2289,9 +2227,9 @@ msgstr "FlashPix version 1.01"
 msgid "Unknown FlashPix Version"
 msgstr "Okänd FlashPix-version"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1668
+#: libexif/exif-entry.c:1673 libexif/exif-entry.c:1677
+#: libexif/exif-entry.c:1682 libexif/exif-entry.c:1683
 msgid "[None]"
 msgstr "[Ingen]"
 
@@ -2317,7 +2255,7 @@ msgstr " (f/%.01f)"
 #: libexif/exif-entry.c:1059
 #, c-format
 msgid " (35 equivalent: %d mm)"
-msgstr ""
+msgstr " (35-ekvivalent: %d mm)"
 
 #: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
 msgid " sec."
@@ -2381,13 +2319,12 @@ msgid "B"
 msgstr "B"
 
 #: libexif/exif-entry.c:1149
-#, fuzzy
 msgid "Reserved"
-msgstr "reserverad"
+msgstr "Reserverad"
 
 #: libexif/exif-entry.c:1172
 msgid "Directly photographed"
-msgstr ""
+msgstr "Direktfotograferad"
 
 #: libexif/exif-entry.c:1185
 msgid "YCbCr4:2:2"
@@ -2400,17 +2337,17 @@ msgstr "YCbCr4:2:0"
 #: libexif/exif-entry.c:1204
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
-msgstr ""
+msgstr "Inom avstånd %i av (x,y) = (%i,%i)"
 
 #: libexif/exif-entry.c:1213
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
-msgstr ""
+msgstr "Inom rektangel (bredd %i, höjd %i) runt (x,y) = (%i,%i)"
 
 #: libexif/exif-entry.c:1219
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
-msgstr ""
+msgstr "Oväntat antal komponenter (%li, förväntade 2, 3 eller 4)."
 
 #: libexif/exif-entry.c:1257
 msgid "Sea level"
@@ -2418,7 +2355,7 @@ msgstr "Havsnivå"
 
 #: libexif/exif-entry.c:1259
 msgid "Sea level reference"
-msgstr ""
+msgstr "Havsnivåreferens"
 
 #: libexif/exif-entry.c:1367
 #, c-format
@@ -2431,11 +2368,11 @@ msgstr "Kort"
 
 #: libexif/exif-format.c:38
 msgid "Rational"
-msgstr ""
+msgstr "Rational"
 
 #: libexif/exif-format.c:39
 msgid "SRational"
-msgstr ""
+msgstr "SRational"
 
 #: libexif/exif-format.c:40
 msgid "Undefined"
@@ -2455,19 +2392,19 @@ msgstr "Byte"
 
 #: libexif/exif-format.c:44
 msgid "SByte"
-msgstr ""
+msgstr "SByte"
 
 #: libexif/exif-format.c:45
 msgid "SShort"
-msgstr ""
+msgstr "SShort"
 
 #: libexif/exif-format.c:46
 msgid "SLong"
-msgstr ""
+msgstr "SLong"
 
 #: libexif/exif-format.c:47
 msgid "Float"
-msgstr ""
+msgstr "Float"
 
 #: libexif/exif-format.c:48
 msgid "Double"
@@ -2480,7 +2417,7 @@ msgstr "Filen \"%s\" kunde inte öppnas."
 
 #: libexif/exif-loader.c:300
 msgid "The data supplied does not seem to contain EXIF data."
-msgstr ""
+msgstr "Data som tillhandahölls verkar inte innehålla EXIF-data."
 
 #: libexif/exif-log.c:43
 msgid "Debugging information"
@@ -2496,7 +2433,7 @@ msgstr "Inte tillräckligt mycket minne"
 
 #: libexif/exif-log.c:46
 msgid "The system cannot provide enough memory."
-msgstr ""
+msgstr "Systemet kan inte tillhandahålla tillräckligt med minne."
 
 #: libexif/exif-log.c:47
 msgid "Corrupt data"
@@ -2504,441 +2441,330 @@ msgstr "Skadat data"
 
 #: libexif/exif-log.c:48
 msgid "The data provided does not follow the specification."
-msgstr ""
+msgstr "Data som tillhandahölls följer inte specifikationen."
 
 #: libexif/exif-tag.c:62
-#, fuzzy
 msgid "GPS Tag Version"
-msgstr "Bildbeskrivning"
+msgstr "GPS-tagg version"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Indikerar versionen av <GPSInfoIFD>. Versionen anges som 2.0.0.0. Denna tagg är obligatorisk när <GPSInfo>-taggen finns. (Notera: Taggen <GPSVersionID> anges i byte, till skillnad från <ExifVersion>-taggen. När versionen är 2.0.0.0 är taggvärdet 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
-msgstr ""
+msgstr "Interoperatbilietsindex"
 
+# sebras: Report lower case initial character?
 #: libexif/exif-tag.c:70
-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 ""
+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 "Indikerar identifieringen av interoperabilitetsregeln. Använd �R98� för att ange ExifR98-regler. Fyra byte används inklusive avslutningskoden (NULL). Se det separata dokumentet Recommended Exif Interoperability Rules (ExifR98) för andra taggar som används för ExifR98."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
 msgstr "Nordlig eller sydlig latitud"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Indikerar huruvida latituden är nordlig eller sydlig latitud. ASCII-värdet �N� indikerar nordlig latitud och �S� sydlig latitud."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
-msgstr ""
+msgstr "Interoperabilitetsversion"
 
 #: libexif/exif-tag.c:83
 msgid "Latitude"
 msgstr "Latitud"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Indikerar latituden. Latituden uttrycks som tre RATIONAL-värden som anger grader, minuter respektive sekunder. När grader, minuter och sekunder uttrycks är formatet dd/1,mm/1,ss/1. När grader och minuter används och till exempel delar av minuter anges i upp till två decimalplatser är formatet dd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
 msgstr "Östlig eller västlig longitud"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Indikerar huruvida longituden är en östlig eller västlig longitud. ASCII �E� indikerar östlig longitud och �W� västlig longitud."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
 msgstr "Longitud"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Indikerar latituden. Latituden uttrycks som tre RATIONAL-värden som anger grader, minuter respektive sekunder. När grader, minuter och sekunder uttrycks är formatet ddd/1,mm/1,ss/1. När grader och minuter används och till exempel delar av minuter anges i upp till två decimalplatser är formatet ddd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:103
-#, fuzzy
 msgid "Altitude Reference"
 msgstr "Höjdreferens"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
+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 is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GPSAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags."
+msgstr "Indikerar höjden använd som referenshöjd. Om referensen är havsnivå och höjden är över havsnivån anges 0. Om höjden är under havsnivå anges värdet 1 och höjden indikeras som ett absolutvärde i taggen GPSAltitude. Referensenheten är meter. Notera att denna tagg är av typen BYTE, till skillnad från andra referenstaggar."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
 msgstr "Höjd"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Indikerar höjden baserat på referensen i GPSAltitudeRef. Höjden uttrycks som ett RATIONAL-värde. Referensenheten är meter."
 
 #: libexif/exif-tag.c:114
-#, fuzzy
 msgid "GPS Time (Atomic Clock)"
 msgstr "GPS-tid (atomklocka)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Indikerar tiden som UTC (koordinerad universaltid). TimeStamp uttrycks som tre RATIONAL-värden som anger timme, minut och sekund."
 
 #: libexif/exif-tag.c:118
-#, fuzzy
 msgid "GPS Satellites"
-msgstr "GPS-datum"
+msgstr "GPS-satelliter"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
+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, 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 shall be set to NULL."
+msgstr "Indikerar GPS-satelliterna som används för mätningar. Denna tag kan användas för att beskriva antalet satelliter, deras ID-nummer, elevationsvinkel, azimut, SNR och annan information i ASCII-notation. Formatet är inte specificerat. Om GPS-mottagaren inte kan göra mätningar ska värdet i taggen sättas till NULL."
 
 #: libexif/exif-tag.c:125
-#, fuzzy
 msgid "GPS Receiver Status"
 msgstr "Status för GPS-mottagare"
 
 #: libexif/exif-tag.c:126
-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 ""
+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 "Indikerar status för GPS-mottagaren när bilden sparades. �A� betyder att mätningen pågår och �V� betyder att mätningen är interoperabilitet."
 
 #: libexif/exif-tag.c:129
-#, fuzzy
 msgid "GPS Measurement Mode"
 msgstr "Läge för GPS-mätning"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Indikerar GPS-mätningsläget. �2� betyder tvådimensionell mätning och �3� innebär att en tredimensionell mätning pågår."
 
 #: libexif/exif-tag.c:133
-#, fuzzy
 msgid "Measurement Precision"
-msgstr "Mätprecision"
+msgstr "Mätningsprecision"
 
 #: libexif/exif-tag.c:134
-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 ""
+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 "Indikerar GPS DOP (grad av dataprecision). Ett HDOP-värde skrivs vid tvådimensionell mätning och PDOP vid tredimensionell mätning."
 
 #: libexif/exif-tag.c:137
-#, fuzzy
 msgid "Speed Unit"
 msgstr "Hastighetsenhet"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Indikerar enheten som används för att uttrycka GPS-mottagarens hastighet. �K�, �M� och �N� representerar kilometer per timme, engelska mil per timme och knop."
 
 #: libexif/exif-tag.c:141
-#, fuzzy
 msgid "Speed of GPS Receiver"
 msgstr "Hastighet för GPS-mottagare"
 
 #: libexif/exif-tag.c:142
 msgid "Indicates the speed of GPS receiver movement."
-msgstr ""
+msgstr "Indikerar GPS-mottagarens hastighet."
 
 #: libexif/exif-tag.c:143
 msgid "Reference for direction of movement"
 msgstr "Referens för rörelseriktning"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Indikerar referensen för att ange riktningen för GPS-mottagarens rörelse. �T� betecknar sann riktning och �M� magnetisk riktning."
 
 #: libexif/exif-tag.c:147
-#, fuzzy
 msgid "Direction of Movement"
 msgstr "Rörelseriktning"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
-msgstr ""
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
+msgstr "Indikerar riktningen för GPS-mottagarens rörelse. Värden tas från intervallet från 0.00 till 359.99."
 
 #: libexif/exif-tag.c:150
-#, fuzzy
 msgid "GPS Image Direction Reference"
-msgstr "Bildbeskrivning"
+msgstr "GPs bildriktningsreferens"
 
 #: libexif/exif-tag.c:151
-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 ""
+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 "Indikerar referensen för angivelse av bildriktningen då den togs. �T� betecknar sann riktning och �M� magnetisk riktning."
 
 #: libexif/exif-tag.c:153
-#, fuzzy
 msgid "GPS Image Direction"
-msgstr "Bildbeskrivning"
+msgstr "GPS bildriktning"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
+msgstr "Indikerar bildens riktning då den togs. Värden tas från intervallet från 0.00 till 359.99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
-msgstr ""
+msgstr "Geodetisk undersökningsdata används"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Indikerar att geodetisk undersökningsdata används av GPS-mottagaren. Om undersökningsdata är begränsad till Japan kommer värdet för denna tagg att vara �TOKYO� eller �WGS-84� Om en GPS Info-tagg finns sparad rekommenderas det starkt att denna tag sparas."
 
 #: libexif/exif-tag.c:161
-#, fuzzy
 msgid "Reference For Latitude of Destination"
-msgstr "Referens för rörelseriktning"
+msgstr "Referens för destinationslatitud"
 
 #: libexif/exif-tag.c:162
-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 ""
+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 "Indikerar huruvida latituden för destinationspunkten är en nordlig eller sydlig latitud. ASCII-värdet �N� indikerar nordlig latitud och �S\" sydlig latitud."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
-msgstr ""
+msgstr "Destinationslatitud"
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Indikerar latituden till destinationspunkten. Latituden uttrycks som tre RATIONAL-värden som anger grader, minuter respektive sekunder. Om longitud uttrycks som grader, minuter och sekunder är formatet typiskt dd/1,mm/1,ss/1. När grader och minuter används och till exempel delar av minuter anges upp till två decimaler skulle formatet vara dd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:173
-#, fuzzy
 msgid "Reference for Longitude of Destination"
-msgstr "Referens för rörelseriktning"
+msgstr "Referens för destinationslongitud"
 
 #: libexif/exif-tag.c:174
-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 ""
+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 "Indikerar huruvida longituden för destinationspunkten är östlig eller västlig longitud. ASCII �E� indikerar östlig longitud och �W� västlig longitud."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
-msgstr ""
+msgstr "Destinationslongitud"
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Indikerar longituden till destinationspunkten. Longituden uttrycks som tre RATIONAL-värden som anger grader, minuter respektive sekunder. Om longitud uttrycks som grader, minuter och sekunder är formatet typiskt ddd/1,mm/1,ss/1. När grader och minuter används och till exempel delar av minuter anges upp till två decimaler skulle formatet vara ddd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:186
-#, fuzzy
 msgid "Reference for Bearing of Destination"
-msgstr "Referens för rörelseriktning"
+msgstr "Referens för destinationsbäring"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Indikerar referensen som används för att ange bäringen till destinationspunkten. �T� betecknar sann riktning och �M� magnetisk riktning."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
-msgstr ""
+msgstr "Destinationsbäring"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
-msgstr ""
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
+msgstr "Indikerar bäringen till destinationspunkten. Värden är i intervallet från 0.00 till 359.99."
 
 #: libexif/exif-tag.c:193
-#, fuzzy
 msgid "Reference for Distance to Destination"
-msgstr "Referens för rörelseriktning"
+msgstr "Referens för destinationsavstånd"
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr "Indikerar enheten som används för att uttrycka avstående till destinationspunkten. �K�, �M� och �N� representerar kilometer, engelska mil och nautiska mil."
 
 #: libexif/exif-tag.c:197
 msgid "Distance to Destination"
-msgstr ""
+msgstr "Destinationsavstånd"
 
 #: libexif/exif-tag.c:198
 msgid "Indicates the distance to the destination point."
-msgstr ""
+msgstr "Indikerar avståndet till destinationspunkten."
 
 #: libexif/exif-tag.c:199
 msgid "Name of GPS Processing Method"
-msgstr ""
+msgstr "Namn för GPS-behandlingsmetod"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "En teckensträng som innehåller namnet på metoden som används för att hitta platsen. Den första byten indikerar vilken teckenkod som används och denna åtföljs av namnet på metoden. Eftersom typen inte är ASCII krävs inte NULL-terminering."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
-msgstr ""
+msgstr "Namn på GPS-område"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "En teckensträng som innehåller namnet på GPS-området. Den första byten indikerar vilken teckenkod som används och denna åtföljs av namnet på GPS-området. Eftersom typen inte är ASCII krävs inte NULL-terminering."
 
 #: libexif/exif-tag.c:210
-#, fuzzy
 msgid "GPS Date"
 msgstr "GPS-datum"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "En teckensträng som innehåller datum- och tidsinformation relativt UTC (koordinerad universaltid). Formatet är �YYYY:MM:DD�. Längden på strängen är 11 byte inklusive NULL."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
-msgstr ""
+msgstr "GPS differentiell korrigering"
 
 #: libexif/exif-tag.c:216
+msgid "Indicates whether differential correction is applied to the GPS receiver."
+msgstr "Indikerar huruvida differentiell korrigering tillämpas i GPS-mottagaren."
+
+#: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
 msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
-msgstr ""
+msgstr "Ny underfilstyp"
 
 #: libexif/exif-tag.c:220
 msgid "A general indication of the kind of data contained in this subfile."
-msgstr ""
+msgstr "En allmän indikation på vilken data som finns i denna underfil."
 
 #: libexif/exif-tag.c:222
 msgid "Image Width"
 msgstr "Bildbredd"
 
 #: libexif/exif-tag.c:223
-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 ""
+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 "Antal kolumner i bilddata, lika med antal bildpunkter per rad. I JPEG-komprimerad data används en JPEG-markör istället för denna tagg."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
 msgstr "Bildlängd"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Antal rader i bilddata. I JPEG-komprimerad data används en JPEG-markör istället för denna tagg."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
 msgstr "Bitar per sampling"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Antal bitar per bildkomponent. I denna standard är varje komponent i bilden 8 bitar, så värdet för denna tagg  är 8. Se också <SamplesPerPixel>. I JPEG-komprimerad data används en JPEG-markör istället för denna tagg."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Komprimering"
 
 #: libexif/exif-tag.c:238
-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 ""
+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 "Komprimeringsmetoden som används för bilddata. När en primärbild är JPEG-komprimerad behövs inte denna beteckning så den utelämnas. När miniatyrbilder använder JPEG-komprimering sätts detta taggvärde till 6."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
-msgstr ""
+msgstr "Fotometrisk tolkning"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Bildpunktssammansättning. I JPEG-komprimerad data används en JPEG-markör istället för denna tagg."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
-msgstr ""
+msgstr "Fyllnadsordning"
 
 #: libexif/exif-tag.c:251
 msgid "Document Name"
@@ -2949,46 +2775,32 @@ msgid "Image Description"
 msgstr "Bildbeskrivning"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "En teckensträng som ange bildens titel. Det kan vara en kommentar så som �1988 företagspicknick� eller liknande. Två-byte-teckenkoder kan inte användas. När en 2-bytekod är nödvändig ska den privata Exif-taggen <UserComment> användas."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Tillverkare"
 
 #: libexif/exif-tag.c:261
-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 ""
+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 "Tillverkaren av inspelningsutrustningen. Detta är tillverkaren av den digitala stillbildskameran, skannern, videodigitaliseraren eller annan utrustning som genererade bilden. När fältet lämnas tomt behandlas det som okänt."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Modell"
 
 #: libexif/exif-tag.c:268
-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 ""
+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 "Modellnamn eller modellnummer på utrustningen. Detta är modellnamnet eller modellnumret för den digital stillbildskameran, skannern, videodigitaliseraren eller annan utrustning som genererade bilden. När fältet lämnas tomt behandlas det som okänt."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
-msgstr ""
+msgstr "Remspositioner"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "För varje remsa, bytepositionen för den remsan. Det rekommenderas att detta väljs så att antalet byte per remsa inte överstiger 64 KByte. Med JPEG-komprimerad data behövs inte denna beteckning så den utelämnas. Se också <RowsPerStrip> och <StripByteCounts>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
@@ -2996,237 +2808,167 @@ msgstr "Orientering"
 
 #: libexif/exif-tag.c:281
 msgid "The image orientation viewed in terms of rows and columns."
-msgstr ""
+msgstr "Bildorientering uttryckt i termer av rader och kolumner."
 
 #: libexif/exif-tag.c:284
 msgid "Samples per Pixel"
-msgstr ""
+msgstr "Sampel per bildpunkt"
 
 #: libexif/exif-tag.c:285
-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 ""
+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 "Antalet komponenter per bildpunkt. Då denna standard gäller för RGB- och YCbCr-bilder sätts värdet för denna tagg till 3. I JPEG-komprimerad data används en JPEG-markör istället för denna tagg."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
-msgstr ""
+msgstr "Antal rader per remsa"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Antal rader per remsa. Detta är antalet rader i en remsa av bilden när en bild delas upp i remsor. Med JPEG-komprimerad data behövs inte denna beteckning så den utelämnas. Se också <StripOffsets> och <StripByteCounts>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
-msgstr ""
+msgstr "Antal byte per remsa"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Det totala antalet byte i varje remsa. Med JPEG-komprimerad data behövs inte denna beteckning så den utelämnas."
 
 #: libexif/exif-tag.c:301
-#, fuzzy
 msgid "X-Resolution"
-msgstr "Upplösningsenhet"
+msgstr "X-upplösning"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Antalet bildpunkter per <ResolutionUnit> i <ImageWidth>-riktning. När bildupplösningen är okänd, antas 72 [dpi]."
 
 #: libexif/exif-tag.c:306
-#, fuzzy
 msgid "Y-Resolution"
-msgstr "Upplösningsenhet"
+msgstr "Y-upplösning"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Antalet bildpunkter per <ResolutionUnit> i <ImageLength>-riktning. Samma värde antas som <XResolution>."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
-msgstr ""
+msgstr "Planär konfiguration"
 
 #: libexif/exif-tag.c:312
-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 ""
+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 "Indikerar huruvida bildpunktskomponenter sparas i ett blockvis eller planärt format. I JPEG-komprimerade filer används en JPEG-markör istället för denna tagg. Om detta fält inte existerar antas standardvärdet 1 (blockvis) för TIFF."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "Upplösningsenhet"
 
 #: libexif/exif-tag.c:318
-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 ""
+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 "Enheten för mätning av <XResolution> och <YResolution>. Samma enhet används för både <XResolution> och <YResolution>. Om bildupplösningen är okänd antas 2 (tum)."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
-msgstr ""
+msgstr "Överföringsfunktion"
 
 #: libexif/exif-tag.c:324
-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 ""
+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 "En överföringsfunktion för bilden, beskriven i tabellform. Normalt sett behövs inte denna tagg eftersom färgrymden är angiven i taggen för färgrymdsinformation (<ColorSpace>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Programvara"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
+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 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."
+msgstr "Denna tagg sparar namnet och versionen på programvaran eller kamerans fastprogramvara eller bildinmatningsenheten som använts för att generera bilden. Detaljerad information anges inte men det rekommenderas att exemplet nedan följs. När fältet är tomt behandlas det som okänt."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Datum och tid"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "Datum och tid då bilden skapades. I denna standard (EXIF-2.1) är det datum och tid då filen ändrades."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Artist"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "Denna tagg sparar namnet på kameraägaren, fotografen eller bildskaparen. Något detaljerat format anges inte, men det rekommenderas att informationen skrivs som i exemplet nedan för att underlätta interoperabilitet. När fältet lämnas tomt behandlas det som okänt."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Vitpunkt"
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Krominansen för bildens vitpunkt. Normalt sett behövs inte denna tagg eftersom färgrymden är angiven i taggen för färgrymdsinformation (<ColorSpace>)."
 
 #: libexif/exif-tag.c:353
 msgid "Primary Chromaticities"
-msgstr ""
+msgstr "Primära krominanser"
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
-msgstr ""
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Krominansen för de tre primära färgerna i bilden. Normalt sett behövs inte denna tagg eftersom färgrymden är angiven i taggen för färgrymdsinformation (<ColorSpace>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
+msgstr "Definierad av Adobe Corporation för att aktivera TIFF-träd inom en TIFF-fil."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
-msgstr ""
+msgstr "Överföringsintervall"
 
 #: libexif/exif-tag.c:366
 msgid "JPEG Interchange Format"
-msgstr ""
+msgstr "JPEG överföringsformat"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "Positionen för startbyten (SOI) för JPEG-komprimerad miniatyrbildsdata. Denna används inte för primär JPEG-bilddata."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
-msgstr ""
+msgstr "Längd för JPEG överföringsformat"
 
 #: libexif/exif-tag.c:373
-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 ""
+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 "Antalet byte av JPEG-komprimerad miniatyrbildsdata. Denna används inte för primär JPEG-bilddata. JPEG-miniatyrbilder är inte uppdelade utan sparas som en kontinuerlig JPEG-bitström från SOI till EOI. Appn- och COM-markörer bör inte sparas. Komprimerad miniatyrbilder får inte uppta mer än 64Kbyte, inklusive all annan data som ska sparas i APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
-msgstr ""
+msgstr "YCbCr-koefficienter"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "Matriskoefficienter för transformering från RGB- till YCbCr-bilddata. Inga standardvärde anges för TIFF, men här används värdena från �Color Space Guidelines� som standardvärden. Färgrymden deklareras i taggen för färgrymdsinformation där standardvärdet är det värde som ger optimal bildkarakteristik för Interoperabilitet detta tillstånd."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
-msgstr ""
+msgstr "YCbCr-undersampling"
 
 #: libexif/exif-tag.c:393
-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 ""
+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 "Samplingsförhållandet mellan krominanskomponenter i relation till luminanskomponenten. I JPEG-komprimerad data används en JPEG-markör istället för denna tagg."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
-msgstr ""
+msgstr "YCbCr-positionering"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Positionen för krominanskomponenter i relation till luminanskomponenten. Detta fält används bara för JPEG-komprimerad data eller okomprimerad YCbCr-data. Standardvärdet för TIFF är 1 (centrerad); men när Y:Cb:Cr = 4:2:2 rekommenderas det att standardvärdet är 2 (samlokaliserad) används för att spara data, för att förbättra bildkvaliteten när de visas på TV-system. När detta fält inte finns skall läsaren anta standardvärdet för TIFF. Om Y:Cb:Cr = 4:2:0 rekommenderas standardvärdet för TIFF (centrerad). Om läsaren inte har förmågan att ha stöd för båda sorternas av <YCbCrPositioning> skall den följa standardvärdet för TIFF oavsett värdet i detta fält. Det är att föredra om läsare har stöd för både centrerad och samlokaliserad positionering."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
-msgstr ""
+msgstr "Referens svart/vit"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
+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 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."
+msgstr "Referensvärdet för svartpunkten och referensvärdet för vitpunkten. Inga standardvärden anges i TIFF men värdena nedan används som standardvärden här. Färgrymden deklareras i taggen för färgrymdsinformation där standardvärdet är det värde som ger optimal bildkarakteristik för Interoperabilitet dessa tillstånd."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
@@ -3241,11 +2983,8 @@ msgid "CFA Pattern"
 msgstr "CFA-mönster"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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 ""
+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 "Indikerar geometrimönstret för färgfilterområdet (color filter array, CFA) för bildsensorns när en en-chips-färgområdessensor används. Det tillämpas inte för alla sensormetoder."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
@@ -3256,217 +2995,160 @@ msgid "Copyright"
 msgstr "Copyright"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Upphovsrättsinformation. I denna standard används taggen för att indikera både fotografens och redaktörens upphovsrätt. Det är upphovsrättsinformationen för personen eller organisationen som hävdar rätten för bilden. Upphovsrättsinformationen för interoperabilitet inklusive datum och rättigheter bör skrivas i detta fält; t.ex. �Copyright, Maria Andersson, 19xx. Med ensamrätt.�. I denna standard sparas i fältet både fotografens och redaktörens upphovsrätter med var och en i en separat del. När det finns en uttrycklig skillnad mellan fotografen och redaktörens upphovsrätt ska dessa skrivas med fotografens upphovsrätt följd av redaktörens upphovsrätt NULL-separerade ( i detta fall, eftersom texten också slutar med ett NULL finns det två NULL-koder) (se exempel 1). När bara fotografen är angiven avslutas denna med en NULL-kod (se exempel 2). När bara redaktörens upphovsrätt anges består fotografens upphovsrättsdel av ett blanksteg åtföljt av en avslutande NULL-kod, sedan anges redaktörens upphovsrättsdel (se exempel 3). När fältet lämnas tomt, behandlas det som okänt."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
-msgstr ""
-
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
+msgstr "Exponeringstid, angiven i sekunder (sek)."
 
 #: libexif/exif-tag.c:470
 msgid "The F number."
-msgstr ""
+msgstr "F-nummer."
 
 #: libexif/exif-tag.c:475
 msgid "Image Resources Block"
-msgstr ""
+msgstr "Bildresursblock"
 
 #: libexif/exif-tag.c:477
-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 ""
+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 "En pekare till Exif-IFD. Interoperabilitet, Exif-IFD har samma struktur som IFD som specificerats i TIFF. Vanligtvis innehåller den dock ingen bilddata som i fallet med TIFF."
 
 #: libexif/exif-tag.c:485
 msgid "Exposure Program"
 msgstr "Exponeringsprogram"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "Klassen för programmet som användes av kameran för att ställa in exponeringen när bilden togs."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
-msgstr ""
+msgstr "Spektralkänslighet"
 
 #: libexif/exif-tag.c:491
-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 ""
+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 "Indikerar spektralkänsligheten för varje kanal i kameran som används. Taggvärdet är en ASCII-sträng som är kompatibel med standarden som utvecklats av ASTM:s tekniska kommitté."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
-msgstr ""
+msgstr "Pekare till GPS-Info-IFD"
 
 #: libexif/exif-tag.c:497
-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 ""
+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 "En pekare till GPS-Info-IFD:t. Interoperabilitetsstrukturen för GPS-Info-IFD, i likhet med den för Exif-IFD, har ingen bilddata."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
-msgstr ""
+msgstr "ISO-hastighetsgradering"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Indikerar ISO-hastigheten och ISO-latituden för kameran eller inmatningsenheten som angivet i ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
-msgstr ""
+msgstr "Optoelektronisk konverteringsfunktion"
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-msgstr ""
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+msgstr "Indikerar den optoelektroniska konverteringsfunktionen (OECF) specificerad i ISO 14524. <OECF> är förhållandet mellan kamerans optiska inmatning och bildvärdena."
 
 #: libexif/exif-tag.c:513
-#, fuzzy
 msgid "Time Zone Offset"
-msgstr "Tidszon"
+msgstr "Tidszonsposition"
 
 #: libexif/exif-tag.c:514
 msgid "Encodes time zone of camera clock relative to GMT."
-msgstr ""
+msgstr "Kodar tidszonen för kameraklockan relativt till GMT."
 
 #: libexif/exif-tag.c:515
 msgid "Exif Version"
 msgstr "Exif version"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "Versionen av denna standard som stöd. Om detta fält utelämnas antas det innebär att denna standard inte följs."
 
 #: libexif/exif-tag.c:520
-#, fuzzy
 msgid "Date and Time (Original)"
 msgstr "Datum och tid (original)"
 
 #: libexif/exif-tag.c:521
-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 ""
+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 "Datum och tid när originalbilddata genererades. För en digital stillbildskamera sparas datum och tid när bilden togs."
 
 #: libexif/exif-tag.c:526
-#, fuzzy
 msgid "Date and Time (Digitized)"
-msgstr "Datum och tid (original)"
+msgstr "Datum och tid (digitaliserad)"
 
 #: libexif/exif-tag.c:527
 msgid "The date and time when the image was stored as digital data."
-msgstr ""
+msgstr "Datum och tid när bilden sparades som digital data."
 
 #: libexif/exif-tag.c:530
 msgid "Components Configuration"
-msgstr ""
+msgstr "Komponentkonfiguration"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
+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 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."
+msgstr "Information specifik för komprimerad data. Kanalerna för varje komponent är arrangerade i ordning från den första komponenten till den fjärde. För okomprimerad data är dataarrangemanget angivet i taggen <PhotometricInterpretation>. Men då <PhotometricInterpretation> bara kan uttrycka ordningen för Y, Cb och Cr tillhandahålls denna tagg för fall när komprimerad bilddata använder andra komponenter än Y, Cb och Cr och för att kunna hantera andra sekvenser."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
-msgstr ""
+msgstr "Komprimerade bitar per bildpunkt"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Information specifik för komprimerad data. Kompressionsläget som används för en komprimerad bild indikeras i enheten bitar per bildpunkt."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
-msgstr "Slutartid"
+msgstr "Slutarhastighet"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Slutarhastighet. Enheten är APEX-inställningen (Additive System of Photographic Exposure)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
-msgstr ""
+msgstr "Objektivbländare. Enheten är APEX-värdet."
 
 #: libexif/exif-tag.c:553
 msgid "Brightness"
 msgstr "Ljusstyrka"
 
 #: libexif/exif-tag.c:554
-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 ""
+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 "Värdet för ljusstyrka. Enheten är APEX-värdet. Vanligtvis anges det i intervallet -99.99 till 99.99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
-msgstr ""
+msgstr "Exponeringsnivå"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "Exponeringsnivån. Enheten är APEX-värdet. Vanligtvis anges det i intervallet från -99.99 till 99.99."
 
 #: libexif/exif-tag.c:562
 msgid "Maximum Aperture Value"
 msgstr "Maximalt bländarvärde"
 
 #: libexif/exif-tag.c:563
-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 ""
+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 "Det minsta F-numret för objektivet. Enheten är APEX-värdet. Vanligtvis anges det i intervallet 00.00 till 99.99, men det är inte begränsat till detta intervallet."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
-msgstr ""
+msgstr "Avstånd till objekt"
 
 #: libexif/exif-tag.c:569
 msgid "The distance to the subject, given in meters."
-msgstr ""
+msgstr "Avståndet till objektet, angivet i meter."
 
 #: libexif/exif-tag.c:572
 msgid "The metering mode."
-msgstr ""
+msgstr "Mätarläge."
 
 #: libexif/exif-tag.c:574
 msgid "Light Source"
@@ -3474,439 +3156,315 @@ msgstr "Ljuskälla"
 
 #: libexif/exif-tag.c:575
 msgid "The kind of light source."
-msgstr ""
+msgstr "Typ av ljuskälla."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
-msgstr ""
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
+msgstr "Denna tagg sparas när en bild tas med ett strobljus (blixt)."
 
 #: libexif/exif-tag.c:582
-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 ""
+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 "Den verkliga brännvidden för objektivet i mm. Konvertering görs inte för brännvidden för en 35mm filmkamera."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
-msgstr ""
+msgstr "Område för objekt"
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
-msgstr ""
+msgid "This tag indicates the location and area of the main subject in the overall scene."
+msgstr "Denna tagg indikerar platsen och området för huvudobjektet i scenen."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
-msgstr ""
+msgstr "TIFF/EP Standard-ID"
 
 #: libexif/exif-tag.c:591
 msgid "Maker Note"
-msgstr ""
+msgstr "Tillverkaranteckning"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "En tagg för tillverkare av Exif-skrivare att spara önskad information. Innehållet är upp till tillverkaren."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
-msgstr ""
+msgstr "Användarkommentar"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "En tagg för Exif-användare att skriva nyckelord eller kommentarer om bilden förutom de i <ImageDescription>, och utan de begränsningar för teckenkoder som finns i <ImageDescription>. Teckenkoden som används i <UserComment>-taggen identifieras baserat på en ID-kod i ett fixt 8-byteområde i början av taggens dataområde. Den oanvända delen av området fyllas ut med NULL (�00.h�). ID-koder tilldelas genom registrering. Beteckningsmetoder och referenser för varje teckenkod definieras i specifikationen. Värdet för CountN bestäms baserat på de 8 byten i teckenkodsområdet och antal byte i kommentarsdelen för användare. Eftersom TYPEN inte är ASCII, behövs inte NULL-terminering. ID-koden för <UserComment>-området kan vara en definierad kod så som JIS eller ASCII, eller vara Odefinierad. Det Odefinierade namnet är OdefinieradText och ID-koden fylls med 8 byte som alla är �NULL� (�00.H�). En Exif-läsare som läser <UserComment>-taggen måste har en funktion för att bestämma ID-koden. Denna funktion behövs inte i Exif-läsare som inte använder <UserComment>-taggen. När ett <UserComment>-område sätts till sidan rekommenderas det att ID-koden är ASCII och att den följande kommentarsdelen fylls med blanksteg [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
-msgstr ""
+msgstr "Tid, delar av sekunder"
 
 #: libexif/exif-tag.c:620
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
-msgstr ""
+msgstr "En tagg som används för att spara delar av sekunder för taggen <DateTime>."
 
 #: libexif/exif-tag.c:624
-#, fuzzy
 msgid "Sub-second Time (Original)"
-msgstr "Datum och tid (original)"
+msgstr "Tid under en sekund (original)"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
-msgstr ""
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr "En tag som används för att spara delar av sekunder för taggen <DateTimeOriginal>."
 
 #: libexif/exif-tag.c:629
 msgid "Sub-second Time (Digitized)"
-msgstr ""
+msgstr "Tid, delar av sekunder (digitaliserad)"
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
-msgstr ""
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr "En tagg som används för att spara delar av sekunder för taggen <DateTimeDigitized>."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
-msgstr ""
+msgstr "XP-titel"
 
 #: libexif/exif-tag.c:635
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
-msgstr ""
+msgstr "En teckensträng som anger bildens titel, kodad i UTF-16LE."
 
 #: libexif/exif-tag.c:639
 msgid "XP Comment"
-msgstr ""
+msgstr "XP-kommentar"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
-msgstr ""
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
+msgstr "En teckensträng som innehåller en kommentar om bilden, kodad i UTF-16LE."
 
 #: libexif/exif-tag.c:644
 msgid "XP Author"
-msgstr ""
+msgstr "XP-upphovsman"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
-msgstr ""
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
+msgstr "En teckensträng som anger namnet på bildens upphovsman, kodat i UTF-16LE."
 
 #: libexif/exif-tag.c:649
 msgid "XP Keywords"
-msgstr ""
+msgstr "XP-nyckelord"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "En teckensträng som innehåller nyckelord som beskriver bilden, kodade i UTF-16LE."
 
 #: libexif/exif-tag.c:654
 msgid "XP Subject"
-msgstr ""
+msgstr "XP-objekt"
 
 #: libexif/exif-tag.c:655
 msgid "A character string giving the image subject, encoded in UTF-16LE."
-msgstr ""
+msgstr "En teckensträng som anger bildobjektet, kodat i UTF-16LE."
 
 #: libexif/exif-tag.c:659
 msgid "The FlashPix format version supported by a FPXR file."
-msgstr ""
+msgstr "FlashPix-formatversionen som stöd av en FPXR-fil."
 
 #: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Färgrymd"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "Färgrymdsinformationstaggen sparas alltid som färgrymdsidentifieraren. sRGB (=1) används normalt för att definiera färgrymden baserat på en PC-skärms tillstånd och miljö. Om en färgrymd annan än sRGB används ställs Okalibrerad (=FFFF.H) in. Bilddata som sparats som Okalibrerat kan behandlas som sRGB när det konverteras till FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
-msgstr ""
+msgstr "Bildpunkt X-dimension"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Information specifik för komprimerad data. När en komprimerad fil sparas måste den giltiga bredden för den meningsfulla bilden sparas i denna tagg, huruvida det finns utfyllnadsdata eller en omstartsmarkör. Denna tagg bör inte existera i en okomprimerad fil."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
-msgstr ""
+msgstr "Bildpunkt Y-dimension"
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
+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, 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."
+msgstr "Information specifik för komprimerad data. När en komprimerad fil sparas måste den giltiga höjden för den meningsfulla bilden sparas i denna tagg, huruvida det finns utfyllnadsdata eller en omstartsmarkör. Denna tagg bör inte existera i en okomprimerad fil. Eftersom utfyllnadsdata inte behövs i vertikal riktning så kommer antalet rader som sparas i denna giltiga bildhöjdstagg faktiskt vara densamma som den som sparats i SOF:en."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
-msgstr ""
+msgstr "Relaterad ljudfil"
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Denna tagg används för att spara namnet på en ljudfil relaterad till bilddata. Den enda relationsinformationen som sparas här är Exif-ljudfilsnamnet och ändelsen (en ASCII-sträng som består av 8 tecken + �.� + 3 tecken). Sökvägen sparas inte. Bestämmelser för ljud- och filnamnskonventioner definieras i specifikationen. När denna tagg används måste ljudfiler sparas i överensstämmelse med Exif-ljudformatet. Skrivare får också spara data så som ljud i APP2 som FlashPix-utökad strömdata. Mappningen av Exif-bildfiler och -ljudfiler görs enligt endera av tre sätt, [1], [2] och [3]. Om flera filer mappas till en fil som i [2] eller [3], används formatet ovan för att spara endast ett ljudfilsnamn. Om det finns flera ljudfiler anges den som sparats först. I fallet [3], anges till exempel för Exif-bildfilen �DSC00001.JPG� endast �SND00001.WAV� som den relaterade Exif-ljudfilen. När det finns tre Exif-ljudfiler �SND00001.WAV�, �SND00002.WAV� och �SND00003.WAV� indikeras Exif-bildfilsnamnet �DSC00001.JPG� för var och en av dem. Genom att kombinera flera relationsinformationsstycken stöds flera uppspelningsmöjligheter. Metoden att använda relationsinformation lämnas till implementationen på uppspelningssidan. Eftersom denna information är en ASCII-teckensträng avslutas den av NULL. När denna tagg användas för att mappa ljudfiler måste också relationen mellan ljudfilen och bilddata också indikeras i ljudfilsänden."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
-msgstr ""
+msgstr "Pekare till interoperabilitets-IFD"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Interoperabilitets-IFD:n består av taggar vilka lagrar informationen som behövs för att säkerställa interoperabilitet och pekas ut av följande tagg som finns i Exif-IFD. Interoperabilitetsstrukturen för interoperabilitets-IFD:n är den samma som för TIFF definierade strukturen men innehåller inte bilddata jämfört med en normal TIFF-IFD."
 
 #: libexif/exif-tag.c:729
 msgid "Flash Energy"
-msgstr ""
+msgstr "Blixtenergi"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Indikerar strobenergin vid tiden då bilden togs, mäts i Beam Candle Power Seconds (BCPS)."
 
 #: libexif/exif-tag.c:734
 msgid "Spatial Frequency Response"
-msgstr ""
+msgstr "Spatialt frekvenssvar"
 
 #: libexif/exif-tag.c:735
-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 ""
+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 "Denna tagg sparar kamerans eller inmatningsenhetens spatiala frekvenstabell och SFR-värden i bildbreddens, bildhöjdens och bilddiagonalens riktning, så som specificerats i ISO 122333."
 
 #: libexif/exif-tag.c:741
 msgid "Focal Plane X-Resolution"
-msgstr ""
+msgstr "X-upplösning i fokalplanet"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indikerar antalet pixlar i bildbreddens (X) riktning per <FocalPlaneResolutionUnit> i kamerans fokalplan."
 
 #: libexif/exif-tag.c:746
 msgid "Focal Plane Y-Resolution"
-msgstr ""
+msgstr "Y-upplösning i fokalplanet"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Indikerar antalet pixlar i bildhöjdens (Y) riktning per <FocalPlaneResolutionUnit> i kamerans fokalplan."
 
 #: libexif/exif-tag.c:751
 msgid "Focal Plane Resolution Unit"
-msgstr ""
+msgstr "Upplösningsenhet i fokalplanet"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Indikerar enheten för mättning av <FocalPlaneXResolution> och <FocalPlaneYResolution>. Detta värde är det samma som <ResolutionUnit>."
 
 #: libexif/exif-tag.c:757
 msgid "Subject Location"
-msgstr ""
+msgstr "Objektsplats"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Indikerar platsen för huvudobjektet i scenen. Värdet i denna tagg representerar bildpunkten i mitten av huvudobjektet relativt till vänster kanten, före rotationsbehandling enligt <Rotation>-taggen. Det första värdet indikerar X-kolumnnumret och det andra indikerar Y-radnumret."
 
 #: libexif/exif-tag.c:765
 msgid "Exposure Index"
 msgstr "Exponeringsindex"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
-msgstr ""
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Indikerar exponeringsindex valt på kameran eller inmatningsenheten vid tiden då bilden togs."
 
 #: libexif/exif-tag.c:769
 msgid "Sensing Method"
-msgstr ""
+msgstr "Avkänningsmetod"
 
 #: libexif/exif-tag.c:770
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr ""
+msgstr "Indikerar bildsensortypen i kameran eller inmatningsenheten."
 
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Filkälla"
 
 #: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Indikerar bildkällan. Om en digital stillbildskamera sparat bilden kommer taggvärdet för denna tagg alltid att vara 3, vilket indikerar att bilden togs av en digital stillbildskamera."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
 msgstr "Scentyp"
 
 #: libexif/exif-tag.c:779
-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 ""
+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 "Indikerar typen av scen. Om en digital stillbildskamera sparat bilden måste taggvärdet alltid vara 1, vilket indikerar att bilden tagits direkt."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
-msgstr ""
+msgstr "Anpassad rendering"
 
 #: libexif/exif-tag.c:790
-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 ""
+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 "Denna tagg indikerar användningen av speciell behandling av bilddata så som rendering avsedd för utmatning. När speciell behandling genomförs förväntas läsaren att inaktivera eller minimera vidare behandling."
 
 #: libexif/exif-tag.c:796
-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 ""
+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 "Denna tagg indikerar exponeringsläget som var inställt då bilden togs. I autogafflingsläget tar kameran en serie av bilder av samma scen vid olika exponeringsinställningar."
 
 #: libexif/exif-tag.c:801
 msgid "This tag indicates the white balance mode set when the image was shot."
-msgstr ""
+msgstr "Denna tagg indikerar vitbalansläget som var inställt då bilden togs."
 
 #: libexif/exif-tag.c:805
 msgid "Digital Zoom Ratio"
-msgstr ""
+msgstr "Digitalt zoomförhållande"
 
 #: libexif/exif-tag.c:806
-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 ""
+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 "Denna tagg indikerar det digital zoomförhållandet när bilden togs. Om täljaren för det inspelade värdet är 0 indikerar detta att digitalzoom inte använts."
 
 #: libexif/exif-tag.c:811
-#, fuzzy
 msgid "Focal Length in 35mm Film"
-msgstr "Brännvidd"
+msgstr "Brännvidd i 35mm film"
 
 #: libexif/exif-tag.c:812
-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 ""
+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 "Denna tagg indikerar den ekvivalenta brännvidden för en 35mm filmkamera i mm. Ett värde som är 0 innebär att brännvidden är okänd. Notera att denna tagg skiljer sig från taggen FocalLength."
 
 #: libexif/exif-tag.c:818
 msgid "Scene Capture Type"
-msgstr ""
+msgstr "Scentagningstyp"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
+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 scene type <SceneType> tag."
+msgstr "Denna tagg indikerar typen av scen som tagits. Den kan också användas för att spara läget i vilket bilden tagits. Notera att den skiljer sig från scentypstaggen <SceneType>."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
-msgstr ""
+msgstr "Nivåkontroll"
 
 #: libexif/exif-tag.c:825
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr ""
+msgstr "Denna tagg indikerar graden av bildövergripande nivåjustering."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Denna tagg indikerar riktningen för kontrastbehandling som tillämpats av kameran när bilden togs."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Denna tagg indikerar riktningen för mättnadsbehandling som tillämpades av kameran när bilden togs."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Denna tagg indikerar riktningen av skärpebehandling som tillämpades av kameran när bilden togs."
 
 #: libexif/exif-tag.c:841
 msgid "Device Setting Description"
-msgstr ""
+msgstr "Enhetsinställningsbeskrivning"
 
 #: libexif/exif-tag.c:842
-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 ""
+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 "Denna tagg indikerar information om bildtagningsförhållandena för en viss kameramodell. Taggen används bara för att indikera bildtagningsförhållanden i läsaren."
 
 #: libexif/exif-tag.c:848
 msgid "Subject Distance Range"
-msgstr ""
+msgstr "Avståndsintervall till objekt"
 
 #: libexif/exif-tag.c:849
 msgid "This tag indicates the distance to the subject."
-msgstr ""
+msgstr "Denna tagg indikerar avståndet till objektet."
 
 #: libexif/exif-tag.c:851
 msgid "Image Unique ID"
-msgstr ""
+msgstr "Unikt bild-ID"
 
 #: libexif/exif-tag.c:852
-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 ""
+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 "Denna tagg indikerar en identifierar som unikt tilldelas varje bild. Den sparas som en ASCII-sträng ekvivalent med hexadecimal notation och 128-bitars fixlängd."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
@@ -3914,27 +3472,23 @@ msgstr "Gamma"
 
 #: libexif/exif-tag.c:858
 msgid "Indicates the value of coefficient gamma."
-msgstr ""
+msgstr "Indikerar värdet för gammakoefficienten."
 
 #: libexif/exif-tag.c:860
 msgid "PRINT Image Matching"
-msgstr ""
+msgstr "Bildmatchning för PRINT"
 
 #: libexif/exif-tag.c:861
 msgid "Related to Epson's PRINT Image Matching technology"
-msgstr ""
+msgstr "Relaterat till Epsons bildmatchningsteknologi PRINT"
 
 #: libexif/exif-tag.c:863
 msgid "Padding"
-msgstr ""
+msgstr "Utfyllnad"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Denna tagg reserverar plats som kan göras anspråk på senare när ytterligare metadata läggs till. Ny metadata kan skrivas på plats genom att ersätta denna tagg med ett mindre dataelement och använda utrymmet för att spara de nya eller expanderade metadata taggarna."
 
 #: libexif/fuji/mnote-fuji-entry.c:62
 msgid "Softest"
@@ -3959,7 +3513,7 @@ msgstr "Filmsimuleringsläge"
 
 #: libexif/fuji/mnote-fuji-entry.c:79
 msgid "Incandescent"
-msgstr ""
+msgstr "Glödlampa"
 
 #: libexif/fuji/mnote-fuji-entry.c:85
 msgid "Medium high"
@@ -3976,12 +3530,11 @@ msgstr "Original"
 #: libexif/fuji/mnote-fuji-entry.c:124 libexif/pentax/mnote-pentax-entry.c:164
 #: libexif/pentax/mnote-pentax-entry.c:299
 msgid "Program AE"
-msgstr ""
+msgstr "AE-program"
 
 #: libexif/fuji/mnote-fuji-entry.c:125
-#, fuzzy
 msgid "Natural photo"
-msgstr "Mättnad"
+msgstr "Naturfoto"
 
 #: libexif/fuji/mnote-fuji-entry.c:126
 msgid "Vibration reduction"
@@ -4008,9 +3561,8 @@ msgid "Text"
 msgstr "Text"
 
 #: libexif/fuji/mnote-fuji-entry.c:132
-#, fuzzy
 msgid "NP & flash"
-msgstr "ingen blixt"
+msgstr "NP & blixt"
 
 #: libexif/fuji/mnote-fuji-entry.c:137
 msgid "Aperture priority AE"
@@ -4021,17 +3573,16 @@ msgid "Shutter priority AE"
 msgstr "Slutarprioritet AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:146
-#, fuzzy
 msgid "F-Standard"
-msgstr "Standard"
+msgstr "F-standard"
 
 #: libexif/fuji/mnote-fuji-entry.c:147
 msgid "F-Chrome"
-msgstr ""
+msgstr "F-krominans"
 
 #: libexif/fuji/mnote-fuji-entry.c:148
 msgid "F-B&W"
-msgstr ""
+msgstr "F-B&W"
 
 #: libexif/fuji/mnote-fuji-entry.c:151
 msgid "No blur"
@@ -4042,9 +3593,8 @@ msgid "Blur warning"
 msgstr "Varning för oskärpa"
 
 #: libexif/fuji/mnote-fuji-entry.c:155
-#, fuzzy
 msgid "Focus good"
-msgstr "Fokusläge"
+msgstr "Fokus bad"
 
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
@@ -4052,7 +3602,7 @@ msgstr "Oskärpa"
 
 #: libexif/fuji/mnote-fuji-entry.c:159
 msgid "AE good"
-msgstr ""
+msgstr "AE bra"
 
 #: libexif/fuji/mnote-fuji-entry.c:160
 msgid "Over exposed"
@@ -4088,7 +3638,7 @@ msgstr "F2/Fujichrome"
 
 #: libexif/fuji/mnote-fuji-entry.c:173
 msgid "F3/Studio portrait Ex"
-msgstr "F3/Studio portrait Ex"
+msgstr "F3/Studioporträtt Ex"
 
 #: libexif/fuji/mnote-fuji-entry.c:174
 msgid "F4/Velvia"
@@ -4123,20 +3673,19 @@ msgstr "%i byte okänt data"
 
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
-msgstr ""
+msgstr "Version av tillverkaranteckning"
 
 #: libexif/fuji/mnote-fuji-tag.c:37
 msgid "This number is unique and based on the date of manufacture."
-msgstr ""
+msgstr "Detta tal är unikt och baserad på tillverkningsdatum."
 
 #: libexif/fuji/mnote-fuji-tag.c:41
-#, fuzzy
 msgid "Chromaticity Saturation"
-msgstr "Mättnad"
+msgstr "Krominansmättnad"
 
 #: libexif/fuji/mnote-fuji-tag.c:44
 msgid "Flash Firing Strength Compensation"
-msgstr ""
+msgstr "Styrkekompensation för blixtavfyrning"
 
 #: libexif/fuji/mnote-fuji-tag.c:46
 msgid "Focusing Mode"
@@ -4148,77 +3697,71 @@ msgstr "Fokuseringspunkt"
 
 #: libexif/fuji/mnote-fuji-tag.c:48
 msgid "Slow Synchro Mode"
-msgstr ""
+msgstr "Långsamt synkläge"
 
 #: libexif/fuji/mnote-fuji-tag.c:49 libexif/pentax/mnote-pentax-tag.c:72
 msgid "Picture Mode"
 msgstr "Bildläge"
 
 #: libexif/fuji/mnote-fuji-tag.c:50
-#, fuzzy
 msgid "Continuous Taking"
-msgstr "Kontinuerlig, hög"
+msgstr "Kontinuerlig tagning"
 
 #: libexif/fuji/mnote-fuji-tag.c:51
-#, fuzzy
 msgid "Continuous Sequence Number"
-msgstr "Sekvensnummer"
+msgstr "Kontinuerligt sekvensnummer"
 
 #: libexif/fuji/mnote-fuji-tag.c:52
 msgid "FinePix Color"
-msgstr ""
+msgstr "FinePix-färg"
 
 #: libexif/fuji/mnote-fuji-tag.c:53
 msgid "Blur Check"
-msgstr ""
+msgstr "Oskärpekontroll"
 
 #: libexif/fuji/mnote-fuji-tag.c:54
 msgid "Auto Focus Check"
-msgstr ""
+msgstr "Autofokuskontroll"
 
 #: libexif/fuji/mnote-fuji-tag.c:55
-#, fuzzy
 msgid "Auto Exposure Check"
-msgstr "Automatisk exponering"
+msgstr "Autoexponeringskontroll"
 
 #: libexif/fuji/mnote-fuji-tag.c:56
 msgid "Dynamic Range"
-msgstr ""
+msgstr "Dynamiskt intervall"
 
 #: libexif/fuji/mnote-fuji-tag.c:57
 msgid "Film Simulation Mode"
-msgstr ""
+msgstr "Filmsimuleringsläge"
 
 #: libexif/fuji/mnote-fuji-tag.c:58
 msgid "Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Dynamiskt omfång brett läge"
 
 #: libexif/fuji/mnote-fuji-tag.c:59
 msgid "Development Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Utveckling dynamiskt omfång brett läge"
 
 #: libexif/fuji/mnote-fuji-tag.c:60
-#, fuzzy
 msgid "Minimum Focal Length"
-msgstr "Brännvidd"
+msgstr "Minsta brännvidd"
 
 #: libexif/fuji/mnote-fuji-tag.c:61
-#, fuzzy
 msgid "Maximum Focal Length"
-msgstr "Brännvidd"
+msgstr "Största brännvidd"
 
 #: libexif/fuji/mnote-fuji-tag.c:62
 msgid "Maximum Aperture at Minimum Focal"
-msgstr ""
+msgstr "Största bländare vid minimal brännvidd"
 
 #: libexif/fuji/mnote-fuji-tag.c:63
 msgid "Maximum Aperture at Maximum Focal"
-msgstr ""
+msgstr "Största bländare vid maximal brännvidd"
 
 #: libexif/fuji/mnote-fuji-tag.c:65
-#, fuzzy
 msgid "Order Number"
-msgstr "Serienummer"
+msgstr "Ordernummer"
 
 #: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
 msgid "Frame Number"
@@ -4231,23 +3774,23 @@ msgstr "Ogiltigt format \"%s\", förväntade \"%s\" eller \"%s\"."
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF non D lens"
-msgstr ""
+msgstr "AF ingen D-objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D or AF-S lens"
-msgstr ""
+msgstr "AF-D- eller AF-S-objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:95
 msgid "AF-D G lens"
-msgstr ""
+msgstr "AF-D G-objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:96
 msgid "AF-D VR lens"
-msgstr ""
+msgstr "AF-D VR-objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "AF-D G VR lens"
-msgstr ""
+msgstr "AF-D G VR-objektiv"
 
 #: libexif/olympus/mnote-olympus-entry.c:101
 msgid "Flash unit unknown"
@@ -4258,51 +3801,44 @@ msgid "Flash is external"
 msgstr "Blixt är extern"
 
 #: libexif/olympus/mnote-olympus-entry.c:103
-#, fuzzy
 msgid "Flash is on camera"
-msgstr "Blixt finns i kamera"
+msgstr "Blixt finns på kamera"
 
 #: libexif/olympus/mnote-olympus-entry.c:106
-#, fuzzy
 msgid "VGA basic"
-msgstr "VGA Grundläggande"
+msgstr "VGA grundläggande"
 
 #: libexif/olympus/mnote-olympus-entry.c:107
-#, fuzzy
 msgid "VGA normal"
-msgstr "VGA Normal"
+msgstr "VGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:108
-#, fuzzy
 msgid "VGA fine"
-msgstr "VGA Fin"
+msgstr "VGA fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:109
-#, fuzzy
 msgid "SXGA basic"
-msgstr "SXGA Grundläggande"
+msgstr "SXGA grundläggande"
 
 #: libexif/olympus/mnote-olympus-entry.c:110
-#, fuzzy
 msgid "SXGA normal"
-msgstr "SXGA Normal"
+msgstr "SXGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:111
-#, fuzzy
 msgid "SXGA fine"
-msgstr "SXGA Fin"
+msgstr "SXGA fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:112
 msgid "2 Mpixel basic"
-msgstr ""
+msgstr "2 Mpixel grundläggande"
 
 #: libexif/olympus/mnote-olympus-entry.c:113
 msgid "2 Mpixel normal"
-msgstr ""
+msgstr "2 Mpixel normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:114
 msgid "2 Mpixel fine"
-msgstr ""
+msgstr "2 Mpixel fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:117
 msgid "Color"
@@ -4310,11 +3846,11 @@ msgstr "Färg"
 
 #: libexif/olympus/mnote-olympus-entry.c:122
 msgid "Bright+"
-msgstr ""
+msgstr "Ljus+"
 
 #: libexif/olympus/mnote-olympus-entry.c:123
 msgid "Bright-"
-msgstr ""
+msgstr "Ljus-"
 
 #: libexif/olympus/mnote-olympus-entry.c:124
 msgid "Contrast+"
@@ -4347,15 +3883,15 @@ msgstr "Förval"
 
 #: libexif/olympus/mnote-olympus-entry.c:137
 msgid "Incandescence"
-msgstr ""
+msgstr "Glödlampa"
 
 #: libexif/olympus/mnote-olympus-entry.c:138
 msgid "Fluorescence"
-msgstr ""
+msgstr "Fluorescerande"
 
 #: libexif/olympus/mnote-olympus-entry.c:140
 msgid "SpeedLight"
-msgstr ""
+msgstr "Ljushastighet"
 
 #: libexif/olympus/mnote-olympus-entry.c:143
 msgid "No fisheye"
@@ -4471,12 +4007,11 @@ msgstr "På (förval)"
 
 #: libexif/olympus/mnote-olympus-entry.c:188
 msgid "Fill"
-msgstr ""
+msgstr "Fyllnad"
 
 #: libexif/olympus/mnote-olympus-entry.c:195
-#, fuzzy
 msgid "Internal + external"
-msgstr "Intern + Extern"
+msgstr "Intern + extern"
 
 #: libexif/olympus/mnote-olympus-entry.c:224
 msgid "Interlaced"
@@ -4493,23 +4028,20 @@ msgid "Best"
 msgstr "Bäst"
 
 #: libexif/olympus/mnote-olympus-entry.c:232
-#, fuzzy
 msgid "Adjust exposure"
 msgstr "Justera exponering"
 
 #: libexif/olympus/mnote-olympus-entry.c:235
-#, fuzzy
 msgid "Spot focus"
 msgstr "Punktfokus"
 
 #: libexif/olympus/mnote-olympus-entry.c:236
-#, fuzzy
 msgid "Normal focus"
 msgstr "Normalt fokus"
 
 #: libexif/olympus/mnote-olympus-entry.c:239
 msgid "Record while down"
-msgstr ""
+msgstr "Spara medan nere"
 
 #: libexif/olympus/mnote-olympus-entry.c:240
 msgid "Press start, press stop"
@@ -4565,7 +4097,7 @@ msgid "20 frames/sec"
 msgstr "20 bildrutor/s"
 
 #: libexif/olympus/mnote-olympus-entry.c:381
-#, fuzzy, c-format
+#, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr "Rödkorrigering %f, blåkorrigering %f"
 
@@ -4580,51 +4112,49 @@ msgstr "%2.2f meter"
 
 #: libexif/olympus/mnote-olympus-entry.c:417
 msgid "AF position: center"
-msgstr ""
+msgstr "AF-position: centrum"
 
 #: libexif/olympus/mnote-olympus-entry.c:418
-#, fuzzy
 msgid "AF position: top"
-msgstr "Fokusposition"
+msgstr "AF-position: toppen"
 
 #: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: bottom"
-msgstr ""
+msgstr "AF-position: botten"
 
 #: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: left"
-msgstr ""
+msgstr "AF-position: vänster"
 
 #: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: right"
-msgstr ""
+msgstr "AF-position: höger"
 
 #: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: upper-left"
-msgstr ""
+msgstr "AF-position: övre vänster"
 
 #: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-right"
-msgstr ""
+msgstr "AF-position: över höger"
 
 #: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: lower-left"
-msgstr ""
+msgstr "AF-position: nedre vänster"
 
 #: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-right"
-msgstr ""
+msgstr "AF-position: nedre höger"
 
 #: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: far left"
-msgstr ""
+msgstr "AF-position: lång till vänster"
 
 #: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far right"
-msgstr ""
+msgstr "AF-position: långt till höger"
 
 #: libexif/olympus/mnote-olympus-entry.c:428
-#, fuzzy
 msgid "Unknown AF position"
 msgstr "Okänd AF-position"
 
@@ -4651,9 +4181,8 @@ msgid "2 sec."
 msgstr "2 s"
 
 #: libexif/olympus/mnote-olympus-entry.c:598
-#, fuzzy
 msgid "Fast"
-msgstr "snabb"
+msgstr "Snabb"
 
 #: libexif/olympus/mnote-olympus-entry.c:702
 msgid "Automatic"
@@ -4670,7 +4199,7 @@ msgstr "Manuell: okänd"
 
 #: libexif/olympus/mnote-olympus-entry.c:741
 msgid "One-touch"
-msgstr ""
+msgstr "En-berörings"
 
 #: libexif/olympus/mnote-olympus-entry.c:797
 #: libexif/olympus/mnote-olympus-entry.c:807
@@ -4704,39 +4233,36 @@ msgid "White Balance Fine Adjustment"
 msgstr "Finjustering av vitbalans"
 
 #: libexif/olympus/mnote-olympus-tag.c:47
-#, fuzzy
 msgid "White Balance RB"
-msgstr "Vitbalans"
+msgstr "Vitbalans RB"
 
 #: libexif/olympus/mnote-olympus-tag.c:49
 msgid "ISO Selection"
 msgstr "ISO-val"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
-#, fuzzy
 msgid "Preview Image IFD"
-msgstr "Förhandsgranska bild"
+msgstr "Förhandsgranskningsbild IFD"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Offset of the preview image directory (IFD) inside the file."
-msgstr ""
+msgstr "Position till bildkatalogen för förhandsgranskningar (IFD) inuti filen."
 
 #: libexif/olympus/mnote-olympus-tag.c:51
 msgid "Exposurediff ?"
-msgstr ""
+msgstr "Exponeringsskillnad ?"
 
 #: libexif/olympus/mnote-olympus-tag.c:54
 msgid "Image Boundary"
-msgstr ""
+msgstr "Bildgräns"
 
 #: libexif/olympus/mnote-olympus-tag.c:56
 msgid "Flash Exposure Bracket Value"
-msgstr ""
+msgstr "F"
 
 #: libexif/olympus/mnote-olympus-tag.c:57
-#, fuzzy
 msgid "Exposure Bracket Value"
-msgstr "Bländartid"
+msgstr "Gafflingstal för exponering"
 
 #: libexif/olympus/mnote-olympus-tag.c:58
 #: libexif/olympus/mnote-olympus-tag.c:96
@@ -4744,9 +4270,8 @@ msgid "Image Adjustment"
 msgstr "Bildjustering"
 
 #: libexif/olympus/mnote-olympus-tag.c:59
-#, fuzzy
 msgid "Tone Compensation"
-msgstr "Komprimering"
+msgstr "Tonkompensering"
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
@@ -4754,13 +4279,13 @@ msgstr "Adapter"
 
 #: libexif/olympus/mnote-olympus-tag.c:62
 msgid "Lens"
-msgstr "Lins"
+msgstr "Objektiv"
 
 #: libexif/olympus/mnote-olympus-tag.c:63
 #: libexif/olympus/mnote-olympus-tag.c:135
 #: libexif/olympus/mnote-olympus-tag.c:185
 msgid "Manual Focus Distance"
-msgstr ""
+msgstr "Manuellt fokusavstånd"
 
 #: libexif/olympus/mnote-olympus-tag.c:65
 msgid "Flash Used"
@@ -4768,16 +4293,15 @@ msgstr "Blixt använd"
 
 #: libexif/olympus/mnote-olympus-tag.c:66
 msgid "AF Focus Position"
-msgstr ""
+msgstr "AF-fokusposition"
 
 #: libexif/olympus/mnote-olympus-tag.c:67
 msgid "Bracketing"
-msgstr ""
+msgstr "Gaffling"
 
 #: libexif/olympus/mnote-olympus-tag.c:69
-#, fuzzy
 msgid "Lens F Stops"
-msgstr "Linstyp"
+msgstr "F-steg för objektiv"
 
 #: libexif/olympus/mnote-olympus-tag.c:70
 msgid "Contrast Curve"
@@ -4795,7 +4319,7 @@ msgstr "Ljustyp"
 
 #: libexif/olympus/mnote-olympus-tag.c:74
 msgid "Hue Adjustment"
-msgstr ""
+msgstr "Nyansjustering"
 
 #: libexif/olympus/mnote-olympus-tag.c:76
 #: libexif/olympus/mnote-olympus-tag.c:163
@@ -4805,10 +4329,9 @@ msgstr "Brusreducering"
 
 #: libexif/olympus/mnote-olympus-tag.c:79
 msgid "Sensor Pixel Size"
-msgstr ""
+msgstr "Bildpunktsstorlek för sensor"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
-#, fuzzy
 msgid "Image Data Size"
 msgstr "Bildens datastorlek"
 
@@ -4826,15 +4349,15 @@ msgstr "Optimera bild"
 
 #: libexif/olympus/mnote-olympus-tag.c:88
 msgid "Vari Program"
-msgstr ""
+msgstr "Vari-program"
 
 #: libexif/olympus/mnote-olympus-tag.c:89
 msgid "Capture Editor Data"
-msgstr ""
+msgstr "Data för tagningsredigerare"
 
 #: libexif/olympus/mnote-olympus-tag.c:90
 msgid "Capture Editor Version"
-msgstr ""
+msgstr "Version av tagningsredigerare"
 
 #: libexif/olympus/mnote-olympus-tag.c:97
 #: libexif/olympus/mnote-olympus-tag.c:183
@@ -4855,20 +4378,19 @@ msgstr "Miniatyrbild"
 
 #: libexif/olympus/mnote-olympus-tag.c:106
 msgid "Speed/Sequence/Panorama Direction"
-msgstr ""
+msgstr "Hastighets-/Sekvens-/Panorama-riktning"
 
 #: libexif/olympus/mnote-olympus-tag.c:109
-#, fuzzy
 msgid "Black & White Mode"
-msgstr "Svart och vitt"
+msgstr "Svart/vitt läge"
 
 #: libexif/olympus/mnote-olympus-tag.c:111
 msgid "Focal Plane Diagonal"
-msgstr ""
+msgstr "Diagonal för fokalplan"
 
 #: libexif/olympus/mnote-olympus-tag.c:112
 msgid "Lens Distortion Parameters"
-msgstr ""
+msgstr "Parametrar för objektivdistorsion"
 
 #: libexif/olympus/mnote-olympus-tag.c:114
 msgid "Info"
@@ -4876,35 +4398,32 @@ msgstr "Info"
 
 #: libexif/olympus/mnote-olympus-tag.c:115
 msgid "Camera ID"
-msgstr ""
+msgstr "Kamera-ID"
 
 #: libexif/olympus/mnote-olympus-tag.c:116
 msgid "Precapture Frames"
-msgstr ""
+msgstr "Förtagningsbilder"
 
 #: libexif/olympus/mnote-olympus-tag.c:117
 msgid "White Board"
-msgstr ""
+msgstr "Vit tavla"
 
 #: libexif/olympus/mnote-olympus-tag.c:118
-#, fuzzy
 msgid "One Touch White Balance"
-msgstr "Vitbalans"
+msgstr "En punkts vitbalans"
 
 #: libexif/olympus/mnote-olympus-tag.c:119
-#, fuzzy
 msgid "White Balance Bracket"
-msgstr "Vitbalans"
+msgstr "Vitbalansgaffling"
 
 #: libexif/olympus/mnote-olympus-tag.c:120
 #: libexif/pentax/mnote-pentax-tag.c:123
-#, fuzzy
 msgid "White Balance Bias"
-msgstr "Vitbalans"
+msgstr "Vitbalans förinställning"
 
 #: libexif/olympus/mnote-olympus-tag.c:121
 msgid "Data Dump"
-msgstr ""
+msgstr "Datadump"
 
 #: libexif/olympus/mnote-olympus-tag.c:124
 msgid "ISO Value"
@@ -4928,7 +4447,7 @@ msgstr "Sensortemperatur"
 
 #: libexif/olympus/mnote-olympus-tag.c:131
 msgid "Lens Temperature"
-msgstr "Linstemperatur"
+msgstr "Objektivtemperatur"
 
 #: libexif/olympus/mnote-olympus-tag.c:132
 msgid "Light Condition"
@@ -4936,11 +4455,11 @@ msgstr "Ljusförhållande"
 
 #: libexif/olympus/mnote-olympus-tag.c:136
 msgid "Zoom Step Count"
-msgstr ""
+msgstr "Antal zoomsteg"
 
 #: libexif/olympus/mnote-olympus-tag.c:137
 msgid "Focus Step Count"
-msgstr ""
+msgstr "Antal fokussteg"
 
 #: libexif/olympus/mnote-olympus-tag.c:138
 msgid "Sharpness Setting"
@@ -4974,26 +4493,23 @@ msgstr "Blåbalans"
 
 #: libexif/olympus/mnote-olympus-tag.c:145
 msgid "Color Matrix Number"
-msgstr ""
+msgstr "Färgmatrisnummer"
 
 #: libexif/olympus/mnote-olympus-tag.c:147
-#, fuzzy
 msgid "Flash Exposure Comp"
-msgstr "Exponeringsläge"
+msgstr "Exponeringskompensering för blixt"
 
 #: libexif/olympus/mnote-olympus-tag.c:148
 msgid "Internal Flash Table"
 msgstr "Intern blixttabell"
 
 #: libexif/olympus/mnote-olympus-tag.c:149
-#, fuzzy
 msgid "External Flash G Value"
-msgstr "Extern blixt"
+msgstr "Extern blixt G-värde"
 
 #: libexif/olympus/mnote-olympus-tag.c:150
-#, fuzzy
 msgid "External Flash Bounce"
-msgstr "Extern blixt"
+msgstr "Extern blixt studs"
 
 #: libexif/olympus/mnote-olympus-tag.c:151
 msgid "External Flash Zoom"
@@ -5008,61 +4524,56 @@ msgid "Contrast Setting"
 msgstr "Kontrastinställning"
 
 #: libexif/olympus/mnote-olympus-tag.c:154
-#, fuzzy
 msgid "Sharpness Factor"
-msgstr "Skärpa"
+msgstr "Skärpningsfaktor"
 
 #: libexif/olympus/mnote-olympus-tag.c:155
 msgid "Color Control"
 msgstr "Färgkontroll"
 
 #: libexif/olympus/mnote-olympus-tag.c:156
-#, fuzzy
 msgid "Olympus Image Width"
-msgstr "Bildbredd"
+msgstr "Olympus bildbredd"
 
 #: libexif/olympus/mnote-olympus-tag.c:157
 msgid "Olympus Image Height"
-msgstr ""
+msgstr "Olympus bildhöjd"
 
 #: libexif/olympus/mnote-olympus-tag.c:158
 msgid "Scene Detect"
-msgstr ""
+msgstr "Scenidentifiering"
 
 #: libexif/olympus/mnote-olympus-tag.c:159
 msgid "Compression Ratio"
 msgstr "Komprimeringsnivå"
 
 #: libexif/olympus/mnote-olympus-tag.c:160
-#, fuzzy
 msgid "Preview Image Valid"
-msgstr "Förhandsgranska bild"
+msgstr "Förhandsgranskningsbild giltig"
 
 #: libexif/olympus/mnote-olympus-tag.c:161
 msgid "AF Result"
-msgstr ""
+msgstr "AF-resultat"
 
 #: libexif/olympus/mnote-olympus-tag.c:162
 msgid "CCD Scan Mode"
-msgstr ""
+msgstr "CCD-skanningsläge"
 
 #: libexif/olympus/mnote-olympus-tag.c:164
-#, fuzzy
 msgid "Infinity Lens Step"
-msgstr "Oändlig"
+msgstr "Oändligt objektivsteg"
 
 #: libexif/olympus/mnote-olympus-tag.c:165
-#, fuzzy
 msgid "Near Lens Step"
-msgstr "Linstyp"
+msgstr "Nära objektivsteg"
 
 #: libexif/olympus/mnote-olympus-tag.c:166
 msgid "Light Value Center"
-msgstr ""
+msgstr "Ljusvärde centrum"
 
 #: libexif/olympus/mnote-olympus-tag.c:167
 msgid "Light Value Periphery"
-msgstr ""
+msgstr "Ljusvärde periferi"
 
 #: libexif/olympus/mnote-olympus-tag.c:170
 msgid "Sequential Shot"
@@ -5070,7 +4581,7 @@ msgstr "Sekventiell tagning"
 
 #: libexif/olympus/mnote-olympus-tag.c:171
 msgid "Wide Range"
-msgstr ""
+msgstr "Stor bredd"
 
 #: libexif/olympus/mnote-olympus-tag.c:172
 msgid "Color Adjustment Mode"
@@ -5078,7 +4589,7 @@ msgstr "Färgjusteringsläge"
 
 #: libexif/olympus/mnote-olympus-tag.c:174
 msgid "Quick Shot"
-msgstr ""
+msgstr "Snabbtagning"
 
 #: libexif/olympus/mnote-olympus-tag.c:176
 msgid "Voice Memo"
@@ -5086,20 +4597,19 @@ msgstr "Röstmemo"
 
 #: libexif/olympus/mnote-olympus-tag.c:177
 msgid "Record Shutter Release"
-msgstr ""
+msgstr "Inspelningsslutarutlösare"
 
 #: libexif/olympus/mnote-olympus-tag.c:178
 msgid "Flicker Reduce"
-msgstr ""
+msgstr "Blinkningsreduktion"
 
 #: libexif/olympus/mnote-olympus-tag.c:179
 msgid "Optical Zoom"
 msgstr "Optisk zoom"
 
 #: libexif/olympus/mnote-olympus-tag.c:181
-#, fuzzy
 msgid "Light Source Special"
-msgstr "Ljuskälla"
+msgstr "Ljuskälla special"
 
 #: libexif/olympus/mnote-olympus-tag.c:182
 msgid "Resaved"
@@ -5110,28 +4620,25 @@ msgid "Scene Select"
 msgstr "Scenval"
 
 #: libexif/olympus/mnote-olympus-tag.c:186
-#, fuzzy
 msgid "Sequence Shot Interval"
-msgstr "Sekvensnummer"
+msgstr "Intervall för sekvenstagning"
 
 #: libexif/olympus/mnote-olympus-tag.c:189
-#, fuzzy
 msgid "Epson Image Width"
-msgstr "Bildbredd"
+msgstr "Epson bildbredd"
 
 #: libexif/olympus/mnote-olympus-tag.c:190
-#, fuzzy
 msgid "Epson Image Height"
-msgstr "Bildlängd"
+msgstr "Epson bildhöjd"
 
 #: libexif/olympus/mnote-olympus-tag.c:191
 msgid "Epson Software Version"
-msgstr ""
+msgstr "Epson programvaruversion"
 
 #: libexif/pentax/mnote-pentax-entry.c:80
 #: libexif/pentax/mnote-pentax-entry.c:134
 msgid "Multi-exposure"
-msgstr ""
+msgstr "Multiexponering"
 
 #: libexif/pentax/mnote-pentax-entry.c:83
 #: libexif/pentax/mnote-pentax-entry.c:137
@@ -5196,18 +4703,16 @@ msgid "Green mode"
 msgstr "Grönläge"
 
 #: libexif/pentax/mnote-pentax-entry.c:184
-#, fuzzy
 msgid "Light pet"
-msgstr "Ljustyp"
+msgstr "Ljus husdjur"
 
 #: libexif/pentax/mnote-pentax-entry.c:185
 msgid "Dark pet"
-msgstr ""
+msgstr "Mörkt husdjur"
 
 #: libexif/pentax/mnote-pentax-entry.c:186
-#, fuzzy
 msgid "Medium pet"
-msgstr "Medium 1"
+msgstr "Medium husdjur"
 
 #: libexif/pentax/mnote-pentax-entry.c:188
 #: libexif/pentax/mnote-pentax-entry.c:296
@@ -5215,17 +4720,16 @@ msgid "Candlelight"
 msgstr "Stearinljus"
 
 #: libexif/pentax/mnote-pentax-entry.c:189
-#, fuzzy
 msgid "Natural skin tone"
-msgstr "Mättnad"
+msgstr "Naturlig hudfärg"
 
 #: libexif/pentax/mnote-pentax-entry.c:190
 msgid "Synchro sound record"
-msgstr ""
+msgstr "Synkroniserad ljudinspelning"
 
 #: libexif/pentax/mnote-pentax-entry.c:191
 msgid "Frame composite"
-msgstr ""
+msgstr "Ramsammansättning"
 
 #: libexif/pentax/mnote-pentax-entry.c:194
 msgid "Auto, did not fire"
@@ -5252,18 +4756,16 @@ msgid "On, soft"
 msgstr "PÃ¥, mjuk"
 
 #: libexif/pentax/mnote-pentax-entry.c:203
-#, fuzzy
 msgid "On, slow-sync"
 msgstr "På, långsam synk"
 
 #: libexif/pentax/mnote-pentax-entry.c:204
-#, fuzzy
 msgid "On, slow-sync, red-eye reduction"
 msgstr "På, långsam synk, minskning av röda ögon"
 
 #: libexif/pentax/mnote-pentax-entry.c:205
 msgid "On, trailing-curtain sync"
-msgstr ""
+msgstr "På, efterföljande ridåsynk"
 
 #: libexif/pentax/mnote-pentax-entry.c:213
 msgid "AF-S"
@@ -5275,63 +4777,61 @@ msgstr "AF-C"
 
 #: libexif/pentax/mnote-pentax-entry.c:217
 msgid "Upper-left"
-msgstr ""
+msgstr "Övre vänster"
 
 #: libexif/pentax/mnote-pentax-entry.c:218
 msgid "Top"
-msgstr ""
+msgstr "Toppen"
 
 #: libexif/pentax/mnote-pentax-entry.c:219
 msgid "Upper-right"
-msgstr ""
+msgstr "Övre höger"
 
 #: libexif/pentax/mnote-pentax-entry.c:221
 msgid "Mid-left"
-msgstr ""
+msgstr "Mitten vänster"
 
 #: libexif/pentax/mnote-pentax-entry.c:223
 msgid "Mid-right"
-msgstr ""
+msgstr "Mitten höger"
 
 #: libexif/pentax/mnote-pentax-entry.c:225
 msgid "Lower-left"
-msgstr ""
+msgstr "Nedre vänster"
 
 #: libexif/pentax/mnote-pentax-entry.c:226
 msgid "Bottom"
-msgstr ""
+msgstr "Botten"
 
 #: libexif/pentax/mnote-pentax-entry.c:227
 msgid "Lower-right"
-msgstr ""
+msgstr "Nedre höger"
 
 #: libexif/pentax/mnote-pentax-entry.c:228
-#, fuzzy
 msgid "Fixed center"
-msgstr "Fint väder"
+msgstr "Fixerat centrum"
 
 #: libexif/pentax/mnote-pentax-entry.c:232
 msgid "Multiple"
-msgstr ""
+msgstr "Multipla"
 
 #: libexif/pentax/mnote-pentax-entry.c:234
 msgid "Top-center"
-msgstr ""
+msgstr "Toppen centrum"
 
 #: libexif/pentax/mnote-pentax-entry.c:240
 msgid "Bottom-center"
-msgstr ""
+msgstr "Botten centrum"
 
 #: libexif/pentax/mnote-pentax-entry.c:257
 msgid "User selected"
-msgstr ""
+msgstr "Användarvald"
 
 #: libexif/pentax/mnote-pentax-entry.c:282
 msgid "3008x2008 or 3040x2024"
 msgstr "3008x2008 eller 3040x2024"
 
 #: libexif/pentax/mnote-pentax-entry.c:293
-#, fuzzy
 msgid "Digital filter?"
 msgstr "Digitalt filter?"
 
@@ -5351,9 +4851,8 @@ msgid "Quality Level"
 msgstr "Kvalitetsnivå"
 
 #: libexif/pentax/mnote-pentax-tag.c:54
-#, fuzzy
 msgid "ISO Speed"
-msgstr "ISO-känslighet"
+msgstr "ISO-hastighet"
 
 #: libexif/pentax/mnote-pentax-tag.c:56
 msgid "Colors"
@@ -5361,7 +4860,7 @@ msgstr "Färger"
 
 #: libexif/pentax/mnote-pentax-tag.c:59
 msgid "PrintIM Settings"
-msgstr ""
+msgstr "PrintIM-inställningar"
 
 #: libexif/pentax/mnote-pentax-tag.c:60 libexif/pentax/mnote-pentax-tag.c:131
 msgid "Time Zone"
@@ -5372,19 +4871,16 @@ msgid "Daylight Savings"
 msgstr "Sommartid"
 
 #: libexif/pentax/mnote-pentax-tag.c:64
-#, fuzzy
 msgid "Preview Size"
-msgstr "Förhandsgranska bild"
+msgstr "Storlek på förhandsgranskning"
 
 #: libexif/pentax/mnote-pentax-tag.c:65
-#, fuzzy
 msgid "Preview Length"
-msgstr "Förhandsgranska bild"
+msgstr "Längd för förhandsgranskning"
 
 #: libexif/pentax/mnote-pentax-tag.c:66 libexif/pentax/mnote-pentax-tag.c:122
-#, fuzzy
 msgid "Preview Start"
-msgstr "Förhandsgranska bild"
+msgstr "Start av förhandsgranskning"
 
 #: libexif/pentax/mnote-pentax-tag.c:67
 msgid "Model Identification"
@@ -5400,11 +4896,11 @@ msgstr "Tid"
 
 #: libexif/pentax/mnote-pentax-tag.c:75
 msgid "AF Point Selected"
-msgstr ""
+msgstr "AF-punkt vald"
 
 #: libexif/pentax/mnote-pentax-tag.c:76
 msgid "Auto AF Point"
-msgstr ""
+msgstr "Auto AF-punkt"
 
 #: libexif/pentax/mnote-pentax-tag.c:77
 msgid "Focus Position"
@@ -5416,7 +4912,7 @@ msgstr "ISO-nummer"
 
 #: libexif/pentax/mnote-pentax-tag.c:83
 msgid "Auto Bracketing"
-msgstr ""
+msgstr "Autogaffling"
 
 #: libexif/pentax/mnote-pentax-tag.c:85
 msgid "White Balance Mode"
@@ -5424,31 +4920,31 @@ msgstr "Vitbalansläge"
 
 #: libexif/pentax/mnote-pentax-tag.c:93
 msgid "World Time Location"
-msgstr ""
+msgstr "Världstidsplats"
 
 #: libexif/pentax/mnote-pentax-tag.c:94
 msgid "Hometown City"
-msgstr ""
+msgstr "Hemstad"
 
 #: libexif/pentax/mnote-pentax-tag.c:95
 msgid "Destination City"
-msgstr ""
+msgstr "Destinationsstad"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Hometown DST"
-msgstr ""
+msgstr "Hemstads sommartid"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Home Daylight Savings Time"
-msgstr ""
+msgstr "Sommartid hemma"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
 msgid "Destination DST"
-msgstr ""
+msgstr "Destination sommartid"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
 msgid "Destination Daylight Savings Time"
-msgstr ""
+msgstr "Sommartid destination"
 
 #: libexif/pentax/mnote-pentax-tag.c:99
 msgid "Image Processing"
@@ -5460,7 +4956,7 @@ msgstr "Bildläge (2)"
 
 #: libexif/pentax/mnote-pentax-tag.c:103
 msgid "Image Area Offset"
-msgstr ""
+msgstr "Bildområdesposition"
 
 #: libexif/pentax/mnote-pentax-tag.c:104
 msgid "Raw Image Size"
@@ -5468,7 +4964,7 @@ msgstr "Storlek för råbild"
 
 #: libexif/pentax/mnote-pentax-tag.c:105
 msgid "Autofocus Points Used"
-msgstr ""
+msgstr "Autofokus punkter som använts"
 
 #: libexif/pentax/mnote-pentax-tag.c:107
 msgid "Camera Temperature"
@@ -5480,20 +4976,19 @@ msgstr "Bildton"
 
 #: libexif/pentax/mnote-pentax-tag.c:111
 msgid "Shake Reduction Info"
-msgstr ""
+msgstr "Information om skakreduktion"
 
 #: libexif/pentax/mnote-pentax-tag.c:112
 msgid "Black Point"
 msgstr "Svartpunkt"
 
 #: libexif/pentax/mnote-pentax-tag.c:114
-#, fuzzy
 msgid "AE Info"
-msgstr "Info"
+msgstr "AE-info"
 
 #: libexif/pentax/mnote-pentax-tag.c:115
 msgid "Lens Info"
-msgstr "Linsinformation"
+msgstr "Objektivinformation"
 
 #: libexif/pentax/mnote-pentax-tag.c:116
 msgid "Flash Info"
@@ -5509,19 +5004,19 @@ msgstr "Batteriinformation"
 
 #: libexif/pentax/mnote-pentax-tag.c:119
 msgid "Hometown City Code"
-msgstr ""
+msgstr "Postkod hemstad"
 
 #: libexif/pentax/mnote-pentax-tag.c:120
 msgid "Destination City Code"
-msgstr ""
+msgstr "Postkod destination"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
 msgid "Object Distance"
-msgstr "Objektavstånd"
+msgstr "Avstånd till objekt"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
 msgid "Distance of photographed object in millimeters."
-msgstr ""
+msgstr "Avstånd till fotograferat objekt i millimeter."
 
 #: libexif/pentax/mnote-pentax-tag.c:126
 msgid "Flash Distance"
@@ -5529,7 +5024,7 @@ msgstr "Blixtavstånd"
 
 #: libexif/pentax/mnote-pentax-tag.c:132
 msgid "Bestshot Mode"
-msgstr ""
+msgstr "Bästa tagningsläge"
 
 #: libexif/pentax/mnote-pentax-tag.c:133
 msgid "CCS ISO Sensitivity"
@@ -5540,13 +5035,15 @@ msgid "Enhancement"
 msgstr "Förbättring"
 
 #: libexif/pentax/mnote-pentax-tag.c:136
-#, fuzzy
 msgid "Finer"
-msgstr "Fast"
+msgstr "Finare"
 
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
-msgstr ""
+msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
+
+#~ msgid "FNumber"
+#~ msgstr "F-nummer"
 
 #~ msgid "On + Red-eye reduction"
 #~ msgstr "På + minskning av röda ögon"
diff --git a/po/tr.gmo b/po/tr.gmo
deleted file mode 100644
index befe629..0000000
--- a/po/tr.gmo
+++ /dev/null
diff --git a/po/tr.po b/po/tr.po
index a08df0f..ce928a5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
 "PO-Revision-Date: 2012-06-05 04:47+0000\n"
 "Last-Translator: kulkke <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 06:53+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2018-08-13 00:12+0000\n"
+"X-Generator: Launchpad (build 18747)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -40,7 +40,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "Bileşenlerin numarası geçersiz (%i, beklenen: %i ya da %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -51,14 +51,14 @@ msgstr "Makro"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -87,15 +87,15 @@ msgstr "Çok iyi"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -127,8 +127,8 @@ msgstr "Otomatik"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -146,12 +146,11 @@ msgstr "YavaÅŸ eÅŸleme"
 
 #: libexif/canon/mnote-canon-entry.c:88
 msgid "Auto, red-eye reduction"
-msgstr ""
+msgstr "Otomatik, kırmızı-göz azaltma"
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
-msgstr ""
+msgstr "Açık, kırmızı-göz azaltma"
 
 #: libexif/canon/mnote-canon-entry.c:90
 msgid "External flash"
@@ -189,11 +188,11 @@ msgstr "Tek çekim AF"
 
 #: libexif/canon/mnote-canon-entry.c:98
 msgid "AI servo AF"
-msgstr ""
+msgstr "AI servo AF"
 
 #: libexif/canon/mnote-canon-entry.c:99
 msgid "AI focus AF"
-msgstr ""
+msgstr "AI odak AF"
 
 #: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103
 msgid "Manual focus"
@@ -271,9 +270,8 @@ msgstr "Tam otomatik"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -285,7 +283,7 @@ msgid "Manual"
 msgstr "El ile"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -314,7 +312,7 @@ msgid "Sepia"
 msgstr "Sepya"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -341,8 +339,7 @@ msgstr "Canlı"
 msgid "Neutral"
 msgstr "Nötr"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "Flaş kapalı"
 
@@ -357,7 +354,7 @@ msgstr "Süper makro"
 
 #: libexif/canon/mnote-canon-entry.c:138
 msgid "Foliage"
-msgstr ""
+msgstr "YeÅŸillik"
 
 #: libexif/canon/mnote-canon-entry.c:139
 msgid "Indoor"
@@ -390,7 +387,7 @@ msgstr "Çocuklar & hayvanlar"
 
 #: libexif/canon/mnote-canon-entry.c:145
 msgid "Night snapshot"
-msgstr ""
+msgstr "Gece çekimi"
 
 #: libexif/canon/mnote-canon-entry.c:146
 msgid "Digital macro"
@@ -406,11 +403,11 @@ msgstr "Anlık görüntü"
 
 #: libexif/canon/mnote-canon-entry.c:149
 msgid "Color accent"
-msgstr ""
+msgstr "Renk vurgusu"
 
 #: libexif/canon/mnote-canon-entry.c:150
 msgid "Color swap"
-msgstr ""
+msgstr "Renk deÄŸiÅŸimi"
 
 #: libexif/canon/mnote-canon-entry.c:151
 msgid "Aquarium"
@@ -424,7 +421,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "Hiçbiri"
@@ -437,8 +434,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "DiÄŸer"
 
@@ -488,25 +485,25 @@ msgstr "800"
 msgid "Default"
 msgstr "Varsayılan"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
-msgstr ""
+msgstr "Nokta"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "Ortalama"
 
 #: libexif/canon/mnote-canon-entry.c:176
 msgid "Evaluative"
-msgstr ""
+msgstr "DeÄŸerlendirmeli"
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "Kısmi"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
-msgstr ""
+msgstr "Merkez-ağırlıklı ortalama"
 
 #: libexif/canon/mnote-canon-entry.c:181
 msgid "Not known"
@@ -516,7 +513,7 @@ msgstr "Bilinmiyor"
 msgid "Very close"
 msgstr "Çok yakın"
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "Kapat"
 
@@ -535,7 +532,7 @@ msgstr "Sonsuzluk"
 
 #: libexif/canon/mnote-canon-entry.c:190
 msgid "Manual AF point selection"
-msgstr ""
+msgstr "Manuel AF nokta seçimi"
 
 #: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
 msgid "None (MF)"
@@ -543,7 +540,7 @@ msgstr "Hiçbiri (MF)"
 
 #: libexif/canon/mnote-canon-entry.c:192
 msgid "Auto-selected"
-msgstr ""
+msgstr "Otomatik-seçme"
 
 #: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
 #: libexif/pentax/mnote-pentax-entry.c:224
@@ -555,7 +552,7 @@ msgstr "SaÄŸ"
 #: libexif/pentax/mnote-pentax-entry.c:222
 #: libexif/pentax/mnote-pentax-entry.c:237
 msgid "Center"
-msgstr ""
+msgstr "Merkez"
 
 #: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
 #: libexif/pentax/mnote-pentax-entry.c:220
@@ -565,11 +562,11 @@ msgstr "Sol"
 
 #: libexif/canon/mnote-canon-entry.c:196
 msgid "Auto AF point selection"
-msgstr ""
+msgstr "Otomatik AF nokta seçimi"
 
 #: libexif/canon/mnote-canon-entry.c:197
 msgid "Easy shooting"
-msgstr ""
+msgstr "Kolay çekim"
 
 #: libexif/canon/mnote-canon-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:163
@@ -578,11 +575,11 @@ msgstr "Program"
 
 #: libexif/canon/mnote-canon-entry.c:199
 msgid "Tv-priority"
-msgstr ""
+msgstr "Tv-önceliği"
 
 #: libexif/canon/mnote-canon-entry.c:200
 msgid "Av-priority"
-msgstr ""
+msgstr "Av-önceliği"
 
 #: libexif/canon/mnote-canon-entry.c:202
 msgid "A-DEP"
@@ -630,7 +627,7 @@ msgstr "Canon EF 80-200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:213
 msgid "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
-msgstr ""
+msgstr "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
 
 #: libexif/canon/mnote-canon-entry.c:214
 msgid "Cosina 100mm f/3.5 Macro AF"
@@ -653,9 +650,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "Canon EF 24mm f/2.8 veya Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -674,9 +670,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "Canon EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -927,9 +922,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "Canon EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "Canon EF 70-200mm f/2.8L IS USM"
+msgstr "Canon EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -945,15 +939,15 @@ msgstr "E-TTL"
 
 #: libexif/canon/mnote-canon-entry.c:292
 msgid "FP sync enabled"
-msgstr ""
+msgstr "FP senk. etkin"
 
 #: libexif/canon/mnote-canon-entry.c:293
 msgid "2nd-curtain sync used"
-msgstr ""
+msgstr "2inci-perde eşlemesi, kullandı"
 
 #: libexif/canon/mnote-canon-entry.c:294
 msgid "FP sync used"
-msgstr ""
+msgstr "FP senk. kullanıldı"
 
 #: libexif/canon/mnote-canon-entry.c:295
 #: libexif/olympus/mnote-olympus-entry.c:193
@@ -971,27 +965,27 @@ msgstr "Normal AE"
 
 #: libexif/canon/mnote-canon-entry.c:300
 msgid "Exposure compensation"
-msgstr ""
+msgstr "Poz telafisi"
 
 #: libexif/canon/mnote-canon-entry.c:301
 msgid "AE lock"
-msgstr ""
+msgstr "AE kilit"
 
 #: libexif/canon/mnote-canon-entry.c:302
 msgid "AE lock + exposure compensation"
-msgstr ""
+msgstr "AE kilidi + poz telafisi"
 
 #: libexif/canon/mnote-canon-entry.c:303
 msgid "No AE"
-msgstr ""
+msgstr "AE yok"
 
 #: libexif/canon/mnote-canon-entry.c:306
 msgid "On, shot only"
-msgstr ""
+msgstr "Açık, tek çekim"
 
 #: libexif/canon/mnote-canon-entry.c:310
 msgid "Smooth"
-msgstr ""
+msgstr "Pürüzsüz"
 
 #: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
 #: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
@@ -1019,7 +1013,7 @@ msgstr "1/3"
 
 #: libexif/canon/mnote-canon-entry.c:324
 msgid "Fixed"
-msgstr ""
+msgstr "Düzeltildi"
 
 #: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
 msgid "Zoom"
@@ -1030,54 +1024,54 @@ msgid "Sunny"
 msgstr "Güneşli"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr "Bulutlu"
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "Tungsten"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "Floresan"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "FlaÅŸ"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
-msgstr ""
+msgstr "Gölge"
 
 #: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "Manual temperature (Kelvin)"
-msgstr ""
+msgstr "Manuel sıcaklık (Kelvin)"
 
 #: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
 msgid "PC set 1"
-msgstr ""
+msgstr "PC ayarı 1"
 
 #: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "PC set 2"
-msgstr ""
+msgstr "PC ayarı 2"
 
 #: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "PC set 3"
-msgstr ""
+msgstr "PC ayarı 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "Gün ışığı floresan"
@@ -1090,7 +1084,7 @@ msgstr "Özel 1"
 msgid "Custom 2"
 msgstr "Özel 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1100,15 +1094,15 @@ msgstr "Gece çekimi"
 
 #: libexif/canon/mnote-canon-entry.c:355
 msgid "Center-right"
-msgstr ""
+msgstr "Merkez-saÄŸ"
 
 #: libexif/canon/mnote-canon-entry.c:357
 msgid "Left-right"
-msgstr ""
+msgstr "Sol-saÄŸ"
 
 #: libexif/canon/mnote-canon-entry.c:358
 msgid "Left-center"
-msgstr ""
+msgstr "Sol-merkez"
 
 #: libexif/canon/mnote-canon-entry.c:359
 msgid "All"
@@ -1116,61 +1110,61 @@ msgstr "Tümü"
 
 #: libexif/canon/mnote-canon-entry.c:361
 msgid "On (shot 1)"
-msgstr ""
+msgstr "Açık (çekim 1)"
 
 #: libexif/canon/mnote-canon-entry.c:362
 msgid "On (shot 2)"
-msgstr ""
+msgstr "Açık (çekim 2)"
 
 #: libexif/canon/mnote-canon-entry.c:363
 msgid "On (shot 3)"
-msgstr ""
+msgstr "Açık (çekim 3)"
 
 #: libexif/canon/mnote-canon-entry.c:365
 msgid "EOS high-end"
-msgstr ""
+msgstr "EOS yüksek-son"
 
 #: libexif/canon/mnote-canon-entry.c:366
 msgid "Compact"
-msgstr ""
+msgstr "Kompak"
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
-msgstr ""
+msgstr "EOS orta-mesafe"
 
 #: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotate 90 CW"
-msgstr ""
+msgstr "Döndür 90 CW"
 
 #: libexif/canon/mnote-canon-entry.c:370
 msgid "Rotate 180"
-msgstr ""
+msgstr "Döndür 180"
 
 #: libexif/canon/mnote-canon-entry.c:371
 msgid "Rotate 270 CW"
-msgstr ""
+msgstr "Döndür 270 CW"
 
 #: libexif/canon/mnote-canon-entry.c:372
 msgid "Rotated by software"
 msgstr "Yazılımca döndürülmüş"
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr "Soldan saÄŸa"
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr "SaÄŸdan sola"
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr "Aşağıdan yukarıya"
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr "Yukarıdan aşağıya"
 
@@ -1180,7 +1174,7 @@ msgstr "2x2 matriks (saat yönünde)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1198,9 +1192,8 @@ msgstr "En düşük"
 msgid "Highest"
 msgstr "En yüksek"
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1208,15 +1201,15 @@ msgstr "Gün ışığı"
 
 #: libexif/canon/mnote-canon-entry.c:422
 msgid "Set 1"
-msgstr ""
+msgstr "Ayar 1"
 
 #: libexif/canon/mnote-canon-entry.c:423
 msgid "Set 2"
-msgstr ""
+msgstr "Ayar 2"
 
 #: libexif/canon/mnote-canon-entry.c:424
 msgid "Set 3"
-msgstr ""
+msgstr "Ayar 3"
 
 #: libexif/canon/mnote-canon-entry.c:425
 msgid "User def. 1"
@@ -1244,48 +1237,55 @@ msgstr "Harici 3"
 
 #: libexif/canon/mnote-canon-entry.c:435
 msgid "Faithful"
-msgstr ""
+msgstr "Bağlı"
 
 #: libexif/canon/mnote-canon-entry.c:436
 #: libexif/olympus/mnote-olympus-entry.c:118
 msgid "Monochrome"
-msgstr ""
+msgstr "Siyah beyaz"
 
 #: libexif/canon/mnote-canon-entry.c:494
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr "%i (ms)"
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr "1/%i"
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i bayt bilinmeyen veri"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
-msgstr ""
+msgstr "Ayarlar (Birincil Bölüm)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "Odak Uzaklığı"
 
@@ -1293,11 +1293,10 @@ msgstr "Odak Uzaklığı"
 msgid "Settings (Second Part)"
 msgstr "Ayarlar (İkinci Kısım)"
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
-msgstr ""
+msgstr "Genel Görünüm"
 
 #: libexif/canon/mnote-canon-tag.c:39
 msgid "Image Type"
@@ -1332,13 +1331,13 @@ msgstr "Özel Fonksiyonlar"
 
 #: libexif/canon/mnote-canon-tag.c:56 libexif/fuji/mnote-fuji-tag.c:45
 msgid "Macro Mode"
-msgstr ""
+msgstr "Makro Kipi"
 
 #: libexif/canon/mnote-canon-tag.c:57 libexif/canon/mnote-canon-tag.c:117
 #: libexif/olympus/mnote-olympus-tag.c:175
 #: libexif/pentax/mnote-pentax-tag.c:128
 msgid "Self-timer"
-msgstr ""
+msgstr "Otomatik deklanşör"
 
 #: libexif/canon/mnote-canon-tag.c:58 libexif/fuji/mnote-fuji-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:40
@@ -1349,8 +1348,8 @@ msgstr "Kalite"
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "FlaÅŸ Modu"
 
@@ -1361,9 +1360,8 @@ msgstr "Sürücü Modu"
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "Odaklama Modu"
 
@@ -1377,30 +1375,29 @@ msgstr "Görüntü Boyutu"
 
 #: libexif/canon/mnote-canon-tag.c:64
 msgid "Easy Shooting Mode"
-msgstr ""
+msgstr "Kolay Çekim Kipi"
 
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "Dijital Yakınlaştırma"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "Karşıtlık"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "Doygunluk"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1410,20 +1407,20 @@ msgstr "Keskinlik"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
-msgstr ""
+msgstr "Ölçüm Kipi"
 
 #: libexif/canon/mnote-canon-tag.c:71 libexif/olympus/mnote-olympus-tag.c:133
 msgid "Focus Range"
-msgstr ""
+msgstr "Odak Aralığı"
 
 #: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
 msgid "AF Point"
-msgstr ""
+msgstr "AF Nokta"
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "Poz Kipi"
 
@@ -1434,27 +1431,27 @@ msgstr "Mercek Türü"
 
 #: libexif/canon/mnote-canon-tag.c:75
 msgid "Long Focal Length of Lens"
-msgstr ""
+msgstr "Objektifin Uzun Odak Uzaklığı"
 
 #: libexif/canon/mnote-canon-tag.c:76
 msgid "Short Focal Length of Lens"
-msgstr ""
+msgstr "Merceğin Kısa Odak Uzaklığı"
 
 #: libexif/canon/mnote-canon-tag.c:77
 msgid "Focal Units per mm"
-msgstr ""
+msgstr "Mm başına Odak Birimleri"
 
 #: libexif/canon/mnote-canon-tag.c:78
 msgid "Maximal Aperture"
-msgstr ""
+msgstr "En Yüksek Diyafram"
 
 #: libexif/canon/mnote-canon-tag.c:79
 msgid "Minimal Aperture"
-msgstr ""
+msgstr "En Az Diyafram"
 
 #: libexif/canon/mnote-canon-tag.c:80
 msgid "Flash Activity"
-msgstr ""
+msgstr "FlaÅŸ EtkinliÄŸi"
 
 #: libexif/canon/mnote-canon-tag.c:81
 msgid "Flash Details"
@@ -1462,7 +1459,7 @@ msgstr "Flaş Detayları"
 
 #: libexif/canon/mnote-canon-tag.c:83
 msgid "AE Setting"
-msgstr ""
+msgstr "AE Ayarı"
 
 #: libexif/canon/mnote-canon-tag.c:84
 msgid "Image Stabilization"
@@ -1470,23 +1467,23 @@ msgstr "Görüntü Sabitleme"
 
 #: libexif/canon/mnote-canon-tag.c:85
 msgid "Display Aperture"
-msgstr ""
+msgstr "Görüntüleme Açıklığı"
 
 #: libexif/canon/mnote-canon-tag.c:86
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Yakınlaştırma Kaynak  Genişliği"
 
 #: libexif/canon/mnote-canon-tag.c:87
 msgid "Zoom Target Width"
-msgstr ""
+msgstr "Yakınlaştırma Hedef Genişiliği"
 
 #: libexif/canon/mnote-canon-tag.c:88
 msgid "Photo Effect"
-msgstr ""
+msgstr "FotoÄŸraf Etkisi"
 
 #: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
 msgid "Manual Flash Output"
-msgstr ""
+msgstr "Manuel Flaş Çıkışı"
 
 #: libexif/canon/mnote-canon-tag.c:90
 msgid "Color Tone"
@@ -1494,43 +1491,43 @@ msgstr "Renk Tonu"
 
 #: libexif/canon/mnote-canon-tag.c:91
 msgid "Focal Type"
-msgstr ""
+msgstr "Odak Türü"
 
 #: libexif/canon/mnote-canon-tag.c:93
 msgid "Focal Plane X Size"
-msgstr ""
+msgstr "Odak Düzlemi X Boyutu"
 
 #: libexif/canon/mnote-canon-tag.c:94
 msgid "Focal Plane Y Size"
-msgstr ""
+msgstr "Odak Düzlemi Y Boyutu"
 
 #: libexif/canon/mnote-canon-tag.c:95
 msgid "Auto ISO"
-msgstr ""
+msgstr "Oto ISO"
 
 #: libexif/canon/mnote-canon-tag.c:96
 msgid "Shot ISO"
-msgstr ""
+msgstr "ISO Çekim"
 
 #: libexif/canon/mnote-canon-tag.c:97
 msgid "Measured EV"
-msgstr ""
+msgstr "Ölçülen EV"
 
 #: libexif/canon/mnote-canon-tag.c:98
 msgid "Target Aperture"
-msgstr ""
+msgstr "Hedef Açıklık"
 
 #: libexif/canon/mnote-canon-tag.c:99
 msgid "Target Exposure Time"
-msgstr ""
+msgstr "Hedef Pozlama Saati"
 
 #: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
 #: libexif/pentax/mnote-pentax-tag.c:81
 msgid "Exposure Compensation"
-msgstr ""
+msgstr "Poz Düzeltimi"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1539,49 +1536,50 @@ msgstr "Beyaz Dengesi"
 
 #: libexif/canon/mnote-canon-tag.c:102
 msgid "Slow Shutter"
-msgstr ""
+msgstr "Yavaş Deklanşör"
 
 #: libexif/canon/mnote-canon-tag.c:103
 msgid "Sequence Number"
-msgstr ""
+msgstr "Sıra Numarası"
 
 #: libexif/canon/mnote-canon-tag.c:104
 msgid "Flash Guide Number"
-msgstr ""
+msgstr "Flaş Kılavuz Numarası"
 
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
 msgid "Flash Exposure Compensation"
-msgstr ""
+msgstr "FlaÅŸ Pozlama Telafisi"
 
 #: libexif/canon/mnote-canon-tag.c:107
 msgid "AE Bracketing"
-msgstr ""
+msgstr "AE Braketleme"
 
 #: libexif/canon/mnote-canon-tag.c:108
 msgid "AE Bracket Value"
-msgstr ""
+msgstr "AE Braketleme DeÄŸeri"
 
 #: libexif/canon/mnote-canon-tag.c:109
 msgid "Focus Distance Upper"
-msgstr ""
+msgstr "Odak Mesafesi Ãœst"
 
 #: libexif/canon/mnote-canon-tag.c:110
 msgid "Focus Distance Lower"
-msgstr ""
+msgstr "Odak Mesafesi Alt"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr ""
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "F-Numarası"
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
-msgstr ""
+msgstr "Pozlama Tarihi"
 
 #: libexif/canon/mnote-canon-tag.c:113
 msgid "Bulb Duration"
-msgstr ""
+msgstr "Işık Süresi"
 
 #: libexif/canon/mnote-canon-tag.c:114
 msgid "Camera Type"
@@ -1589,31 +1587,31 @@ msgstr "Kamera Türü"
 
 #: libexif/canon/mnote-canon-tag.c:115
 msgid "Auto Rotate"
-msgstr ""
+msgstr "Otomatik Döndür"
 
 #: libexif/canon/mnote-canon-tag.c:116
 msgid "ND Filter"
-msgstr ""
+msgstr "ND Süzgeci"
 
 #: libexif/canon/mnote-canon-tag.c:119
 msgid "Panorama Frame"
-msgstr ""
+msgstr "Tablo Çerçevesi"
 
 #: libexif/canon/mnote-canon-tag.c:120
 msgid "Panorama Direction"
-msgstr ""
+msgstr "Genel Görünüm Yönetimi"
 
 #: libexif/canon/mnote-canon-tag.c:121
 msgid "Tone Curve"
-msgstr ""
+msgstr "Ton EÄŸrisi"
 
 #: libexif/canon/mnote-canon-tag.c:122
 msgid "Sharpness Frequency"
-msgstr ""
+msgstr "Keskinlik Sıklığı"
 
 #: libexif/canon/mnote-canon-tag.c:124
 msgid "Picture Style"
-msgstr ""
+msgstr "Resim Stili"
 
 #: libexif/exif-byte-order.c:33
 msgid "Motorola"
@@ -1623,49 +1621,53 @@ msgstr "Motorola"
 msgid "Intel"
 msgstr "Intel"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr "Verinin boyutu EXIF verisi için kabul edilebilecek değerin altında."
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr "EXIF etiketi bulunamadı."
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
-msgstr ""
+msgstr "EXIF başlığı bulunamadı."
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr "Bilinmeyen kodlama."
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr "Bilinmeyen etiketleri yoksay"
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
-msgstr ""
+msgstr "EXIF verileri."
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
-msgstr ""
+msgstr "Özelliği Takip Et"
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 msgstr ""
+"Özelliği izleyen EXIF verilerini almak için girdileri ekleyin, düzeltin ve "
+"kaldırın."
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
-msgstr ""
+msgstr "Yapımcı notunu değiştirme"
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
 msgstr ""
+"Exif verilerini yüklerken ve eski haline getirirken yapımcı notunu "
+"değiştirilmeden kaydedin. Yapımcının bozulabileceğini unutmayın."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
@@ -1673,6 +1675,8 @@ msgid ""
 "Tag '%s' was of format '%s' (which is against specification) and has been "
 "changed to format '%s'."
 msgstr ""
+"'%s' etiketi '%s' biçimindeydi (belirtime aykırı) ve biçim ' %s' olarak "
+"deÄŸiÅŸtirildi."
 
 #: libexif/exif-entry.c:271
 #, c-format
@@ -1680,6 +1684,8 @@ msgid ""
 "Tag '%s' is of format '%s' (which is against specification) but cannot be "
 "changed to format '%s'."
 msgstr ""
+"'%s' etiketi '%s' biçimindedir (belirtime aykırıdır) ancak '%s' biçimine "
+"deÄŸiÅŸtirilemez."
 
 #: libexif/exif-entry.c:354
 #, c-format
@@ -1687,393 +1693,400 @@ msgid ""
 "Tag 'UserComment' had invalid format '%s'. Format has been set to "
 "'undefined'."
 msgstr ""
+"'KullanıcıYorumu' etiketinde '%s' geçersiz biçimi var. Biçim 'tanımlanmamış' "
+"olarak ayarlandı."
 
 #: libexif/exif-entry.c:381
 msgid ""
 "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
 "the specification."
 msgstr ""
+"'KullanıcıYorumu' etiketi, şartnameyi izlemek için en az 8 bayt'a "
+"geniÅŸletildi."
 
 #: libexif/exif-entry.c:396
 msgid ""
 "Tag 'UserComment' is not empty but does not start with a format identifier. "
 "This has been fixed."
 msgstr ""
+"'KullanıcıYorum' etiketi boş değil, ancak bir biçim tanımlayıcısı ile "
+"başlamıyor. Bu düzeltildi."
 
 #: libexif/exif-entry.c:424
 msgid ""
 "Tag 'UserComment' did not start with a format identifier. This has been "
 "fixed."
 msgstr ""
+"'KullanıcıYorum' etiketi bir biçim tanımlayıcısı ile başlamadı. Bu "
+"düzeltildi."
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr "%i bayt tanımlanmamış veri"
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr "%i bayt desteklenmemiş veri türü"
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr ""
+"'%s' etiketi geçersiz bir biçime ('%s', beklenen '%s') ait verileri içeriyor."
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr ""
+msgstr "'%s' etiketi, geçersiz sayıda bileşen içeriyor (%i, beklenen %i)."
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
-msgstr ""
+msgstr "Bodur Biçim"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
-msgstr ""
+msgstr "Düzlemsel Biçim"
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "Tanımlanmamış"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
-msgstr ""
+msgstr "Tek yongalı renkli alan sensörü"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
-msgstr ""
+msgstr "İki yongalı renkli alan sensörü"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
-msgstr ""
+msgstr "Üç yongalı renkli alan sensörü"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
-msgstr ""
+msgstr "Renkli sıralı alan sensörü"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
-msgstr ""
+msgstr "Üç çizgili algılayıcı"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
-msgstr ""
+msgstr "Renkli sıralı alan sensörü"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr "Ãœst-sol"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr "Ãœst-saÄŸ"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr "Alt-saÄŸ"
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr "Alt-sol"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
-msgstr ""
+msgstr "Sol-Ãœst"
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
-msgstr ""
+msgstr "Sağ-üst"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
-msgstr ""
+msgstr "SaÄŸ-Alt"
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
-msgstr ""
+msgstr "Sol-Alt"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
-msgstr ""
+msgstr "Ortalanmış"
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
-msgstr ""
+msgstr "Co-sited"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
-msgstr ""
+msgstr "Ters tekli"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
-msgstr ""
+msgstr "Normal tekli"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "Palet"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
-msgstr ""
+msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "Normal iÅŸlem"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "Özel işlem"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
-msgstr ""
+msgstr "Otomatik pozlama"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
-msgstr ""
+msgstr "Elle pozlama"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
-msgstr ""
+msgstr "Otomatik ayraç"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
-msgstr ""
+msgstr "Otomatik beyaz dengesi"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
-msgstr ""
+msgstr "Elle beyaz dengesi"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
-msgstr ""
+msgstr "Düşük kazanç"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
-msgstr ""
+msgstr "Yüksek kazanç"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
-msgstr ""
+msgstr "Düşük kazanç"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
-msgstr ""
+msgstr "Yüksek kazanç"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "Düşük doygunluk"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "Yüksek doygunluk"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "YumuÅŸak"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
 #: libexif/pentax/mnote-pentax-entry.c:107
 msgid "Hard"
-msgstr ""
+msgstr "Zor"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
-msgstr ""
+msgstr "Averaj"
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
-msgstr ""
+msgstr "Merkez-yükseklik"
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
-msgstr ""
+msgstr "Çoklu nokta"
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "Desen"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
-msgstr ""
+msgstr "LZW sıkıştırma"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
-msgstr ""
+msgstr "JPEG sıkıştırma"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
-msgstr ""
+msgstr "Deflate/ZIP sıkıştırma"
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
-msgstr ""
+msgstr "PackBits sıkıştırma"
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
-msgstr ""
+msgstr "Tungsten akkor lamba"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "Açık hava"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr "Bulutlu hava"
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
-msgstr ""
+msgstr "Gün beyaz floresan"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
-msgstr ""
+msgstr "Soğuk beyaz flüoresan"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "Beyaz floresan"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "Standart ışık A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "Standart ışık B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "Standart ışık C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
-msgstr ""
+msgstr "ISO stüdyo tungsten"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "İnç"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
-msgstr ""
+msgstr "İçinde"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "Santimetre"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "Normal program"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
-msgstr ""
+msgstr "Diyafram açıklığı önceliği"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
-msgstr ""
+msgstr "Diyafram Açıklığı"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
-msgstr ""
+msgstr "Deklanşör önceliği"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
-msgstr ""
+msgstr "Deklanşör"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
-msgstr ""
+msgstr "Yaratıcı program (alan derinliğine doğru önyargılı)"
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
-msgstr ""
+msgstr "OluÅŸturucu"
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
-msgstr ""
+msgstr "Oluşturucu program (hızlı obtüratör hızına doğru önyargılı)"
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
-msgstr ""
+msgstr "Eylem"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
-msgstr ""
+msgstr "Portre kipi (arka planın odak dışına olduğu çekimlerde)"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
-msgstr ""
+msgstr "Manzara kipi (odaklanmış arka plandaki manzaralı fotoğraflar için)"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "Flaş çalışmadı"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
-msgstr ""
+msgstr "Flaşsız"
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
-msgstr ""
+msgstr "Flaş patladı"
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2081,324 +2094,326 @@ msgstr ""
 msgid "Yes"
 msgstr "Evet"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
-msgstr ""
+msgstr "Elektronik flaş dönüş ışığı algılanmadı"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
-msgstr ""
+msgstr "Elektronik flaşsız"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
-msgstr ""
+msgstr "Elektronik flaş dönüş ışığı algılandı"
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
-msgstr ""
+msgstr "Elektronik flaşlı"
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
-msgstr ""
+msgstr "Flaş patladı, zorunlu flaş kipi"
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
+msgstr "Flaş patladı, zorunlu flaş kipi, dönüş ışığı algılanmadı"
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
-msgstr ""
+msgstr "Flaş patladı, zorunlu flaş kipi, dönüş ışığı algılandı"
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
-msgstr ""
+msgstr "Flaş patlamadı, zorunlu flaş kipi"
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
-msgstr ""
+msgstr "Flaş patlamadı, otomatik kip"
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
-msgstr ""
+msgstr "Flaş patladı, otomatik kip"
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
+msgstr "Flaş patladı, otomatik kip, dönüş ışığı algılanmadı"
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
-msgstr ""
+msgstr "Flaş patladı, otomatik kip, dönüş ışığı algılandı"
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
-msgstr ""
+msgstr "FlaÅŸ iÅŸlevi yok"
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
-msgstr ""
+msgstr "Flaş patladı, kırmızı-görme azaltma kipi"
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
+msgstr "Flaş patladı, kırmızı göz azaltma kip, dönüş ışığı"
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
+msgstr "Flaş patladı, kırmızı göz azaltma kipi, dönüş ışığı algılandı"
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
-msgstr ""
+msgstr "Flaş patladı, zorunlu flaş kipi, kırmızı göz azaltma modu"
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
-msgstr ""
+msgstr "Flaş patladı, zorunlu flaş kipi, kırmızı göz azaltma kipi, dönüş ışığı"
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
+"Flaş patladı, zorunlu flaş kipi, kırmızı göz azaltma kipi, dönüş ışığı "
+"algılandı"
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "Flaş patlamadı, otomatik kip, kırmızı göz azaltma kipi"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "Flaş patladı, otomatik kip, kırmızı göz giderme kipi"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
+"Flaş patladı, otomatik kip, dönüş ışığı algılanmadı, kırmızı göz azaltma kipi"
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
+"Flaş patladı, otomatik kip, dönüş ışığı algılandı, kırmızı göz giderme kipi"
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr "?"
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
-msgstr ""
+msgstr "Yakın görünüm"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
-msgstr ""
+msgstr "Uzak görünüm"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
-msgstr ""
+msgstr "Uzak"
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
-msgstr ""
+msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
-msgstr ""
+msgstr "Adobe RGB"
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
-msgstr ""
+msgstr "Ayarlanmamış"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
-msgstr ""
+msgstr "Geçersiz giriş boyutu (%i, beklenen %li x %i)."
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
-msgstr ""
+msgstr "Desteklenmeyen UNICODE dize"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
-msgstr ""
+msgstr "Desteklenmeyen JIS dizesi"
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
-msgstr ""
+msgstr "Tag KullanıcıYorum verileri içeriyor, ancak belirtime aykırı."
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
-msgstr ""
+msgstr "%i konumundaki bayt: 0x%02x"
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
-msgstr ""
+msgstr "Bilinmeyen Exif Sürümü"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
-msgstr ""
+msgstr "Exif Sürümü %d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
-msgstr ""
+msgstr "FlashPix Sürümü 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
-msgstr ""
+msgstr "FlashPix Sürümü 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
-msgstr ""
+msgstr "Bilinmeyen FlashPix Sürümü"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
-msgstr ""
+msgstr "[Hiçbiri]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "(Fotoğrafçı)"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr "(Düzenleyen)"
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
-msgstr ""
+msgstr "%.02f EV"
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr " (f/%.01f)"
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
-msgstr ""
+msgstr " (35 eÅŸdeÄŸer: %d mm)"
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr " sn."
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr " (1/%d sn.)"
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr " (%d sn.)"
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr " (%.02f cd/m^2)"
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
-msgstr ""
+msgstr "DSC"
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr "Dahili hata (bilinmeyen deÄŸer %i)"
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr "-"
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
-msgstr ""
+msgstr "Cb"
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
-msgstr ""
+msgstr "Cr"
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
-msgstr ""
+msgstr "R"
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
-msgstr ""
+msgstr "G"
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
-msgstr ""
+msgstr "B"
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
-msgstr ""
+msgstr "Ayrılmış"
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
-msgstr ""
+msgstr "Doğrudan fotoğraflandı"
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
-msgstr ""
+msgstr "YCbCr4:2:2"
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
-msgstr ""
+msgstr "YCbCr4:2:0"
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
-msgstr ""
+msgstr "(X, y) = (%i,%i) arasındaki uzaklık %i içinde"
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
-msgstr ""
+msgstr "Dikdörtgen (genişlik %i, yükseklik %i) çevresinde (x, y) = (%i,%i)"
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
-msgstr ""
+msgstr "Beklenmeyen sayıda bileşen (%li, 2, 3 veya 4 bekleniyordu)."
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr "Deniz seviyesi"
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
-msgstr ""
+msgstr "Deniz seviyesi referans"
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr "Bilinmeyen deÄŸer %i"
 
 #: libexif/exif-format.c:37
 msgid "Short"
-msgstr ""
+msgstr "Kısa"
 
 #: libexif/exif-format.c:38
 msgid "Rational"
-msgstr ""
+msgstr "Rasyonel"
 
 #: libexif/exif-format.c:39
 msgid "SRational"
-msgstr ""
+msgstr "SRasyonel"
 
 #: libexif/exif-format.c:40
 msgid "Undefined"
-msgstr ""
+msgstr "Tanımsız"
 
 #: libexif/exif-format.c:41
 msgid "ASCII"
@@ -2414,23 +2429,23 @@ msgstr "Bayt"
 
 #: libexif/exif-format.c:44
 msgid "SByte"
-msgstr ""
+msgstr "SBayt"
 
 #: libexif/exif-format.c:45
 msgid "SShort"
-msgstr ""
+msgstr "SKısa"
 
 #: libexif/exif-format.c:46
 msgid "SLong"
-msgstr ""
+msgstr "SUzun"
 
 #: libexif/exif-format.c:47
 msgid "Float"
-msgstr ""
+msgstr "Kaydırma"
 
 #: libexif/exif-format.c:48
 msgid "Double"
-msgstr ""
+msgstr "Çift"
 
 #: libexif/exif-loader.c:119
 #, c-format
@@ -2439,15 +2454,15 @@ msgstr "'%s' dosyası açılamadı."
 
 #: libexif/exif-loader.c:300
 msgid "The data supplied does not seem to contain EXIF data."
-msgstr ""
+msgstr "Veriler EXIF verileri deÄŸildir."
 
 #: libexif/exif-log.c:43
 msgid "Debugging information"
-msgstr ""
+msgstr "Yanlış ayıklama bilgisi"
 
 #: libexif/exif-log.c:44
 msgid "Debugging information is available."
-msgstr ""
+msgstr "Yanlış ayıklama bilgisi kullanılabilir."
 
 #: libexif/exif-log.c:45
 msgid "Not enough memory"
@@ -2463,51 +2478,61 @@ msgstr "Bozuk veri"
 
 #: libexif/exif-log.c:48
 msgid "The data provided does not follow the specification."
-msgstr ""
+msgstr "SaÄŸlanan veri belirtimi izlemiyor."
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
-msgstr ""
+msgstr "GPS Etiketi Sürümü"
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
 "tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
+"<GPSInfoIFD> sürümünü belirtir. Sürüm 2.0.0.0 olarak verilir. <GPSInfo> "
+"etiketi mevcutken bu etiket zorunludur. (Not: <GPSVersionID> etiketi "
+"<ExifVersion> etiketinin aksine bayt olarak verilir.) Sürüm 2.0.0.0 "
+"olduÄŸunda, etiket deÄŸeri 02000000.H'dir."
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
-msgstr ""
+msgstr "Birlikte işlerlik içeriği"
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 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 ""
+"Birlikte Çalışabilirlik kuralı tanımını belirtir. ExifR98 Kurallarını "
+"belirtirken \"R98\" kullanın. Sonlandırma kodu dahil olmak üzere dört bayt "
+"kullanılır (NULL). ExifR98 için kullanılan diğer etiketler için Önerilen "
+"Exif Birlikte Çalışabilirlik Kuralları'nın (ExifR98) ayrı bir bölümüne bakın."
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr "Kuzey veya Güney Enlemi"
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
+"Enlemin kuzey veya güney enlemi olup olmadığını gösterir. ASCII değeri 'N' "
+"kuzey enlemini, 'S' ise güney enlemidir."
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
-msgstr ""
+msgstr "Birlikte İşlerlik Sürümü"
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr "Enlem"
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2515,22 +2540,29 @@ msgid ""
 "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 ""
+"Enlemi belirtir. Enlem derecelerini sırasıyla derece, dakika ve saniye "
+"cinsinden veren üç RASYAL değer olarak ifade edilir. Derece, dakika ve "
+"saniye ifade edildiğinde, biçim dd/1,mm/1,ss/1 şeklindedir. Dakika ve dakika "
+"kullanılırken ve örneğin dakikalık kesirler iki ondalık basamak kadar "
+"verilir, biçim dd/1,mmmm/100,0/1 şeklindedir."
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr "Doğu veya Batı Boylamı"
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
+"Boylamın doğu ya da batı boylam olup olmadığını gösterir. ASCII 'E' doğu "
+"boylamı, 'W' batı boylamını belirtir."
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr "Boylam"
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2538,45 +2570,61 @@ msgid ""
 "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."
 msgstr ""
+"Boylamı gösterir. Boylam sırasıyla derece, dakika ve saniye vererek üç "
+"RASYAL deÄŸer olarak ifade edilir. Derece, dakika ve saniye ifade "
+"edildiğinde, format ddd/1,mm/1,ss/1 şeklindedir. Örneğin, derece ve dakika "
+"kullanıldığında, dakikalık kesirler iki ondalık basamak kadar verilir, biçim "
+"ddd/1,mmmm/100,0/1 ÅŸeklindedir."
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
-msgstr ""
+msgstr "Yükseklik Referansı"
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
+#, fuzzy
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
+"Referans irtifası olarak kullanılan yüksekliği belirtir. Referans deniz "
+"seviyesiyse ve yükseklik deniz seviyesinin üzerindeyse, 0 verilir. Yükseklik "
+"deniz seviyesinin altında ise 1 değeri verilir ve yükseklik GSPAltitude "
+"etiketinde mutlak bir değer olarak gösterilir. Referans birimi metredir. Bu "
+"etiketin diğer referans etiketlerinin aksine bir BAYT türü olduğuna dikkat "
+"edin."
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
-msgstr ""
+msgstr "Yükseklik"
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
+"GPSAltitudeRef'de referansa dayalı olan yüksekliği belirtir. Rakım bir "
+"Rasyonel deÄŸer olarak ifade edilir. Referans birimi metredir."
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr "GPS Saati (Atom Saati)"
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
+"Saati UTC (Koordineli Evrensel Saat) olarak gösterir. TimeStamp saat, dakika "
+"ve saniye değerini veren üç RASYAL değer olarak ifade edilir."
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr "GPS Uyduları"
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2584,102 +2632,123 @@ msgid ""
 "specified. If the GPS receiver is incapable of taking measurements, value of "
 "the tag shall be set to NULL."
 msgstr ""
+"Ölçümler için kullanılan GPS uydularını belirtir. Bu etiket, uyduların "
+"sayısını, kimlik numaralarını, yükseklik açısını, azimutu, SNR'yi ve ASCII "
+"gösterimindeki diğer bilgileri tanımlamak için kullanılabilir. Biçim "
+"belirtilmedi. GPS alıcısı ölçüm yapamazsa, etiketin değeri NULL olarak "
+"ayarlanmalıdır."
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
-msgstr ""
+msgstr "GPS Alıcı Durumu"
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
+"Görüntü kaydedildiğinde GPS alıcısının durumunu gösterir. 'A', ölçüm devam "
+"ettiği anlamına gelir ve 'V', ölçümün Birlikte Çalışabilirlik olduğu "
+"anlamına gelir."
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
-msgstr ""
+msgstr "GPS Ölçüm Kipi"
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
+"GPS ölçüm kipini gösterir. '2' iki boyutlu ölçüm anlamına gelir ve '3' üç "
+"boyutlu ölçüm devam ediyor demektir."
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
-msgstr ""
+msgstr "Ölçüm Hassasiyeti"
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
+"GPS DOP (hassas veri derecesi) gösterir. İki boyutlu ölçüm sırasında bir "
+"HDOP değeri, üç boyutlu ölçüm sırasında PDOP yazılır."
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
-msgstr ""
+msgstr "Hız Birimi"
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
+"Ünitenin, GPS alıcısının hareket hızını ifade etmek için kullanıldığını "
+"gösterir. 'K', 'M' ve 'N' saatte kilometre, saatte kilometre ve düğümleri "
+"temsil eder."
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
-msgstr ""
+msgstr "GPS Alıcısının Hızı"
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
-msgstr ""
+msgstr "GPS alıcısı hareketinin hızını belirtir."
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
-msgstr ""
+msgstr "Hareket yönü için referans"
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
-msgstr ""
+msgstr "Hareket Yönü"
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
+"GPS alıcısı hareketinin yönünü belirtir. Değer aralığı 0.00 - 359.99 "
+"arasındadır."
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
-msgstr ""
+msgstr "GPS Görüntü Yön Referansı"
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
+"Yakalanırken görüntünün yönünü verme referansını belirtir. 'T' gerçek yönü "
+"belirtir ve 'M' manyetik yöndür."
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
-msgstr ""
+msgstr "GPS Görüntü Yönü"
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
+"Yakalanan görüntünün yönünü belirtir. Değer aralığı 0.00 - 359.99 "
+"arasındadır."
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
-msgstr ""
+msgstr "Kullanılan Jeodezik Anket Verileri"
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2687,22 +2756,22 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
-msgstr ""
+msgstr "Hedef Enlem İçin Referans"
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 ""
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
-msgstr ""
+msgstr "Hedef Enlem"
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2712,21 +2781,21 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
-msgstr ""
+msgstr "Hedef Boylam Referansı"
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
-msgstr ""
+msgstr "Hedef Boylam Referansı"
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2736,49 +2805,49 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
-msgstr ""
+msgstr "Hedefe Konum Açı Referansı"
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
-msgstr ""
+msgstr "Hedef  Konum Açısı"
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
-msgstr ""
+msgstr "Hedefe Mesafe İçin Referans"
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
-msgstr ""
+msgstr "Hedefe Mesafe"
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
-msgstr ""
+msgstr "Varış noktasına olan uzaklığı belirtir."
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
-msgstr ""
+msgstr "GPS İşleme Yönteminin Adı"
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2786,70 +2855,85 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
-msgstr ""
+msgstr "GPS Alanının Adı"
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr "GPS Tarihi"
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
-msgstr ""
+msgstr "GPS Diferansiyel Düzeltme"
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
-msgstr ""
+msgstr "GPS alıcısına ayrımsal düzeltmenin uygulanıp uygulanmadığını belirtir."
 
 #: libexif/exif-tag.c:220
-msgid "New Subfile Type"
+msgid "GPS Horizontal Positioning Error"
 msgstr ""
 
-#: libexif/exif-tag.c:220
-msgid "A general indication of the kind of data contained in this subfile."
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
 msgstr ""
 
+#: libexif/exif-tag.c:225
+msgid "New Subfile Type"
+msgstr "Yeni Altdosya Türü"
+
 #: libexif/exif-tag.c:222
+msgid "A general indication of the kind of data contained in this subfile."
+msgstr "Bu alt dosyada yer alan verilerin türünün genel bir göstergesi."
+
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr "Görüntü Genişliği"
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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 ""
+"Görüntü veri sütun sayısı, her piksel satırının sayısına eşittir.Bir JPEG "
+"işaretleyicisinin, bu etiketin yerine kullanıldığı JPEG içinde sıkıştırılmış "
+"veri."
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr "Görüntü Uzunluğu"
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
+"Görüntü verisinin satır sayısı. JPEG sıkıştırılmış verilerinde bu etiket "
+"yerine bir JPEG işaretçisi kullanılır."
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
-msgstr ""
+msgstr "Örnek Başına Bit"
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2857,40 +2941,42 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
-msgstr ""
+msgstr "Sıkıştırma"
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 ""
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
-msgstr ""
+msgstr "Fotometrik yorum"
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
+"Piksel bileşimi. JPEG sıkıştırılmış verilerinde bu etiket yerine bir JPEG "
+"işaretçisi kullanılır."
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr ""
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr "Belge Adı"
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
-msgstr ""
+msgstr "Görüntü Açıklaması"
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2898,33 +2984,33 @@ msgid ""
 "is to be used."
 msgstr ""
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
-msgstr ""
+msgstr "Ãœretici"
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 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 ""
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr "Model"
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 ""
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
-msgstr ""
+msgstr "Åžerit Ofsetlerini"
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2932,30 +3018,30 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
-msgstr ""
+msgstr "Yönlendirme"
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
-msgstr ""
+msgstr "Resim satır ve sütunlarla gösterilir."
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
-msgstr ""
+msgstr "Piksel başına örnekler"
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 ""
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
-msgstr ""
+msgstr "Şerit Başına Satır Sayısı"
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -2963,74 +3049,74 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
-msgstr ""
+msgstr "Şerit Bayt Sayısı"
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
-msgstr ""
+msgstr "X-Çözünürlüğü"
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
-msgstr ""
+msgstr "Y-Çözünürlüğü"
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
-msgstr ""
+msgstr "Düzlemsel Yapılandırma"
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
-msgstr ""
+msgstr "Çözünürlük Birimi"
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 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 ""
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
-msgstr ""
+msgstr "Transfer Fonksiyonu"
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 ""
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr "Yazılım"
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3038,21 +3124,21 @@ msgid ""
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr "Tarih ve Zaman"
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 msgstr ""
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr "Sanatçı"
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3060,51 +3146,53 @@ msgid ""
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
-msgstr ""
+msgstr "Beyaz Nokta"
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
-msgstr ""
+msgstr "Birincil Renklilikler"
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
+"Bir TIFF dosyası içinde TIFF Ağaçlarını etkinleştirmek için Adobe "
+"Corporation tarafından tanımlanmıştır."
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
-msgstr ""
+msgstr "Transfer Aralığı"
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
-msgstr ""
+msgstr "JPEG Değişim Biçimi"
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
-msgstr ""
+msgstr "JPEG Değişim Biçimi Uzunluğu"
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3113,11 +3201,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
-msgstr ""
+msgstr "YCbCr Katsayıları"
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3126,21 +3214,21 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
-msgstr ""
+msgstr "YCbCr Konumlandırma"
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3155,11 +3243,11 @@ msgid ""
 "both centered and co-sited positioning."
 msgstr ""
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr ""
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3168,34 +3256,34 @@ msgid ""
 "Interoperability these conditions."
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr "XML Paketi"
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
-msgstr ""
+msgstr "XMP Meta Verileri"
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
-msgstr ""
+msgstr "CFA Deseni"
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 ""
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr "Pil Seviyesi"
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr "Telif Hakkı"
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3214,122 +3302,126 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
-msgstr ""
+msgstr "F Numarası"
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
-msgstr ""
+msgstr "Resim Kaynakları Engelleme"
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
-msgstr ""
+msgstr "Pozlama Yazılımı"
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
-msgstr ""
+msgstr "Spektral Duyarlılık"
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
-msgstr ""
+msgstr "GPS Bilgisi IFD Ä°ÅŸaretleyici"
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
+"GPS Bilgi IFD'ye bir işaretçi. GPS Bilgi IFD'nin, Exif IFD'ninki gibi, "
+"birlikte çalışabilirlik yapısı, resim verisine sahip değildir."
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
-msgstr ""
+msgstr "ISO Hızı Oranları"
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
+"Kamera veya giriş cihazının ISO Hızını ve ISO Enlemini ISO 12232'de "
+"belirtildiği şekilde gösterir."
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
-msgstr ""
+msgstr "Opto-Elektronik Dönüşüm İşlevi"
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
-msgstr ""
+msgstr "Saat Dilimi Ofset"
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
-msgstr ""
+msgstr "Kamera saatinin saat dilimini GMT'ye göre kodlar."
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr "Exif Sürümü"
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
+"Bu standardın sürümü desteklenmektedir. Bu alanın bulunmaması, standardın "
+"uygun olmaması anlamına gelmektedir."
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
-msgstr ""
+msgstr "Tarih ve Saat (Orijinal)"
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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 ""
+"Orijinal görüntü verisinin üretildiği tarih ve saat. Dijital bir fotoğraf "
+"makinesi için fotoğrafın çekildiği tarih ve saat kaydedilir."
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
-msgstr ""
+msgstr "Tarih ve Saat (Sayısallaştırılmış)"
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
-msgstr ""
+msgstr "Bileşenlerin Yapılandırması"
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3339,120 +3431,129 @@ msgid ""
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
-msgstr ""
+msgstr "Piksel başına Sıkıştırılmış Bitler"
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
+"Sıkıştırılmış verilere özgü bilgiler. Sıkıştırılmış bir görüntü için "
+"kullanılan sıkıştırma modu piksel başına birim bitler halinde gösterilir."
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Enstantane Hızı"
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
+"Deklanşör hızı. Birim APEX (Fotoğraf Ortamının Katkı Sistemi) ayarıdır."
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
-msgstr ""
+msgstr "Objektif açıklığı. Birim APEX değeridir."
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "Parlaklık"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 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 ""
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
-msgstr ""
+msgstr "Poz Meyili"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
+"Pozlama yanlılığı. Birimler APEX değeridir. Genellikle -99.99 ile 99.99 "
+"aralığında verilir."
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
-msgstr ""
+msgstr "Maksimum Açıklık Değeri"
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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 ""
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
-msgstr ""
+msgstr "Hedef Uzaklığı"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
-msgstr ""
+msgstr "Metre olarak verilen, konunun mesafesi."
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
-msgstr ""
+msgstr "Ölçme kipi."
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "Işık Kaynağı"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr "Işık kaynağının türü."
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
-msgstr ""
+msgstr "Bu etiket, flaş ışığı (flaş) olduğunda çekilir."
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 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 ""
+"Objektifin gerçek odak uzaklığı mm cinsindendir. Dönüşüm, 35 mm'lik bir film "
+"kamerasının odak uzaklığına yapılmaz."
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
-msgstr ""
+msgstr "Konu Alanı"
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
-msgstr ""
+msgstr "Bu etiket ana konunun yerini ve alanını belirtir."
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
-msgstr ""
+msgstr "TIFF/EP Standart KimliÄŸi"
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
-msgstr ""
+msgstr "Yapımcı Notu"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
+"İstenilen bilgileri kaydetmek için Exif yazarlarının üreticileri için bir "
+"etiket. İçerikler üreticiye aittir."
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
-msgstr ""
+msgstr "Kullanıcı Yorumu"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3474,86 +3575,91 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
-msgstr ""
+msgstr "Alt-Saniye Saati"
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
-msgstr ""
+msgstr "Ä°kinci Saniye Saati (Orijinal)"
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
-msgstr ""
+msgstr "Alt Saniyelik Zaman (Sayısallaştırılmış)"
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
-msgstr ""
+msgstr "XP Başlığı"
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
-msgstr ""
+msgstr "XP Yorum"
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
+"UTF-16LE'de kodlanmış, resimle ilgili bir açıklama içeren bir karakter "
+"dizgesi."
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
-msgstr ""
+msgstr "XP Yazar"
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
+"UTF-16LE'de kodlanmış görüntü yaratıcının adını içeren bir karakter dizesi."
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
-msgstr ""
+msgstr "XP Anahtar Kelimeleri"
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
+"UTF-16LE'de kodlanmış, görüntüyü açıklayan anahtar kelimeleri içeren bir "
+"karakter dizesi."
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
-msgstr ""
+msgstr "UTF-16LE'de kodlanmış, resim konusunu veren bir karakter dizesi."
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Renk Aralığı"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3562,11 +3668,11 @@ msgid ""
 "be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
-msgstr ""
+msgstr "Piksel X Boyutu"
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3574,11 +3680,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
-msgstr ""
+msgstr "Piksel Y Boyutu"
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3588,11 +3694,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
-msgstr ""
+msgstr "Bağlantılı Ses Dosyası"
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3617,11 +3723,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3630,62 +3736,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
-msgstr ""
+msgstr "FlaÅŸ Enerjisi"
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
-msgstr ""
+msgstr "Odak Düzlemi X-Çözünürlüğü"
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
-msgstr ""
+msgstr "Odak Düzlemi Y-Çözünürlüğü"
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
-msgstr ""
+msgstr "Odaksal Düzlem Çözünürlüğü Birimi"
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
-msgstr ""
+msgstr "Konu Yeri"
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3694,176 +3800,179 @@ msgid ""
 "number."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
-msgstr ""
+msgstr "Pozlama Ä°ndeksi"
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
+"Fotoğraf çekildiğinde kamera veya giriş cihazında seçilen pozlama indeksini "
+"belirtir."
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
-msgstr ""
+msgstr "Algılama Yöntemi"
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
+"Fotoğraf makinesi veya giriş cihazındaki görüntü sensörü türünü belirtir."
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
-msgstr ""
+msgstr "Dosya Kaynağı"
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
-msgstr ""
+msgstr "Manzara Türü"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
-msgstr ""
+msgstr "Özel Duruma Getirilmiş"
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
-msgstr ""
+msgstr "Dijital Yakınlaştırma Oranı"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
-msgstr ""
+msgstr "35mm Filmde Odak Uzaklığı"
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
-msgstr ""
+msgstr "Manzara Yakalama Türü"
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
-msgstr ""
+msgstr "Artış Kontrolü"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr ""
+msgstr "Bu etiket, toplam görüntü kazanç ayarının derecesini belirtir."
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
-msgstr ""
+msgstr "Aygıt Ayar Açıklaması"
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
-msgstr ""
+msgstr "Bu sekme özne uzaklığını belirtir."
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
-msgstr ""
+msgstr "Benzersiz Görüntü Kimliği"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr "Gama"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
-msgstr ""
+msgstr "Doldurma"
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -3881,28 +3990,28 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:67 libexif/fuji/mnote-fuji-entry.c:96
 msgid "Medium soft"
-msgstr ""
+msgstr "Orta yumuÅŸak"
 
 #: libexif/fuji/mnote-fuji-entry.c:68 libexif/fuji/mnote-fuji-entry.c:94
 msgid "Medium hard"
-msgstr ""
+msgstr "Orta sert"
 
 #: libexif/fuji/mnote-fuji-entry.c:69 libexif/fuji/mnote-fuji-entry.c:90
 #: libexif/fuji/mnote-fuji-entry.c:98 libexif/fuji/mnote-fuji-entry.c:182
 msgid "Film simulation mode"
-msgstr ""
+msgstr "Film benzetim kipi"
 
 #: libexif/fuji/mnote-fuji-entry.c:79
 msgid "Incandescent"
-msgstr ""
+msgstr "Parlak"
 
 #: libexif/fuji/mnote-fuji-entry.c:85
 msgid "Medium high"
-msgstr ""
+msgstr "Orta yüksek"
 
 #: libexif/fuji/mnote-fuji-entry.c:87
 msgid "Medium low"
-msgstr ""
+msgstr "Orta düşük"
 
 #: libexif/fuji/mnote-fuji-entry.c:88 libexif/fuji/mnote-fuji-entry.c:97
 msgid "Original"
@@ -3911,15 +4020,15 @@ msgstr "Orijinal"
 #: libexif/fuji/mnote-fuji-entry.c:124 libexif/pentax/mnote-pentax-entry.c:164
 #: libexif/pentax/mnote-pentax-entry.c:299
 msgid "Program AE"
-msgstr ""
+msgstr "Program AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:125
 msgid "Natural photo"
-msgstr ""
+msgstr "DoÄŸal fotoÄŸraf"
 
 #: libexif/fuji/mnote-fuji-entry.c:126
 msgid "Vibration reduction"
-msgstr ""
+msgstr "TitreÅŸim azaltma"
 
 #: libexif/fuji/mnote-fuji-entry.c:127
 msgid "Sunset"
@@ -3943,11 +4052,11 @@ msgstr "Metin"
 
 #: libexif/fuji/mnote-fuji-entry.c:132
 msgid "NP & flash"
-msgstr ""
+msgstr "NP & flash"
 
 #: libexif/fuji/mnote-fuji-entry.c:137
 msgid "Aperture priority AE"
-msgstr ""
+msgstr "Diyafram önceliği AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:138
 msgid "Shutter priority AE"
@@ -3955,39 +4064,39 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:146
 msgid "F-Standard"
-msgstr ""
+msgstr "F-Standart"
 
 #: libexif/fuji/mnote-fuji-entry.c:147
 msgid "F-Chrome"
-msgstr ""
+msgstr "F-Krom"
 
 #: libexif/fuji/mnote-fuji-entry.c:148
 msgid "F-B&W"
-msgstr ""
+msgstr "F-B&W"
 
 #: libexif/fuji/mnote-fuji-entry.c:151
 msgid "No blur"
-msgstr ""
+msgstr "Bulanıklık yok"
 
 #: libexif/fuji/mnote-fuji-entry.c:152
 msgid "Blur warning"
-msgstr ""
+msgstr "Bulanıklık uyarısı"
 
 #: libexif/fuji/mnote-fuji-entry.c:155
 msgid "Focus good"
-msgstr ""
+msgstr "Iyi odaklanma"
 
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
-msgstr ""
+msgstr "Odak dışı"
 
 #: libexif/fuji/mnote-fuji-entry.c:159
 msgid "AE good"
-msgstr ""
+msgstr "AE iyi"
 
 #: libexif/fuji/mnote-fuji-entry.c:160
 msgid "Over exposed"
-msgstr ""
+msgstr "Aşırı maruz kalma"
 
 #: libexif/fuji/mnote-fuji-entry.c:164
 msgid "Wide"
@@ -3999,35 +4108,35 @@ msgstr "F0/Standart"
 
 #: libexif/fuji/mnote-fuji-entry.c:168
 msgid "F1/Studio portrait"
-msgstr ""
+msgstr "F1/Stüdyo çekimi"
 
 #: libexif/fuji/mnote-fuji-entry.c:169
 msgid "F1a/Professional portrait"
-msgstr ""
+msgstr "F1a/Profesyonel portre"
 
 #: libexif/fuji/mnote-fuji-entry.c:170
 msgid "F1b/Professional portrait"
-msgstr ""
+msgstr "F1b/Profesyonel portre"
 
 #: libexif/fuji/mnote-fuji-entry.c:171
 msgid "F1c/Professional portrait"
-msgstr ""
+msgstr "F1c/Profesyonel portre"
 
 #: libexif/fuji/mnote-fuji-entry.c:172
 msgid "F2/Fujichrome"
-msgstr ""
+msgstr "F2/Fujichrome"
 
 #: libexif/fuji/mnote-fuji-entry.c:173
 msgid "F3/Studio portrait Ex"
-msgstr ""
+msgstr "F3/Stüdyo çekimi Ex"
 
 #: libexif/fuji/mnote-fuji-entry.c:174
 msgid "F4/Velvia"
-msgstr ""
+msgstr "F4/Velvia"
 
 #: libexif/fuji/mnote-fuji-entry.c:177
 msgid "Auto (100-400%)"
-msgstr ""
+msgstr "Otomatik (%100-400)"
 
 #: libexif/fuji/mnote-fuji-entry.c:179
 msgid "Standard (100%)"
@@ -4041,24 +4150,18 @@ msgstr "GeniÅŸ1 (230%)"
 msgid "Wide2 (400%)"
 msgstr "GeniÅŸ2 (400%)"
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr "%2.2f mm"
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr "%i bayt bilinmeyen veri"
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
-msgstr ""
+msgstr "Maker Not Sürümü"
 
 #: libexif/fuji/mnote-fuji-tag.c:37
 msgid "This number is unique and based on the date of manufacture."
-msgstr ""
+msgstr "Bu numara eşsizdir ve üretim tarihini temel alır."
 
 #: libexif/fuji/mnote-fuji-tag.c:41
 msgid "Chromaticity Saturation"
@@ -4070,19 +4173,19 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:46
 msgid "Focusing Mode"
-msgstr ""
+msgstr "Odaklama Kipi"
 
 #: libexif/fuji/mnote-fuji-tag.c:47
 msgid "Focus Point"
-msgstr ""
+msgstr "Odak Noktası"
 
 #: libexif/fuji/mnote-fuji-tag.c:48
 msgid "Slow Synchro Mode"
-msgstr ""
+msgstr "YavaÅŸ Senkronizasyon Kipi"
 
 #: libexif/fuji/mnote-fuji-tag.c:49 libexif/pentax/mnote-pentax-tag.c:72
 msgid "Picture Mode"
-msgstr ""
+msgstr "Resim Kipi"
 
 #: libexif/fuji/mnote-fuji-tag.c:50
 msgid "Continuous Taking"
@@ -4090,11 +4193,11 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:51
 msgid "Continuous Sequence Number"
-msgstr ""
+msgstr "Sürekli Sıra Numarası"
 
 #: libexif/fuji/mnote-fuji-tag.c:52
 msgid "FinePix Color"
-msgstr ""
+msgstr "FinePix Rengi"
 
 #: libexif/fuji/mnote-fuji-tag.c:53
 msgid "Blur Check"
@@ -4102,19 +4205,19 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:54
 msgid "Auto Focus Check"
-msgstr ""
+msgstr "Blur Kontrolü"
 
 #: libexif/fuji/mnote-fuji-tag.c:55
 msgid "Auto Exposure Check"
-msgstr ""
+msgstr "Otomatik Pozlama Kontrolü"
 
 #: libexif/fuji/mnote-fuji-tag.c:56
 msgid "Dynamic Range"
-msgstr ""
+msgstr "Dinamik Aralık"
 
 #: libexif/fuji/mnote-fuji-tag.c:57
 msgid "Film Simulation Mode"
-msgstr ""
+msgstr "Film Simülasyon Kipi"
 
 #: libexif/fuji/mnote-fuji-tag.c:58
 msgid "Dynamic Range Wide Mode"
@@ -4126,11 +4229,11 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:60
 msgid "Minimum Focal Length"
-msgstr ""
+msgstr "Asgari Odak Uzaklığı"
 
 #: libexif/fuji/mnote-fuji-tag.c:61
 msgid "Maximum Focal Length"
-msgstr ""
+msgstr "Azami Odak Uzaklığı"
 
 #: libexif/fuji/mnote-fuji-tag.c:62
 msgid "Maximum Aperture at Minimum Focal"
@@ -4142,11 +4245,11 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-tag.c:65
 msgid "Order Number"
-msgstr ""
+msgstr "Sipariş Numarası"
 
 #: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
 msgid "Frame Number"
-msgstr ""
+msgstr "Çerçeve Numarası"
 
 #: libexif/olympus/mnote-olympus-entry.c:49
 #, c-format
@@ -4155,71 +4258,71 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF non D lens"
-msgstr ""
+msgstr "AF olmayan D mercek"
 
 #: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D or AF-S lens"
-msgstr ""
+msgstr "AF-D veya AF-S mercek"
 
 #: libexif/olympus/mnote-olympus-entry.c:95
 msgid "AF-D G lens"
-msgstr ""
+msgstr "AF-D G mercek"
 
 #: libexif/olympus/mnote-olympus-entry.c:96
 msgid "AF-D VR lens"
-msgstr ""
+msgstr "AF-D VR mercek"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "AF-D G VR lens"
-msgstr ""
+msgstr "AF-D G VR mercek"
 
 #: libexif/olympus/mnote-olympus-entry.c:101
 msgid "Flash unit unknown"
-msgstr ""
+msgstr "Flaş ünitesi bilinmiyor"
 
 #: libexif/olympus/mnote-olympus-entry.c:102
 msgid "Flash is external"
-msgstr ""
+msgstr "Flash harici"
 
 #: libexif/olympus/mnote-olympus-entry.c:103
 msgid "Flash is on camera"
-msgstr ""
+msgstr "FlaÅŸ fotoÄŸraf makinesinde"
 
 #: libexif/olympus/mnote-olympus-entry.c:106
 msgid "VGA basic"
-msgstr ""
+msgstr "Temel VGA"
 
 #: libexif/olympus/mnote-olympus-entry.c:107
 msgid "VGA normal"
-msgstr ""
+msgstr "VGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:108
 msgid "VGA fine"
-msgstr ""
+msgstr "VGA iyi"
 
 #: libexif/olympus/mnote-olympus-entry.c:109
 msgid "SXGA basic"
-msgstr ""
+msgstr "SXGA temel"
 
 #: libexif/olympus/mnote-olympus-entry.c:110
 msgid "SXGA normal"
-msgstr ""
+msgstr "SXGA normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:111
 msgid "SXGA fine"
-msgstr ""
+msgstr "SXGA iyi"
 
 #: libexif/olympus/mnote-olympus-entry.c:112
 msgid "2 Mpixel basic"
-msgstr ""
+msgstr "2 Mpiksel temel"
 
 #: libexif/olympus/mnote-olympus-entry.c:113
 msgid "2 Mpixel normal"
-msgstr ""
+msgstr "2 Mpiksel normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:114
 msgid "2 Mpixel fine"
-msgstr ""
+msgstr "2 Mpiksel iyi"
 
 #: libexif/olympus/mnote-olympus-entry.c:117
 msgid "Color"
@@ -4235,11 +4338,11 @@ msgstr "Parlak-"
 
 #: libexif/olympus/mnote-olympus-entry.c:124
 msgid "Contrast+"
-msgstr ""
+msgstr "Kontrast+"
 
 #: libexif/olympus/mnote-olympus-entry.c:125
 msgid "Contrast-"
-msgstr ""
+msgstr "Kontrast-"
 
 #: libexif/olympus/mnote-olympus-entry.c:128
 msgid "ISO 80"
@@ -4260,7 +4363,7 @@ msgstr "ISO 100"
 
 #: libexif/olympus/mnote-olympus-entry.c:135
 msgid "Preset"
-msgstr ""
+msgstr "Önayar"
 
 #: libexif/olympus/mnote-olympus-entry.c:137
 msgid "Incandescence"
@@ -4284,11 +4387,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:147
 msgid "Normal, SQ"
-msgstr ""
+msgstr "Normal, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:148
 msgid "Normal, HQ"
-msgstr ""
+msgstr "Normal, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:149
 msgid "Normal, SHQ"
@@ -4296,7 +4399,7 @@ msgstr "Normal, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:150
 msgid "Normal, RAW"
-msgstr ""
+msgstr "Normal, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:151
 msgid "Normal, SQ1"
@@ -4316,27 +4419,27 @@ msgstr "Normal, standart"
 
 #: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, SQ"
-msgstr ""
+msgstr "Ä°yi, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, HQ"
-msgstr ""
+msgstr "Ä°yi, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SHQ"
-msgstr ""
+msgstr "Ä°yi, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, RAW"
-msgstr ""
+msgstr "Ä°yi, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Fine, SQ1"
-msgstr ""
+msgstr "Ä°yi, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Fine, SQ2"
-msgstr ""
+msgstr "Ä°yi, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Fine, super high"
@@ -4388,7 +4491,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:188
 msgid "Fill"
-msgstr ""
+msgstr "Doldur"
 
 #: libexif/olympus/mnote-olympus-entry.c:195
 msgid "Internal + external"
@@ -4396,11 +4499,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:224
 msgid "Interlaced"
-msgstr ""
+msgstr "Geçmeli"
 
 #: libexif/olympus/mnote-olympus-entry.c:225
 msgid "Progressive"
-msgstr ""
+msgstr "Aşamalı"
 
 #: libexif/olympus/mnote-olympus-entry.c:231
 #: libexif/pentax/mnote-pentax-entry.c:85
@@ -4414,7 +4517,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:235
 msgid "Spot focus"
-msgstr ""
+msgstr "Nokta odaklama"
 
 #: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Normal focus"
@@ -4459,7 +4562,7 @@ msgstr "Kullanıcı 2"
 
 #: libexif/olympus/mnote-olympus-entry.c:260
 msgid "Lamp"
-msgstr ""
+msgstr "Lamba"
 
 #: libexif/olympus/mnote-olympus-entry.c:263
 msgid "5 frames/sec"
@@ -4477,117 +4580,117 @@ msgstr ""
 msgid "20 frames/sec"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f metre"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "Bilinmeyen deÄŸer %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr "Bilinmeyen %hu"
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr "2 sn."
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr "Hızlı"
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
-msgstr ""
+msgstr "Tek-dokunuÅŸ"
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
-msgstr ""
+msgstr "Sonsuz"
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr ""
@@ -4619,7 +4722,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:49
 msgid "ISO Selection"
-msgstr ""
+msgstr "ISO Seçimi"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Preview Image IFD"
@@ -4648,7 +4751,7 @@ msgstr ""
 #: libexif/olympus/mnote-olympus-tag.c:58
 #: libexif/olympus/mnote-olympus-tag.c:96
 msgid "Image Adjustment"
-msgstr ""
+msgstr "Görüntü Hizalama"
 
 #: libexif/olympus/mnote-olympus-tag.c:59
 msgid "Tone Compensation"
@@ -4656,7 +4759,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
-msgstr ""
+msgstr "Adaptör"
 
 #: libexif/olympus/mnote-olympus-tag.c:62
 msgid "Lens"
@@ -4670,15 +4773,15 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:65
 msgid "Flash Used"
-msgstr ""
+msgstr "Flaş Kullanıldı"
 
 #: libexif/olympus/mnote-olympus-tag.c:66
 msgid "AF Focus Position"
-msgstr ""
+msgstr "AF Odak Pozisyonu"
 
 #: libexif/olympus/mnote-olympus-tag.c:67
 msgid "Bracketing"
-msgstr ""
+msgstr "Çıkma"
 
 #: libexif/olympus/mnote-olympus-tag.c:69
 msgid "Lens F Stops"
@@ -4689,8 +4792,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr "Renk Modu"
 
@@ -4700,21 +4802,21 @@ msgstr "Işık Türü"
 
 #: libexif/olympus/mnote-olympus-tag.c:74
 msgid "Hue Adjustment"
-msgstr ""
+msgstr "Renk Ayarlaması"
 
 #: libexif/olympus/mnote-olympus-tag.c:76
 #: libexif/olympus/mnote-olympus-tag.c:163
 #: libexif/pentax/mnote-pentax-tag.c:108
 msgid "Noise Reduction"
-msgstr ""
+msgstr "Gürültü Azaltma"
 
 #: libexif/olympus/mnote-olympus-tag.c:79
 msgid "Sensor Pixel Size"
-msgstr ""
+msgstr "Algılayıcı Benek Boyutu"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
 msgid "Image Data Size"
-msgstr ""
+msgstr "Görüntü Veri Boyutu"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
 msgid "Size of compressed image data in bytes."
@@ -4747,11 +4849,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:99
 msgid "Focus"
-msgstr ""
+msgstr "Odaklama"
 
 #: libexif/olympus/mnote-olympus-tag.c:102
 msgid "Converter"
-msgstr ""
+msgstr "Dönüştürücü"
 
 #: libexif/olympus/mnote-olympus-tag.c:105
 msgid "Thumbnail Image"
@@ -4763,7 +4865,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:109
 msgid "Black & White Mode"
-msgstr ""
+msgstr "Siyah & Beyaz Kip"
 
 #: libexif/olympus/mnote-olympus-tag.c:111
 msgid "Focal Plane Diagonal"
@@ -4779,7 +4881,7 @@ msgstr "Bilgi"
 
 #: libexif/olympus/mnote-olympus-tag.c:115
 msgid "Camera ID"
-msgstr ""
+msgstr "Kamera KimliÄŸi"
 
 #: libexif/olympus/mnote-olympus-tag.c:116
 msgid "Precapture Frames"
@@ -4787,11 +4889,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:117
 msgid "White Board"
-msgstr ""
+msgstr "Beyaz Pano"
 
 #: libexif/olympus/mnote-olympus-tag.c:118
 msgid "One Touch White Balance"
-msgstr ""
+msgstr "Tek DokunuÅŸ Beyaz Dengesi"
 
 #: libexif/olympus/mnote-olympus-tag.c:119
 msgid "White Balance Bracket"
@@ -4812,7 +4914,7 @@ msgstr "ISO DeÄŸeri"
 
 #: libexif/olympus/mnote-olympus-tag.c:125
 msgid "Aperture Value"
-msgstr ""
+msgstr "Açıklık Değeri"
 
 #: libexif/olympus/mnote-olympus-tag.c:126
 msgid "Brightness Value"
@@ -4820,11 +4922,11 @@ msgstr "Parlaklık Değeri"
 
 #: libexif/olympus/mnote-olympus-tag.c:128
 msgid "Flash Device"
-msgstr ""
+msgstr "Flaş Aygıtı"
 
 #: libexif/olympus/mnote-olympus-tag.c:130
 msgid "Sensor Temperature"
-msgstr ""
+msgstr "Sensör Isısı"
 
 #: libexif/olympus/mnote-olympus-tag.c:131
 msgid "Lens Temperature"
@@ -4836,11 +4938,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:136
 msgid "Zoom Step Count"
-msgstr ""
+msgstr "Yakınlaştırma Adım Sayısı"
 
 #: libexif/olympus/mnote-olympus-tag.c:137
 msgid "Focus Step Count"
-msgstr ""
+msgstr "Odak Adım Sayısı"
 
 #: libexif/olympus/mnote-olympus-tag.c:138
 msgid "Sharpness Setting"
@@ -4848,11 +4950,11 @@ msgstr "Keskinlik Ayarı"
 
 #: libexif/olympus/mnote-olympus-tag.c:139
 msgid "Flash Charge Level"
-msgstr ""
+msgstr "FlaÅŸ Doluluk Seviyesi"
 
 #: libexif/olympus/mnote-olympus-tag.c:140
 msgid "Color Matrix"
-msgstr ""
+msgstr "Renk Matrisi"
 
 #: libexif/olympus/mnote-olympus-tag.c:141
 msgid "Black Level"
@@ -4862,13 +4964,11 @@ msgstr "Siyah Seviyesi"
 msgid "White Balance Setting"
 msgstr "Beyaz Denge Ayarı"
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr "Kırmızı dengesi"
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr "Mavi Dengesi"
 
@@ -4890,11 +4990,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:150
 msgid "External Flash Bounce"
-msgstr ""
+msgstr "Harici Flaş Yansıması"
 
 #: libexif/olympus/mnote-olympus-tag.c:151
 msgid "External Flash Zoom"
-msgstr ""
+msgstr "Dış Flaş Yakınlaştırması"
 
 #: libexif/olympus/mnote-olympus-tag.c:152
 msgid "External Flash Mode"
@@ -4902,11 +5002,11 @@ msgstr "Harici FlaÅŸ Modu"
 
 #: libexif/olympus/mnote-olympus-tag.c:153
 msgid "Contrast Setting"
-msgstr ""
+msgstr "Karşıtlık Ayarı"
 
 #: libexif/olympus/mnote-olympus-tag.c:154
 msgid "Sharpness Factor"
-msgstr ""
+msgstr "Keskinlik Etmeni"
 
 #: libexif/olympus/mnote-olympus-tag.c:155
 msgid "Color Control"
@@ -4922,11 +5022,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:158
 msgid "Scene Detect"
-msgstr ""
+msgstr "Sahne Algılama"
 
 #: libexif/olympus/mnote-olympus-tag.c:159
 msgid "Compression Ratio"
-msgstr ""
+msgstr "Sıkıştırma Oranı"
 
 #: libexif/olympus/mnote-olympus-tag.c:160
 msgid "Preview Image Valid"
@@ -4938,11 +5038,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:162
 msgid "CCD Scan Mode"
-msgstr ""
+msgstr "CCD Tarama Modu"
 
 #: libexif/olympus/mnote-olympus-tag.c:164
 msgid "Infinity Lens Step"
-msgstr ""
+msgstr "Sonsuz Mercek Adımı"
 
 #: libexif/olympus/mnote-olympus-tag.c:165
 msgid "Near Lens Step"
@@ -5073,7 +5173,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:180
 msgid "Digital filter"
-msgstr ""
+msgstr "Dijital filtre"
 
 #: libexif/pentax/mnote-pentax-entry.c:182
 msgid "Food"
@@ -5150,43 +5250,43 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:213
 msgid "AF-S"
-msgstr ""
+msgstr "AF-S"
 
 #: libexif/pentax/mnote-pentax-entry.c:214
 msgid "AF-C"
-msgstr ""
+msgstr "AF-C"
 
 #: libexif/pentax/mnote-pentax-entry.c:217
 msgid "Upper-left"
-msgstr ""
+msgstr "Yukarı-sol"
 
 #: libexif/pentax/mnote-pentax-entry.c:218
 msgid "Top"
-msgstr ""
+msgstr "Ãœst"
 
 #: libexif/pentax/mnote-pentax-entry.c:219
 msgid "Upper-right"
-msgstr ""
+msgstr "Yukarı-sağ"
 
 #: libexif/pentax/mnote-pentax-entry.c:221
 msgid "Mid-left"
-msgstr ""
+msgstr "Orta-sol"
 
 #: libexif/pentax/mnote-pentax-entry.c:223
 msgid "Mid-right"
-msgstr ""
+msgstr "Orta-saÄŸ"
 
 #: libexif/pentax/mnote-pentax-entry.c:225
 msgid "Lower-left"
-msgstr ""
+msgstr "Aşağı-sol"
 
 #: libexif/pentax/mnote-pentax-entry.c:226
 msgid "Bottom"
-msgstr ""
+msgstr "Alt"
 
 #: libexif/pentax/mnote-pentax-entry.c:227
 msgid "Lower-right"
-msgstr ""
+msgstr "Aşağı-sağ"
 
 #: libexif/pentax/mnote-pentax-entry.c:228
 msgid "Fixed center"
@@ -5194,7 +5294,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:232
 msgid "Multiple"
-msgstr ""
+msgstr "Çoklu"
 
 #: libexif/pentax/mnote-pentax-entry.c:234
 msgid "Top-center"
@@ -5216,11 +5316,21 @@ msgstr "3008x2008 veya 3040x2024"
 msgid "Digital filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
 #, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr "Dahili hata (bilinmeyen deÄŸer %i %i)"
+msgid "Internal error (unknown value %hu)"
+msgstr "Dahili hata (bilinmeyen deÄŸer %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "Dahili hata (bilinmeyen deÄŸer %hu %hu)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
+#, c-format
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "Dahili hata (bilinmeyen deÄŸer %hi %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5285,7 +5395,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:77
 msgid "Focus Position"
-msgstr ""
+msgstr "Odak Konumu"
 
 #: libexif/pentax/mnote-pentax-tag.c:80
 msgid "ISO Number"
@@ -5329,7 +5439,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:99
 msgid "Image Processing"
-msgstr ""
+msgstr "Görüntü İşleme"
 
 #: libexif/pentax/mnote-pentax-tag.c:100
 msgid "Picture Mode (2)"
@@ -5361,7 +5471,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:112
 msgid "Black Point"
-msgstr ""
+msgstr "Siyah Nokta"
 
 #: libexif/pentax/mnote-pentax-tag.c:114
 msgid "AE Info"
@@ -5369,7 +5479,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:115
 msgid "Lens Info"
-msgstr ""
+msgstr "Mercek Bilgisi"
 
 #: libexif/pentax/mnote-pentax-tag.c:116
 msgid "Flash Info"
@@ -5377,7 +5487,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:117
 msgid "Camera Info"
-msgstr ""
+msgstr "Kamera Bilgisi"
 
 #: libexif/pentax/mnote-pentax-tag.c:118
 msgid "Battery Info"
@@ -5413,7 +5523,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:135
 msgid "Enhancement"
-msgstr ""
+msgstr "Ä°yileÅŸtirme"
 
 #: libexif/pentax/mnote-pentax-tag.c:136
 msgid "Finer"
@@ -5421,4 +5531,7 @@ msgstr ""
 
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
-msgstr ""
+msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
+
+#~ msgid "FNumber"
+#~ msgstr "FNumber"
diff --git a/po/uk.gmo b/po/uk.gmo
deleted file mode 100644
index a6efe21..0000000
--- a/po/uk.gmo
+++ /dev/null
diff --git a/po/uk.po b/po/uk.po
index e00364f..a53f172 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,21 +3,22 @@
 # Copyright (C) 2012 Lutz Mueller and others
 # This file is distributed under the same license as the libexif package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2012.
+# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2016, 2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.21-pre1\n"
+"Project-Id-Version: libexif 0.6.22-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2012-07-03 10:59+0300\n"
+"POT-Creation-Date: 2016-09-02 00:46+0200\n"
+"PO-Revision-Date: 2018-08-04 13:12+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -947,7 +948,7 @@ msgstr "Увімкнено �инхронізацію FP"
 
 #: libexif/canon/mnote-canon-entry.c:293
 msgid "2nd-curtain sync used"
-msgstr ""
+msgstr "Викори�тано �инхронізацію із другою шторкою"
 
 #: libexif/canon/mnote-canon-entry.c:294
 msgid "FP sync used"
@@ -985,7 +986,7 @@ msgstr "Без AE"
 
 #: libexif/canon/mnote-canon-entry.c:306
 msgid "On, shot only"
-msgstr ""
+msgstr "Увімкн, лише знімок"
 
 #: libexif/canon/mnote-canon-entry.c:310
 msgid "Smooth"
@@ -999,7 +1000,7 @@ msgstr "�етиповий"
 
 #: libexif/canon/mnote-canon-entry.c:314
 msgid "My color data"
-msgstr ""
+msgstr "Мої дані кольорів"
 
 #: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
 #: libexif/pentax/mnote-pentax-entry.c:126
@@ -1060,25 +1061,25 @@ msgstr "Тінь"
 
 #: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
 msgid "Manual temperature (Kelvin)"
-msgstr ""
+msgstr "Температура вручну (у Кельвінах)"
 
 #: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
 msgid "PC set 1"
-msgstr ""
+msgstr "PC-набір 1"
 
 #: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
 msgid "PC set 2"
-msgstr ""
+msgstr "PC-набір 2"
 
 #: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
 msgid "PC set 3"
-msgstr ""
+msgstr "PC-набір 3"
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
 #: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
-msgstr ""
+msgstr "Флуоре�центна лампа денного �вітла"
 
 #: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
 msgid "Custom 1"
@@ -1114,19 +1115,19 @@ msgstr "В�і"
 
 #: libexif/canon/mnote-canon-entry.c:361
 msgid "On (shot 1)"
-msgstr ""
+msgstr "Увімкн. (знімок 1)"
 
 #: libexif/canon/mnote-canon-entry.c:362
 msgid "On (shot 2)"
-msgstr ""
+msgstr "Увімкн. (знімок 2)"
 
 #: libexif/canon/mnote-canon-entry.c:363
 msgid "On (shot 3)"
-msgstr ""
+msgstr "Увімкн. (знімок 3)"
 
 #: libexif/canon/mnote-canon-entry.c:365
 msgid "EOS high-end"
-msgstr ""
+msgstr "Ви�око�кі�на ЕОС"
 
 #: libexif/canon/mnote-canon-entry.c:366
 msgid "Compact"
@@ -1134,7 +1135,7 @@ msgstr "Компактний"
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
-msgstr ""
+msgstr "Середньодіапазонна ЕОС"
 
 #: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotate 90 CW"
@@ -1150,7 +1151,7 @@ msgstr "Обернути на 270° за г. �тр."
 
 #: libexif/canon/mnote-canon-entry.c:372
 msgid "Rotated by software"
-msgstr ""
+msgstr "Програмне обертанн�"
 
 #: libexif/canon/mnote-canon-entry.c:384
 #: libexif/olympus/mnote-olympus-entry.c:612
@@ -1174,7 +1175,7 @@ msgstr "Згори вниз"
 
 #: libexif/canon/mnote-canon-entry.c:388
 msgid "2x2 matrix (clockwise)"
-msgstr ""
+msgstr "Матриц� 2x2 (за год. �трілкою)"
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
@@ -1218,15 +1219,15 @@ msgstr "�абір 3"
 
 #: libexif/canon/mnote-canon-entry.c:425
 msgid "User def. 1"
-msgstr ""
+msgstr "Визн. кори�т. 1"
 
 #: libexif/canon/mnote-canon-entry.c:426
 msgid "User def. 2"
-msgstr ""
+msgstr "Визн. кори�т. 2"
 
 #: libexif/canon/mnote-canon-entry.c:427
 msgid "User def. 3"
-msgstr ""
+msgstr "Визн. кори�т. 3"
 
 #: libexif/canon/mnote-canon-entry.c:428
 msgid "External 1"
@@ -1242,7 +1243,7 @@ msgstr "Зовнішнє 3"
 
 #: libexif/canon/mnote-canon-entry.c:435
 msgid "Faithful"
-msgstr ""
+msgstr "�адійний"
 
 #: libexif/canon/mnote-canon-entry.c:436
 #: libexif/olympus/mnote-olympus-entry.c:118
@@ -1276,11 +1277,11 @@ msgstr "1/%i"
 #: libexif/canon/mnote-canon-entry.c:670
 #, c-format
 msgid "%u mm"
-msgstr ""
+msgstr "%u мм"
 
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
-msgstr ""
+msgstr "Параметри (перша ча�тина)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
 #: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
@@ -1289,7 +1290,7 @@ msgstr "Фоку�на від�тань"
 
 #: libexif/canon/mnote-canon-tag.c:37
 msgid "Settings (Second Part)"
-msgstr ""
+msgstr "Параметри (друга ча�тина)"
 
 #: libexif/canon/mnote-canon-tag.c:38
 #: libexif/olympus/mnote-olympus-entry.c:601
@@ -1312,11 +1313,11 @@ msgstr "�омер зображенн�"
 
 #: libexif/canon/mnote-canon-tag.c:42
 msgid "Owner Name"
-msgstr ""
+msgstr "Ім’� вла�ника"
 
 #: libexif/canon/mnote-canon-tag.c:43
 msgid "Color Information"
-msgstr ""
+msgstr "Дані щодо кольорів"
 
 #: libexif/canon/mnote-canon-tag.c:44 libexif/fuji/mnote-fuji-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:81
@@ -1336,7 +1337,7 @@ msgstr "Макрорежим"
 #: libexif/olympus/mnote-olympus-tag.c:175
 #: libexif/pentax/mnote-pentax-tag.c:128
 msgid "Self-timer"
-msgstr ""
+msgstr "�вто�пу�к"
 
 #: libexif/canon/mnote-canon-tag.c:58 libexif/fuji/mnote-fuji-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:40
@@ -1354,7 +1355,7 @@ msgstr "Режим �палаху"
 
 #: libexif/canon/mnote-canon-tag.c:60 libexif/pentax/mnote-pentax-tag.c:101
 msgid "Drive Mode"
-msgstr ""
+msgstr "Режим мотора"
 
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
@@ -1363,11 +1364,11 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
 #: libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
-msgstr ""
+msgstr "Режим фоку�у"
 
 #: libexif/canon/mnote-canon-tag.c:62 libexif/pentax/mnote-pentax-tag.c:127
 msgid "Record Mode"
-msgstr ""
+msgstr "Режим запи�у"
 
 #: libexif/canon/mnote-canon-tag.c:63 libexif/pentax/mnote-pentax-tag.c:71
 msgid "Image Size"
@@ -1375,7 +1376,7 @@ msgstr "Розмір зображенн�"
 
 #: libexif/canon/mnote-canon-tag.c:64
 msgid "Easy Shooting Mode"
-msgstr ""
+msgstr "Режим про�того зніманн�"
 
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
@@ -1383,7 +1384,7 @@ msgstr ""
 #: libexif/olympus/mnote-olympus-tag.c:180
 #: libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
-msgstr ""
+msgstr "Цифрове збільшенн�"
 
 #: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
@@ -1415,11 +1416,11 @@ msgstr "Режим вимірюванн�"
 
 #: libexif/canon/mnote-canon-tag.c:71 libexif/olympus/mnote-olympus-tag.c:133
 msgid "Focus Range"
-msgstr ""
+msgstr "Діапазон фоку�уванн�"
 
 #: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
 msgid "AF Point"
-msgstr ""
+msgstr "Точка �Ф"
 
 #: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
 msgid "Exposure Mode"
@@ -1428,39 +1429,39 @@ msgstr "Режим ек�позиції"
 #: libexif/canon/mnote-canon-tag.c:74 libexif/olympus/mnote-olympus-tag.c:61
 #: libexif/pentax/mnote-pentax-tag.c:106
 msgid "Lens Type"
-msgstr ""
+msgstr "Тип об’єктива"
 
 #: libexif/canon/mnote-canon-tag.c:75
 msgid "Long Focal Length of Lens"
-msgstr ""
+msgstr "Довга фоку�на від�тань об’єктива"
 
 #: libexif/canon/mnote-canon-tag.c:76
 msgid "Short Focal Length of Lens"
-msgstr ""
+msgstr "Коротка фоку�на від�тань об’єктива"
 
 #: libexif/canon/mnote-canon-tag.c:77
 msgid "Focal Units per mm"
-msgstr ""
+msgstr "Фокальних від�таней на мм"
 
 #: libexif/canon/mnote-canon-tag.c:78
 msgid "Maximal Aperture"
-msgstr ""
+msgstr "Мак�имальна діафрагма"
 
 #: libexif/canon/mnote-canon-tag.c:79
 msgid "Minimal Aperture"
-msgstr ""
+msgstr "Мінімальна діаграма"
 
 #: libexif/canon/mnote-canon-tag.c:80
 msgid "Flash Activity"
-msgstr ""
+msgstr "�ктивні�ть �палаху"
 
 #: libexif/canon/mnote-canon-tag.c:81
 msgid "Flash Details"
-msgstr ""
+msgstr "Параметри �палаху"
 
 #: libexif/canon/mnote-canon-tag.c:83
 msgid "AE Setting"
-msgstr ""
+msgstr "Параметр автоек�понуванн�"
 
 #: libexif/canon/mnote-canon-tag.c:84
 msgid "Image Stabilization"
@@ -1468,64 +1469,64 @@ msgstr "Стабілізаці� зображенн�"
 
 #: libexif/canon/mnote-canon-tag.c:85
 msgid "Display Aperture"
-msgstr ""
+msgstr "Показати діафрагму"
 
 #: libexif/canon/mnote-canon-tag.c:86
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Ширина джерела ма�штабуванн�"
 
 #: libexif/canon/mnote-canon-tag.c:87
 msgid "Zoom Target Width"
-msgstr ""
+msgstr "Ширина цілі ма�штабуванн�"
 
 #: libexif/canon/mnote-canon-tag.c:88
 msgid "Photo Effect"
-msgstr ""
+msgstr "Фотоефект"
 
 #: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
 msgid "Manual Flash Output"
-msgstr ""
+msgstr "Виведенн� дл� �палаху вручну"
 
 #: libexif/canon/mnote-canon-tag.c:90
 msgid "Color Tone"
-msgstr ""
+msgstr "Тон кольорів"
 
 #: libexif/canon/mnote-canon-tag.c:91
 msgid "Focal Type"
-msgstr ""
+msgstr "Фокальний тип"
 
 #: libexif/canon/mnote-canon-tag.c:93
 msgid "Focal Plane X Size"
-msgstr ""
+msgstr "Розмір фокальної площини за X"
 
 #: libexif/canon/mnote-canon-tag.c:94
 msgid "Focal Plane Y Size"
-msgstr ""
+msgstr "Розмір фокальної площини за Y"
 
 #: libexif/canon/mnote-canon-tag.c:95
 msgid "Auto ISO"
-msgstr ""
+msgstr "�втоматично визначати ISO"
 
 #: libexif/canon/mnote-canon-tag.c:96
 msgid "Shot ISO"
-msgstr ""
+msgstr "ISO знімка"
 
 #: libexif/canon/mnote-canon-tag.c:97
 msgid "Measured EV"
-msgstr ""
+msgstr "Вимір�не EV"
 
 #: libexif/canon/mnote-canon-tag.c:98
 msgid "Target Aperture"
-msgstr ""
+msgstr "Діафрагма призначенн�"
 
 #: libexif/canon/mnote-canon-tag.c:99
 msgid "Target Exposure Time"
-msgstr ""
+msgstr "Ча� ек�понуванн� цілі"
 
 #: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
 #: libexif/pentax/mnote-pentax-tag.c:81
 msgid "Exposure Compensation"
-msgstr ""
+msgstr "Компен�аці� ек�позиції"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
 #: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
@@ -1545,7 +1546,7 @@ msgstr "Чи�ло з по�лідовно�ті"
 
 #: libexif/canon/mnote-canon-tag.c:104
 msgid "Flash Guide Number"
-msgstr ""
+msgstr "Провідне чи�ло �палаху"
 
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
@@ -1554,23 +1555,24 @@ msgstr "Компен�аці� ек�позиції �палаху"
 
 #: libexif/canon/mnote-canon-tag.c:107
 msgid "AE Bracketing"
-msgstr ""
+msgstr "�втовилка ек�понуванн�"
 
 #: libexif/canon/mnote-canon-tag.c:108
 msgid "AE Bracket Value"
-msgstr ""
+msgstr "Значенн� вилки автоек�позиції"
 
 #: libexif/canon/mnote-canon-tag.c:109
 msgid "Focus Distance Upper"
-msgstr ""
+msgstr "Вища фоку�на від�тань"
 
 #: libexif/canon/mnote-canon-tag.c:110
 msgid "Focus Distance Lower"
-msgstr ""
+msgstr "�ижча фоку�на від�тань"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr ""
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:469
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "Діафрагмове чи�ло"
 
 #: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
 #: libexif/pentax/mnote-pentax-tag.c:78
@@ -1579,7 +1581,7 @@ msgstr "Ча� ек�позиції"
 
 #: libexif/canon/mnote-canon-tag.c:113
 msgid "Bulb Duration"
-msgstr ""
+msgstr "Тривалі�ть за�віченн� лампи"
 
 #: libexif/canon/mnote-canon-tag.c:114
 msgid "Camera Type"
@@ -1591,47 +1593,47 @@ msgstr "�втоматично повернути"
 
 #: libexif/canon/mnote-canon-tag.c:116
 msgid "ND Filter"
-msgstr ""
+msgstr "ND-фільтр"
 
 #: libexif/canon/mnote-canon-tag.c:119
 msgid "Panorama Frame"
-msgstr ""
+msgstr "Рамка панорами"
 
 #: libexif/canon/mnote-canon-tag.c:120
 msgid "Panorama Direction"
-msgstr ""
+msgstr "�апр�м панорами"
 
 #: libexif/canon/mnote-canon-tag.c:121
 msgid "Tone Curve"
-msgstr ""
+msgstr "Крива тону"
 
 #: libexif/canon/mnote-canon-tag.c:122
 msgid "Sharpness Frequency"
-msgstr ""
+msgstr "Ча�тота різко�ті"
 
 #: libexif/canon/mnote-canon-tag.c:124
 msgid "Picture Style"
-msgstr ""
+msgstr "Стиль зображенн�"
 
 #: libexif/exif-byte-order.c:33
 msgid "Motorola"
-msgstr ""
+msgstr "Motorola"
 
 #: libexif/exif-byte-order.c:35
 msgid "Intel"
-msgstr ""
+msgstr "Intel"
 
 #: libexif/exif-data.c:780
 msgid "Size of data too small to allow for EXIF data."
-msgstr ""
+msgstr "Розмір даних є надто мами дл� того, щоб це були дані EXIF."
 
 #: libexif/exif-data.c:841
 msgid "EXIF marker not found."
-msgstr ""
+msgstr "�е знайдено позначки EXIF."
 
 #: libexif/exif-data.c:868
 msgid "EXIF header not found."
-msgstr ""
+msgstr "�е знайдено заголовка EXIF."
 
 #: libexif/exif-data.c:893
 msgid "Unknown encoding."
@@ -1639,99 +1641,82 @@ msgstr "�евідоме кодуванн�."
 
 #: libexif/exif-data.c:1178
 msgid "Ignore unknown tags"
-msgstr ""
+msgstr "Ігнорувати невідомі мітки"
 
 #: libexif/exif-data.c:1179
 msgid "Ignore unknown tags when loading EXIF data."
-msgstr ""
+msgstr "Ігнорувати невідомі мітки під ча� завантаженн� даних EXIF."
 
 #: libexif/exif-data.c:1180
 msgid "Follow specification"
-msgstr ""
+msgstr "Виправл�ти за �пецифікацією"
 
 #: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
-msgstr ""
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
+msgstr "Додавати, виправл�ти та вилучати запи�и, щоб отримати дані EXIF, що відповідають �пецифікації."
 
 #: libexif/exif-data.c:1183
 msgid "Do not change maker note"
-msgstr ""
+msgstr "�е змінювати нотатки виробника"
 
 #: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Під ча� завантаженн� або повторного зберіганн� даних Exif, зберігати нотатки виробника без змін. Майте на увазі, що нотатки виробника може бути пошкоджено."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Мітку «%s» було запи�ано у форматі «%s» (що �уперечить �пецифікації), формат змінено на «%s»."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Мітку «%s» запи�ано у форматі «%s» (що �уперечить �пецифікації), формат не може бути змінено на «%s»."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Мітку «UserComment» запи�ано у некоректному форматі «%s». В�тановлено формат «undefined»."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Мітку «UserComment» було розширено до принаймні 8 байтів з метою виконанн� �пецифікації."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Мітка «UserComment» не є порожньою, але не починаєть�� із ідентифікатора форматуванн�. Цю помилку виправлено."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Мітка «UserComment» не починаєть�� із ідентифікатора форматуванн�. Цю помилку виправлено."
 
 #: libexif/exif-entry.c:462
 #, c-format
 msgid "%i bytes undefined data"
-msgstr ""
+msgstr "%i байтів невизначених даних"
 
 #: libexif/exif-entry.c:585
 #, c-format
 msgid "%i bytes unsupported data type"
-msgstr ""
+msgstr "%i байтів непідтримуваного типу даних"
 
 #: libexif/exif-entry.c:642
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
+msgstr "Мітка «%s» мі�тить дані у некоректному форматі («%s» замі�ть «%s»)."
 
 #: libexif/exif-entry.c:655
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr ""
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "Мітка «%s» мі�тить некоректну кількі�ть компонентів (%i замі�ть %i)."
 
 #: libexif/exif-entry.c:669
 msgid "Chunky format"
-msgstr ""
+msgstr "Фрагментарне форматуванн�"
 
 #: libexif/exif-entry.c:669
 msgid "Planar format"
-msgstr ""
+msgstr "Пло�кий формат"
 
 #: libexif/exif-entry.c:671 libexif/exif-entry.c:763
 #: test/nls/test-codeset.c:54
@@ -1800,15 +1785,15 @@ msgstr "За центром"
 
 #: libexif/exif-entry.c:680
 msgid "Co-sited"
-msgstr ""
+msgstr "Розташоване поруч"
 
 #: libexif/exif-entry.c:682
 msgid "Reversed mono"
-msgstr ""
+msgstr "Обернене моно"
 
 #: libexif/exif-entry.c:682
 msgid "Normal mono"
-msgstr ""
+msgstr "�ормальне моно"
 
 #: libexif/exif-entry.c:682
 msgid "RGB"
@@ -1844,7 +1829,7 @@ msgstr "�втоек�позиці�"
 
 #: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
-msgstr ""
+msgstr "Ек�понуванн� вручну"
 
 #: libexif/exif-entry.c:687
 msgid "Auto bracket"
@@ -1852,11 +1837,11 @@ msgstr "�втообмеженн�"
 
 #: libexif/exif-entry.c:689
 msgid "Auto white balance"
-msgstr ""
+msgstr "�втоматичний балан� білого"
 
 #: libexif/exif-entry.c:689
 msgid "Manual white balance"
-msgstr ""
+msgstr "Балан� білого вручну"
 
 #: libexif/exif-entry.c:694
 msgid "Low gain up"
@@ -1876,12 +1861,12 @@ msgstr "Значне по�лабленн�"
 
 #: libexif/exif-entry.c:697
 msgid "Low saturation"
-msgstr ""
+msgstr "�изька на�ичені�ть"
 
 #: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
-msgstr ""
+msgstr "Ви�ока на�ичені�ть"
 
 #: libexif/exif-entry.c:698 libexif/exif-entry.c:699
 #: libexif/fuji/mnote-fuji-entry.c:63
@@ -1914,7 +1899,7 @@ msgstr "Сер."
 
 #: libexif/exif-entry.c:717
 msgid "Center-weight"
-msgstr ""
+msgstr "Центр ма�"
 
 #: libexif/exif-entry.c:719
 msgid "Multi spot"
@@ -1930,19 +1915,19 @@ msgstr "�е�ти�нений"
 
 #: libexif/exif-entry.c:726
 msgid "LZW compression"
-msgstr ""
+msgstr "Сти�канн� LZW"
 
 #: libexif/exif-entry.c:727 libexif/exif-entry.c:728
 msgid "JPEG compression"
-msgstr ""
+msgstr "Сти�канн� JPEG"
 
 #: libexif/exif-entry.c:729
 msgid "Deflate/ZIP compression"
-msgstr ""
+msgstr "Сти�канн� Deflate/ZIP"
 
 #: libexif/exif-entry.c:730
 msgid "PackBits compression"
-msgstr ""
+msgstr "Сти�канн� PackBits"
 
 #: libexif/exif-entry.c:736
 msgid "Tungsten incandescent light"
@@ -2052,8 +2037,7 @@ msgstr "Ді�"
 
 #: libexif/exif-entry.c:772
 msgid "Portrait mode (for closeup photos with the background out of focus)"
-msgstr ""
-"Портретний режим (дл� знімків з близької від�тані з розфоку�ованим тлом)"
+msgstr "Портретний режим (дл� знімків з близької від�тані з розфоку�ованим тлом)"
 
 #: libexif/exif-entry.c:774
 msgid "Landscape mode (for landscape photos with the background in focus)"
@@ -2062,7 +2046,7 @@ msgstr "Режим пейзажу (длÑ� пейзажних фото з тлоÐ
 #: libexif/exif-entry.c:778 libexif/exif-entry.c:783
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
-msgstr ""
+msgstr "Спалах не �працював"
 
 #: libexif/exif-entry.c:778
 msgid "No flash"
@@ -2070,7 +2054,7 @@ msgstr "Без �палаху"
 
 #: libexif/exif-entry.c:779
 msgid "Flash fired"
-msgstr ""
+msgstr "Спалах �працював"
 
 #: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
@@ -2082,11 +2066,11 @@ msgstr "Так"
 
 #: libexif/exif-entry.c:780
 msgid "Strobe return light not detected"
-msgstr ""
+msgstr "�е ви�влено �вітла від поверненн� �троба"
 
 #: libexif/exif-entry.c:780
 msgid "Without strobe"
-msgstr ""
+msgstr "Без �тробу"
 
 #: libexif/exif-entry.c:782
 msgid "Strobe return light detected"
@@ -2094,39 +2078,39 @@ msgstr "Ви�влено �вітло від поверненн� �троба"
 
 #: libexif/exif-entry.c:782
 msgid "With strobe"
-msgstr ""
+msgstr "Зі �тробом"
 
 #: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode"
-msgstr ""
+msgstr "Спалах �працював, режим приму�ового �палаху"
 
 #: libexif/exif-entry.c:785
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
+msgstr "Спалах �працював, режим приму�ового �палаху, відбитого �вітла не ви�влено"
 
 #: libexif/exif-entry.c:787
 msgid "Flash fired, compulsory flash mode, return light detected"
-msgstr ""
+msgstr "Спалах �працював, режим приму�ового �палаху, ви�влено відбите �вітло"
 
 #: libexif/exif-entry.c:789
 msgid "Flash did not fire, compulsory flash mode"
-msgstr ""
+msgstr "Спалах не �працював, приму�овий режим �палаху"
 
 #: libexif/exif-entry.c:790
 msgid "Flash did not fire, auto mode"
-msgstr ""
+msgstr "Спалах не �працював, автоматичний режим"
 
 #: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode"
-msgstr ""
+msgstr "Спалах �працював, автоматичний режим"
 
 #: libexif/exif-entry.c:792
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
+msgstr "Спалах �працював, автоматичний режим, відбитого �вітла не ви�влено"
 
 #: libexif/exif-entry.c:794
 msgid "Flash fired, auto mode, return light detected"
-msgstr ""
+msgstr "Спалах �працював, автоматичний режим, ви�влено відбите �вітло"
 
 #: libexif/exif-entry.c:795
 msgid "No flash function"
@@ -2134,52 +2118,47 @@ msgstr "Без функції �палаху"
 
 #: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode"
-msgstr ""
+msgstr "Спалах �працював, режим придушенн� ефекту «червоних очей»"
 
 #: libexif/exif-entry.c:797
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
+msgstr "Спалах �працював, режим придушенн� ефекту «червоних очей», відбитого �вітла не ви�влено"
 
 #: libexif/exif-entry.c:799
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
+msgstr "Спалах �працював, режим придушенн� ефекту «червоних очей», ви�влено відбите �вітло"
 
 #: libexif/exif-entry.c:801
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
-msgstr ""
+msgstr "Спалах �працював, приму�овий режим �палаху, режим придушенн� ефекту «червоних очей»"
 
 #: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "Спалах �працював, режим приму�ового �палаху, придушенн� ефекту «червоних очей», відбитого �вітла не ви�влено"
 
 #: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "Спалах �працював, режим приму�ового �палаху, придушенн� ефекту «червоних очей», ви�влено відбите �вітло"
 
 #: libexif/exif-entry.c:807
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "Спалах не �працював, автоматичний режим, режим придушенн� ефекту «червоних очей»"
 
 #: libexif/exif-entry.c:808
 msgid "Flash fired, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "Спалах �працював, автоматичний режим, режим придушенн� ефекту «червоних очей»"
 
 #: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "Спалах �працював, автоматичний режим, відбитого �вітла не ви�влено, режим придушенн� ефекту «червоних очей»"
 
 #: libexif/exif-entry.c:811
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
+msgstr "Спалах �працював, автоматичний режим, ви�влено відбите �вітло, режим придушенн� ефекту «червоних очей»"
 
 #: libexif/exif-entry.c:815
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #: libexif/exif-entry.c:817
 msgid "Close view"
@@ -2208,49 +2187,49 @@ msgstr "�екалібрована"
 #: libexif/exif-entry.c:878
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
-msgstr ""
+msgstr "�екоректний розмір запи�у (%i, мало бути %li x %i)."
 
 #: libexif/exif-entry.c:911
 msgid "Unsupported UNICODE string"
-msgstr ""
+msgstr "�епідтримуваний р�док UNICODE"
 
 #: libexif/exif-entry.c:919
 msgid "Unsupported JIS string"
-msgstr ""
+msgstr "�епідтримуваний р�док JIS"
 
 #: libexif/exif-entry.c:935
 msgid "Tag UserComment contains data but is against specification."
-msgstr ""
+msgstr "Мітка UserComment мі�тить дані, але ці дані не відповідають �пецифікації."
 
 #: libexif/exif-entry.c:939
 #, c-format
 msgid "Byte at position %i: 0x%02x"
-msgstr ""
+msgstr "Байт на позиції %i: 0x%02x"
 
 #: libexif/exif-entry.c:947
 msgid "Unknown Exif Version"
-msgstr ""
+msgstr "�евідома вер�і� Exif"
 
 #: libexif/exif-entry.c:951
 #, c-format
 msgid "Exif Version %d.%d"
-msgstr ""
+msgstr "Вер�і� Exif %d.%d"
 
 #: libexif/exif-entry.c:962
 msgid "FlashPix Version 1.0"
-msgstr ""
+msgstr "Вер�і� FlashPix 1.0"
 
 #: libexif/exif-entry.c:964
 msgid "FlashPix Version 1.01"
-msgstr ""
+msgstr "Вер�і� FlashPix 1.01"
 
 #: libexif/exif-entry.c:966
 msgid "Unknown FlashPix Version"
-msgstr ""
+msgstr "�евідома вер�і� FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1668
+#: libexif/exif-entry.c:1673 libexif/exif-entry.c:1677
+#: libexif/exif-entry.c:1682 libexif/exif-entry.c:1683
 msgid "[None]"
 msgstr "[�емає]"
 
@@ -2271,12 +2250,12 @@ msgstr "%.02f EV"
 #: libexif/exif-entry.c:1025
 #, c-format
 msgid " (f/%.01f)"
-msgstr ""
+msgstr " (f/%.01f)"
 
 #: libexif/exif-entry.c:1059
 #, c-format
 msgid " (35 equivalent: %d mm)"
-msgstr ""
+msgstr " (35-мм еквівалент: %d мм)"
 
 #: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
 msgid " sec."
@@ -2285,21 +2264,21 @@ msgstr " �ек."
 #: libexif/exif-entry.c:1107
 #, c-format
 msgid " (1/%d sec.)"
-msgstr ""
+msgstr " (1/%d �екунд)"
 
 #: libexif/exif-entry.c:1109
 #, c-format
 msgid " (%d sec.)"
-msgstr ""
+msgstr " (%d �екунд)"
 
 #: libexif/exif-entry.c:1122
 #, c-format
 msgid " (%.02f cd/m^2)"
-msgstr ""
+msgstr " (%.02f кд/м^2)"
 
 #: libexif/exif-entry.c:1132
 msgid "DSC"
-msgstr ""
+msgstr "ДСК"
 
 #: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
 #: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
@@ -2309,7 +2288,7 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:359
 #, c-format
 msgid "Internal error (unknown value %i)"
-msgstr ""
+msgstr "Внутрішн� помилка (невідоме значенн� %i)"
 
 #: libexif/exif-entry.c:1142
 msgid "-"
@@ -2345,7 +2324,7 @@ msgstr "Зарезервовано"
 
 #: libexif/exif-entry.c:1172
 msgid "Directly photographed"
-msgstr ""
+msgstr "Безпо�ередньо �фотографовано"
 
 #: libexif/exif-entry.c:1185
 msgid "YCbCr4:2:2"
@@ -2358,30 +2337,30 @@ msgstr "YCbCr4:2:0"
 #: libexif/exif-entry.c:1204
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
-msgstr ""
+msgstr "У межах від�тані %i з (x,y) = (%i,%i)"
 
 #: libexif/exif-entry.c:1213
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
-msgstr ""
+msgstr "У пр�мокутнику (ширина %i, ви�ота %i) навколо (x,y) = (%i,%i)"
 
 #: libexif/exif-entry.c:1219
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
-msgstr ""
+msgstr "�еочікувана кількі�ть компонентів (%li замі�ть 2, 3 або 4)."
 
 #: libexif/exif-entry.c:1257
 msgid "Sea level"
-msgstr ""
+msgstr "Рівень мор�"
 
 #: libexif/exif-entry.c:1259
 msgid "Sea level reference"
-msgstr ""
+msgstr "Еталон рівн� мор�"
 
 #: libexif/exif-entry.c:1367
 #, c-format
 msgid "Unknown value %i"
-msgstr ""
+msgstr "�евідоме значенн� %i"
 
 #: libexif/exif-format.c:37
 msgid "Short"
@@ -2393,7 +2372,7 @@ msgstr "Раціональний"
 
 #: libexif/exif-format.c:39
 msgid "SRational"
-msgstr ""
+msgstr "SRational"
 
 #: libexif/exif-format.c:40
 msgid "Undefined"
@@ -2434,19 +2413,19 @@ msgstr "Double"
 #: libexif/exif-loader.c:119
 #, c-format
 msgid "The file '%s' could not be opened."
-msgstr ""
+msgstr "�е вдало�� відкрити файл «%s»."
 
 #: libexif/exif-loader.c:300
 msgid "The data supplied does not seem to contain EXIF data."
-msgstr ""
+msgstr "�адані дані не мі�т�ть даних EXIF."
 
 #: libexif/exif-log.c:43
 msgid "Debugging information"
-msgstr ""
+msgstr "Діагно�тична інформаці�"
 
 #: libexif/exif-log.c:44
 msgid "Debugging information is available."
-msgstr ""
+msgstr "До�тупна діагно�тична інформаці�."
 
 #: libexif/exif-log.c:45
 msgid "Not enough memory"
@@ -2454,432 +2433,337 @@ msgstr "�е ви�тачає пам'�ті"
 
 #: libexif/exif-log.c:46
 msgid "The system cannot provide enough memory."
-msgstr ""
+msgstr "Си�тема не надає до�татнього об��гу пам’�ті."
 
 #: libexif/exif-log.c:47
 msgid "Corrupt data"
-msgstr ""
+msgstr "Пошкоджені дані"
 
 #: libexif/exif-log.c:48
 msgid "The data provided does not follow the specification."
-msgstr ""
+msgstr "�адані дані не відповідають �пецифікації."
 
 #: libexif/exif-tag.c:62
 msgid "GPS Tag Version"
-msgstr ""
+msgstr "Вер�і� міток GPS"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Відповідає вер�ії <GPSInfoIFD>. Вер�і� подаєть�� �к 2.0.0.0. Ц� мітка є обов’�зковою, �кщо і�нує мітка <GPSInfo>. (Зауваженн�: значенн� мітки <GPSVersionID> визначаєть�� у байтах, на відміну від значенн� мітки <ExifVersion>. Якщо вер�ією є 2.0.0.0, значенн�м мітки має бути 02000000.H)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
-msgstr ""
+msgstr "Індек� здатно�ті до взаємодії"
 
 #: libexif/exif-tag.c:70
-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 ""
+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 "Вказує на ідентифікацію правила забезпеченн� взаємодії. Скори�тайте�� значенн�м «R98» дл� визначенн� правил ExifR98. Викори�товуєть�� чотири байти разом із �имволом завершенн� (NULL). Див. окремий том «Рекомендованих правил забезпеченн� взаємодії Exif» (ExifR98), щоб дізнати�� про інші мітки, �кі викори�товують�� у ExifR98."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
-msgstr ""
+msgstr "Північна або південна широта"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Визначає, є широта північною чи південною. Значенн� ASCII «N» означає північну широту, а значенн� «S» — південну."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
-msgstr ""
+msgstr "Вер�і� можливо�ті взаємодії"
 
 #: libexif/exif-tag.c:83
 msgid "Latitude"
 msgstr "Широта"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Вказує на широту. Широта визначаєть�� трьома Р�ЦІО��ЛЬ�ИМИ значенн�ми дл� граду�ів, мінут та �екунд, відповідно. Якщо довгота визначаєть�� граду�ами, мінутами та �екундами, типовим форматом є гг/,мм/,��/1. Якщо викори�товують��, наприклад, граду�и і мінути, дробова ча�тина мінут задаєть�� двома де��тковими цифрами, а формат запи�уватиметь�� так: гг/1,мммм/100,0/1."
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
-msgstr ""
+msgstr "Східна чи західна довгота"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Визначає, є довгота �хідною чи західною. «E» у ASCII відповідає �хідній довготі, а «W» — західній довготі."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
 msgstr "Довгота"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Вказує на довготу. Довгота визначаєть�� трьома Р�ЦІО��ЛЬ�ИМИ значенн�ми дл� граду�ів, мінут та �екунд, відповідно. Якщо довгота визначаєть�� граду�ами, мінутами та �екундами, типовим форматом є ггг/1,мм/1,��/1. Якщо викори�товують��, наприклад, граду�и і мінути, дробова ча�тина мінут задаєть�� двома де��тковими цифрами, а формат запи�уватиметь�� так: ггг/1,мммм/100,0/1."
 
 #: libexif/exif-tag.c:103
 msgid "Altitude Reference"
-msgstr ""
+msgstr "Еталонна ви�ота"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
+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 is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GPSAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags."
+msgstr "Вказує на ви�оту, �ка є еталонною. Якщо еталонною ви�отою є рівень мор�, і ви�ота обчи�люєть�� відно�но цього рівн�, вказуєть�� 0. Якщо ви�ота визначаєть�� нижче рівн� мор�, вказуєть�� значенн� 1, а �ама ви�ота, за модулем, вказуєть�� у мітці GPSAltitude. Еталонною одиницею виміру є метр. Зауважте, що ц� мітка належить до типу BYTE, на відміну від інших міток еталонних величин."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
 msgstr "Ви�ота"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Вказує на ви�оту відно�но еталонного рівн� у GPSAltitudeRef. Ви�ота вказуєть�� у форматі Р�ЦІО��ЛЬ�ОГО значенн�. Одиницею вимірюванн� є метр."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
-msgstr ""
+msgstr "Ча� GPS (за атомним годинником)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Вказує на ча� UTC (в�е�вітнього координованого ча�у). Ча�ова позначка виражаєть�� у форматі трьох Р�ЦІО��ЛЬ�ИХ значень — годин, хвилин і �екунд."
 
 #: libexif/exif-tag.c:118
 msgid "GPS Satellites"
-msgstr ""
+msgstr "Супутники GPS"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
+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, 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 shall be set to NULL."
+msgstr "Вказує на �упутники GPS, �кі було викори�тано дл� вимірюванн�. Цією міткою можна �кори�тати�� дл� опи�у кілько�ті �упутників, ідентифікаційних номерів, кутів ви�оти, азимутів, �піввідношень �игнал/шум та інших відомо�тей у запи�і ASCII. Формат запи�у не визначено. Якщо приймач GPS не може виконати вимірюванн�, значенн�м мітки має бути  NULL."
 
 #: libexif/exif-tag.c:125
 msgid "GPS Receiver Status"
-msgstr ""
+msgstr "Стан приймача GPS"
 
 #: libexif/exif-tag.c:126
-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 ""
+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 "Визначає �тан приймача GPS у момент, коли було запи�ано зображенн�. «A» означає «виконуєть�� вимірюванн�», а «V» означає «вимірюванн� Interoperability»."
 
 #: libexif/exif-tag.c:129
 msgid "GPS Measurement Mode"
-msgstr ""
+msgstr "Режим вимірюванн� GPS"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Вказує на режим вимірюванн� GPS. «2» означає, що виконуєть�� двовимірне вимірюванн�, а «3» — тривимірне вимірюванн�."
 
 #: libexif/exif-tag.c:133
 msgid "Measurement Precision"
-msgstr ""
+msgstr "Точні�ть вимірюванн�"
 
 #: libexif/exif-tag.c:134
-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 ""
+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 "Вказує на GPS DOP (рівень точно�ті даних). Значенн� HDOP запи�уєть�� під ча� двовимірного вимірюванн�, а PDOP — під ча� тривимірного вимірюванн�."
 
 #: libexif/exif-tag.c:137
 msgid "Speed Unit"
-msgstr ""
+msgstr "Одиниц� швидко�ті"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr ""
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr "Вказує одиницю виміру швидко�ті руху приймача GPS. «K», «M» і «N» — кілометри на годину, милі за годину та вузли, відповідно."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
-msgstr ""
+msgstr "Швидкі�ть приймача даних GPS"
 
 #: libexif/exif-tag.c:142
 msgid "Indicates the speed of GPS receiver movement."
-msgstr ""
+msgstr "Визначає швидкі�ть руху приймача даних GPS."
 
 #: libexif/exif-tag.c:143
 msgid "Reference for direction of movement"
-msgstr ""
+msgstr "Режим відліку напр�мку"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Вказує на еталонний напр�мок, від �кого обчи�люєть�� кут до напр�мку руху приймача GPS. «T» — і�тинний напр�мок, а «M» — напр�мок на магнітний полю�."
 
 #: libexif/exif-tag.c:147
 msgid "Direction of Movement"
-msgstr ""
+msgstr "�апр�мок руху"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
-msgstr ""
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
+msgstr "Визначає напр�м, у �кому рухав�� приймач GPS. Значенн� мають належати діапазону від 0.00 до 359.99."
 
 #: libexif/exif-tag.c:150
 msgid "GPS Image Direction Reference"
-msgstr ""
+msgstr "Режим відліку напр�мку зніманн� у GPS"
 
 #: libexif/exif-tag.c:151
-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 ""
+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 "Вказує на еталонний напр�мок, від �кого обчи�люєть�� кут до напр�мку зніманн� зображенн�. «T» — і�тинний напр�мок, а «M» — напр�мок на магнітний полю�."
 
 #: libexif/exif-tag.c:153
 msgid "GPS Image Direction"
-msgstr ""
+msgstr "�апр�мок зніманн� у GPS"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
+msgstr "Визначає напр�м, у �кому виконувало�� зніманн� зображенн�. Значенн� мають належати діапазону від 0.00 до 359.99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
-msgstr ""
+msgstr "Викори�тано дані геодезичної зйомки"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Визначає дані геодезичної зйомки, викори�тані приймачем GPS. Якщо дані зйомки обмежено Японією, значенн�м цієї мітки буде «TOKYO» або «WGS-84». Якщо запи�ано мітку даних GPS, наполегливо рекомендуємо запи�ати і цю мітку."
 
 #: libexif/exif-tag.c:161
 msgid "Reference For Latitude of Destination"
-msgstr ""
+msgstr "�апр�мок відліку широти"
 
 #: libexif/exif-tag.c:162
-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 ""
+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 "Визначає, є широта точки цілі північною чи південною. Значенн� ASCII «N» означає північну широту, а значенн� «S» — південну."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
-msgstr ""
+msgstr "Широта мі�ц�"
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Вказує на широту точки цілі. Широта визначаєть�� трьома Р�ЦІО��ЛЬ�ИМИ значенн�ми дл� граду�ів, мінут та �екунд, відповідно. Якщо широта визначаєть�� граду�ами, мінутами та �екундами, типовим форматом є гг/,мм/,��/1. Якщо викори�товують��, наприклад, граду�и і мінути, дробова ча�тина мінут задаєть�� двома де��тковими цифрами, а формат запи�уватиметь�� так: ггг/1,мммм/100,0/1."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
-msgstr ""
+msgstr "�апр�мок відліку довготи"
 
 #: libexif/exif-tag.c:174
-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 ""
+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 "Визначає, є довгота точки цілі �хідною чи західною. «E» у ASCII відповідає �хідній довготі, а «W» — західній довготі."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
-msgstr ""
+msgstr "Довгота мі�ц�"
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Вказує на довготу точки цілі. Довгота визначаєть�� трьома Р�ЦІО��ЛЬ�ИМИ значенн�ми дл� граду�ів, мінут та �екунд, відповідно. Якщо довгота визначаєть�� граду�ами, мінутами та �екундами, типовим форматом є ггг/1,мм/1,��/1. Якщо викори�товують��, наприклад, граду�и і мінути, дробова ча�тина мінут задаєть�� двома де��тковими цифрами, а формат запи�уватиметь�� так: ггг/1,мммм/100,0/1."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
-msgstr ""
+msgstr "Еталонний напр�мок на ціль"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Вказує на еталонний напр�мок, від �кого обчи�люєть�� кут до напр�мку на точку цілі. «T» — і�тинний напр�мок, а «M» — напр�мок на магнітний полю�."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
-msgstr ""
+msgstr "�апр�мок на ціль"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
-msgstr ""
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
+msgstr "Вказує на напр�мок до точки цілі. Діапазон значень — від 0.00 до 359.99."
 
 #: libexif/exif-tag.c:193
 msgid "Reference for Distance to Destination"
-msgstr ""
+msgstr "Одиниц� вимірюванн� дл� від�тані до цілі"
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr "Визначає одиницю, �ка викори�товуєть�� дл� вимірюванн� від�тані до точки цілі. «K», «M» і «N» — це кілометри, милі та мор�ькі милі, відповідно."
 
 #: libexif/exif-tag.c:197
 msgid "Distance to Destination"
-msgstr ""
+msgstr "Від�тань до призначенн�"
 
 #: libexif/exif-tag.c:198
 msgid "Indicates the distance to the destination point."
-msgstr ""
+msgstr "Визначає від�тань до точки призначенн�."
 
 #: libexif/exif-tag.c:199
 msgid "Name of GPS Processing Method"
-msgstr ""
+msgstr "�азва �по�обу обробки даних GPS"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Р�док із �имволів, у �кому запи�ано назву методу, викори�таного дл� визначенн� мі�ц�. Перший байт визначає кодуванн� �имволів, за ним має бути вказано назву �по�обу. О�кільки Type не є набором �имволів ASCII, завершенн� р�дка �имволом NULL є непотрібним."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
-msgstr ""
+msgstr "�азва обла�ті GPS"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Р�док із �имволів, у �кому запи�ано назву обла�ті GPS. Перший байт визначає кодуванн� �имволів, за ним має бути вказано назву обла�ті GPS. О�кільки Type не є набором �имволів ASCII, завершенн� р�дка �имволом NULL є непотрібним."
 
 #: libexif/exif-tag.c:210
 msgid "GPS Date"
-msgstr ""
+msgstr "Дата GPS"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "Р�док із �имволів, у �кому запи�ано дані щодо дати і ча�у відно�но UTC (в�е�вітнього координованого ча�у). Формат є таким: «РРРР:ММ:ДД». Довжина р�дка має �кладати 11 байтів разом із завершальним �имволом NULL."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
-msgstr ""
+msgstr "Диференціальне виправленн� GPS"
 
 #: libexif/exif-tag.c:216
+msgid "Indicates whether differential correction is applied to the GPS receiver."
+msgstr "Вказує на диференціальне виправленн�, �ке за�то�овано до даних приймача GPS."
+
+#: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
 msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
-msgstr ""
+msgstr "�овий тип підфайлів"
 
 #: libexif/exif-tag.c:220
 msgid "A general indication of the kind of data contained in this subfile."
-msgstr ""
+msgstr "Загальне визначенн� типу даних, що мі�т�ть�� у цьому підфайлі."
 
 #: libexif/exif-tag.c:222
 msgid "Image Width"
 msgstr "Ширина зображенн�"
 
 #: libexif/exif-tag.c:223
-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 ""
+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 "Кількі�ть �товпчиків даних зображенн�, дорівнює кілько�ті пік�елів на р�док. У �ти�нених даних JPEG замі�ть цієї мітки викори�товуєть�� позначка JPEG."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
-msgstr ""
+msgstr "Довжина зображенн�"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Кількі�ть р�дків даних зображенн�. У �ти�нених даних JPEG замі�ть цієї мітки викори�товуєть�� позначка JPEG."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
-msgstr ""
+msgstr "Бітів на фрагмент"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Кількі�ть бітів на компонент зображенн�. У цьому �тандарті кожен компонент зображенн� є 8-бітовим, отже значенн�м дл� цієї мітки є 8. Див. також <SamplesPerPixel>. У �ти�нених даних JPEG замі�ть цієї мітки викори�товуєть�� позначка JPEG."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Сти�ненн�"
 
 #: libexif/exif-tag.c:238
-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 ""
+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 "�лгоритм �ти�канн�, �кий викори�тано дл� даних зображенн�. Якщо о�новне зображенн� �ти�нено за допомогою алгоритму JPEG, це значенн� є зайвим, його можна не вказувати. Якщо �ти�канн� JPEG викори�тано дл� мініатюр, значенн�м цієї мітки має бути 6."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
-msgstr ""
+msgstr "Фотометрична інтерпретаці�"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Композиці� пік�елів. У �ти�нених даних JPEG замі�ть цієї мітки викори�товуєть�� позначка JPEG."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
-msgstr ""
+msgstr "Пор�док заповненн�"
 
 #: libexif/exif-tag.c:251
 msgid "Document Name"
@@ -2890,46 +2774,32 @@ msgid "Image Description"
 msgstr "Опи� зображенн�"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "Р�док із �имволів, �кий є заголовком зображенн�. Це може бути коментар, подібний до «1988 company picnic». �е можна викори�товувати двобайтові коди �имволів. Якщо вам потрібні двобайтові �имволи, �кори�тайте�� приватною міткою Exif <UserComment>."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Виробник"
 
 #: libexif/exif-tag.c:261
-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 ""
+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 "Виробник обладнанн� дл� запи�уванн� даних. Це може бути виробник цифрового дзеркального фотоапарата, �канера, за�обу дл� цифруванн� відеоданих або іншого обладнанн�, за допомогою �кого було �творено зображенн�. Якщо значенн� пол� є порожнім, вважаєть��, що виробник є невідомим."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Модель"
 
 #: libexif/exif-tag.c:268
-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 ""
+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 "�азва моделі або номер моделі обладнанн�. Це назва моделі або номер цифрового дзеркального фотоапарата, за�обу дл� цифруванн� відеоданих або іншого обладнанн�, за допомогою �кого було �творено зображенн�. Якщо значенн� пол� є порожнім, вважаєть��, що виробник є невідомим."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
-msgstr ""
+msgstr "З�уви �муг"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "З�ув у байтах дл� кожної зі �муг зображенн�. Рекомендовано, щоб вибрана у такий �по�іб кількі�ть байтів дл� �муги не перевищувала 64 кілобайтів. Дл� �ти�нених даних JPEG це значенн� є непотрібним, його �лід пропу�тити. Див. також <RowsPerStrip> і <StripByteCounts>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
@@ -2937,254 +2807,183 @@ msgstr "Орієнтаці�"
 
 #: libexif/exif-tag.c:281
 msgid "The image orientation viewed in terms of rows and columns."
-msgstr ""
+msgstr "Орієнтаці� зображенн� у �ен�і р�дків і �товпчиків."
 
 #: libexif/exif-tag.c:284
 msgid "Samples per Pixel"
-msgstr ""
+msgstr "Семпли на пік�ель"
 
 #: libexif/exif-tag.c:285
-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 ""
+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 "Кількі�ть компонентів на пік�ель. О�кільки цей �тандарт �то�уєть�� зображень у про�торах кольорів RGB і YCbCr, значенн�м дл� цієї мітки є 3. У �ти�нених даних JPEG замі�ть цієї мітки викори�товуєть�� позначка JPEG."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
-msgstr ""
+msgstr "Р�дків на �мугу"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Кількі�ть р�дків на �мугу. Це кількі�ть р�дків у зображенн� однієї �муги, �кщо зображенн� поділено на �муги. У �ти�нених даних JPEG замі�ть цієї мітки викори�товуєть�� позначка JPEG. Диа. також <StripOffsets> і <StripByteCounts>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
-msgstr ""
+msgstr "Кількі�ть байтів у �музі"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Загальна кількі�ть байтів у кожній �музі. Дл� �ти�нених даних JPEG це значенн� є непотрібним, його �лід пропу�тити."
 
 #: libexif/exif-tag.c:301
 msgid "X-Resolution"
 msgstr "Роздільна здатні�ть за X"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Кількі�ть пік�елів на <ResolutionUnit> у напр�мку <ImageWidth>. Якщо роздільна здатні�ть зображенн� є невідомою, викори�товуєть�� значенн� 72 [точок на дюйм]."
 
 #: libexif/exif-tag.c:306
 msgid "Y-Resolution"
 msgstr "Роздільна здатні�ть за Y"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Кількі�ть пік�елів на <ResolutionUnit> у напр�мку <ImageLength>. Викори�товуєть�� те �аме значенн�, що і дл� <XResolution>."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
-msgstr ""
+msgstr "�алаштуванн� планарно�ті"
 
 #: libexif/exif-tag.c:312
-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 ""
+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 "Вказує на те, запи�ано компоненти пік�ел� у фрагментному чи планарному форматі. У �ти�нених даних JPEG замі�ть цієї мітки викори�товуєть�� позначка JPEG. Якщо пол� не і�нує, викори�товуватиметь�� типове значенн� дл� TIFF, 1 (фрагментний)."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
-msgstr ""
+msgstr "Одиниц� роздільно�ті"
 
 #: libexif/exif-tag.c:318
-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 ""
+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 "Одиниц� виміру <XResolution> і <YResolution>. Дл� <XResolution> і <YResolution> викори�товуєть�� одна одиниц�. Якщо роздільна здатні�ть зображенн� є невідомою, припу�каєть�� типове значенн� 2 (дюйми)."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
-msgstr ""
+msgstr "Функці� перене�енн�"
 
 #: libexif/exif-tag.c:324
-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 ""
+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 "Функці� передаванн�, опи�ана у табличному �тилі. Зазвичай, потреби у цій мітці немає, о�кільки про�тір кольорів визначаєть�� у мітці відомо�тей щодо про�тору кольорів (<ColorSpace>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Програми"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
+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 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."
+msgstr "У цій мітці запи�уєть�� назва і вер�і� програмного забезпеченн� або мікропрограми фотоапарата або при�трою дл� отриманн� зображенн�, �кі було викори�тано дл� �творенн� зображенн�. Докладно формат запи�у не визначено, але рекомендовано дотримувати�� вказаного нижче прикладу. Якщо поле є порожнім, вважаєть��, що відповідні дані є невідомими."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Дата і ча�"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "Дата і ча� �творенн� зображенн�. У цьому �тандарті (EXIF-2.1) це дата і ча�, коли файл було змінено."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Виконавець"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "У цій мітці запи�ують�� дані щодо вла�ника фотоапарата, фотографа або о�оби, �кою �творено зображенн�. Докладно формат запи�у не визначено, але рекомендовано дотримувати�� вказаного нижче прикладу. Якщо поле є порожнім, вважаєть��, що відповідні дані є невідомими."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "Біла точка"
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "О�новні кольори точки білого зображенн�. Зазвичай, ц� мітка є непотрібною, о�кільки про�тір кольорів визначаєть�� у мітці відомо�тей щодо про�тору кольорів (<ColorSpace>)."
 
 #: libexif/exif-tag.c:353
 msgid "Primary Chromaticities"
-msgstr ""
+msgstr "О�новні кольори"
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
-msgstr ""
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "О�новні кольори трьох о�новних кольорів зображенн�. Зазвичай, ц� мітка є непотрібною, о�кільки про�тір кольорів визначаєть�� у мітці відомо�тей щодо про�тору кольорів (<ColorSpace>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
+msgstr "Визначено Adobe Corporation дл� уможливленн� ієрархій TIFF у файлі TIFF."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
-msgstr ""
+msgstr "Діапазон передаванн�"
 
 #: libexif/exif-tag.c:366
 msgid "JPEG Interchange Format"
-msgstr ""
+msgstr "Формат обміну JPEG"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "З�ув початкового байта (SOI) �ти�нених у форматі JPEG даних мініатюри. Це викори�товуєть�� дл� о�новних даних зображенн� JPEG."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
-msgstr ""
+msgstr "Довжина формату обміну JPEG"
 
 #: libexif/exif-tag.c:373
-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 ""
+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 "Кількі�ть байтів �ти�нених даних мініатюри JPEG. �е викори�товуєть�� дл� даних о�новного зображенн� JPEG. Мініатюри JPEG не діл�ть��, а запи�ують�� �к неперервний потік бітів JPEG з SOI до EOI. Позначки Appn і COM не �лід запи�увати. Сти�нені мініатюри має бути запи�ано не більше ніж у 64 кілобайти, разом із у�іма іншими даними, �кі �лід запи�увати до APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
-msgstr ""
+msgstr "Коефіцієнти YCbCr"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "Коефіцієнти матриц� дл� перетворенн� даних зображенн� з RGB до YCbCr. У TIFF типове значенн� не задаєть��; але тут �к типове значенн� викори�товуєть�� значенн�, вказане у «�а�тановах про�тору кольорів». Про�тір кольорів оголошуєть�� у мітці відомо�тей щодо про�тору кольорів. Типовим є значенн�, �ке дає оптимальні характери�тики �умі�но�ті зображенн�."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
-msgstr ""
+msgstr "Підрозбитт� на кроки дл� YCbCr"
 
 #: libexif/exif-tag.c:393
-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 ""
+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."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
 msgstr "Позиціюванн� YCbCr"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Розташуванн� компонентів колірно�ті відно�но компонента о�вітлено�ті. Це поле призначено лише дл� �ти�нутих даних JPEG або не�ти�нутих даних YCbCr. Типовим дл� TIFF є значенн� 1 (центральне); але �кщо Y:Cb:Cr = 4:2:2, рекомендованим у цьому �тандарті дл� запи�у даних є значенн� 2 (�умі�не). Це значенн� поліпшить �кі�ть зображенн� при перегл�ді на телевізійних �и�темах. Якщо цього пол� не і�нує, за�іб читанн� має припу�кати типове значенн� TIFF. Якщо Y:Cb:Cr = 4:2:0, рекомендованим є типове значенн� TIFF (центроване). Якщо у за�обі читанн� немає �умі�но�ті із підтримкою обох типів <YCbCrPositioning>, він має викори�товувати типове значенн� TIFF, незалежно від значенн� у цьому полі. Бажано, щоб у за�обах читанн� було передбачено підтримку обох, центрованого і �умі�ного, розташувань."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
-msgstr ""
+msgstr "Еталонні чорне/біле"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
+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 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."
+msgstr "Значенн� еталонної точки чорного і значенн� еталонної точки білого. У TIFF типові значенн� не задають��, а викори�товують�� типові значенн� задані тут. Про�тір кольорів оголошуєть�� у мітці відомо�тей щодо про�тору кольорів. Типовим є значенн�, �ке дає оптимальні характери�тики �умі�но�ті зображенн�."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
-msgstr ""
+msgstr "Пакунок XML"
 
 #: libexif/exif-tag.c:423
 msgid "XMP Metadata"
-msgstr ""
+msgstr "Метадані XMP"
 
 #: libexif/exif-tag.c:438 libexif/exif-tag.c:784
 msgid "CFA Pattern"
-msgstr ""
+msgstr "Взірець CFA"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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 ""
+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 "Визначає геометричний взірець ма�иву фільтруванн� кольорів (CFA) датчика зображень, �кщо викори�товуєть�� одночиповий датчик обла�ті кольорів. Сто�уєть�� не у�іх методів вимірюванн�."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
@@ -3195,202 +2994,148 @@ msgid "Copyright"
 msgstr "�втор�ьке право"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Дані щодо автор�ьких прав. У цьому �тандарті мітка викори�товуєть�� дл� зберіганн� одразу відомо�тей щодо автор�ьких прав фотографа і редактора. Це запи� щодо автор�ьких прав о�оби або організації, �ка є вла�ником автор�ьких прав на зображенн�. До цього пол� має бути запи�ано �умі�не формулюванн� автор�ьких прав, що включає дату і вла�ника. Приклад: «Copyright, John Smith, 19xx. All rights reserved.». У цьому �тандарті мітка викори�товуєть�� дл� зберіганн� одразу відомо�тей щодо автор�ьких прав фотографа і редактора, �кі має бути викладено у окремих ча�тинах формулюванн�. Якщо між автор�ькими правами фотографа і редактора є очевидні відмінно�ті, запи�и має бути викладено у такому пор�дку: �першу запи� фотографа, потім запи� редактора, відокремлений �имволом NULL (у такому випадку, о�кільки формулюванн� також завершуєть�� �имволом NULL, між запи�ами має бути два �имволи NULL) (див. приклад 1). Якщо вказано лише автор�ькі права фотографа, їхній запи� має завершувати одинарним �имволом NULL (див. приклад 2). Якщо вказано лише автор�ькі права редактора, ча�тина запи�у автор�ьких прав, при�в�чена фотографу, має �кладати�� із одного пробілу, за �ким має �лідувати �имвол NULL, далі має бути вказано автор�ькі права редактора (див. приклад 3). Якщо поле є порожнім, вважаєть��, що автор�ькі права є невідомими."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
-msgstr ""
-
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "Діафрагмове чи�ло"
+msgstr "Тривалі�ть ек�понуванн� вказана у �екундах."
 
 #: libexif/exif-tag.c:470
 msgid "The F number."
-msgstr ""
+msgstr "Діафрагмове чи�ло."
 
 #: libexif/exif-tag.c:475
 msgid "Image Resources Block"
-msgstr ""
+msgstr "Блок ре�ур�ів зображенн�"
 
 #: libexif/exif-tag.c:477
-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 ""
+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 "Вказівник на IFD Exif. Дл� �умі�но�ті IFD Exif має таку �аму �труктуру, що і IFD, вказаний у TIFF. Втім, зазвичай, тут не мі�т�ть�� дані зображенн�, �к у випадку TIFF."
 
 #: libexif/exif-tag.c:485
 msgid "Exposure Program"
 msgstr "Програма ек�позиції"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "Кла� програми, викори�таної фотоапаратом дл� ек�понуванн� під ча� зніманн�."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
 msgstr "Спектральна чутливі�ть"
 
 #: libexif/exif-tag.c:491
-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 ""
+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 "Вказує на �пектральну чутливі�ть кожного каналу, викори�таного фотоапаратом. Значенн� мітки є р�док �имволів ASCII, �умі�ний із �тандартом, розробленим Технічним комітетом ASTM."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
-msgstr ""
+msgstr "IFD-вказівник даних GPS"
 
 #: libexif/exif-tag.c:497
-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 ""
+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 "Вказівник на IFD відомо�тей GPS. Структура �умі�но�ті IFD відомо�тей GPS, подібна до IFD Exif, не мі�тить даних зображенн�."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
 msgstr "Світлочутливі�ть ISO"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Вказує на швидкі�ть ISO і ширину ISO камери або при�трою отриманн� даних, �к їх визначено в ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
-msgstr ""
+msgstr "Функці� оптично-електронного перетворенн�"
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-msgstr ""
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+msgstr "Вказує на функцію оптоелектронного перетворенн� (OECF), задану у ISO 14524. <OECF> є зв'�зком між оптичними вхідними даними фотоапарата і значенн�ми у зображенні."
 
 #: libexif/exif-tag.c:513
 msgid "Time Zone Offset"
-msgstr ""
+msgstr "Ча�овий по��"
 
 #: libexif/exif-tag.c:514
 msgid "Encodes time zone of camera clock relative to GMT."
-msgstr ""
+msgstr "Закодований ча�овий по�� годинника фотоапарата відно�но ча�у за Грінвичем."
 
 #: libexif/exif-tag.c:515
 msgid "Exif Version"
-msgstr ""
+msgstr "Вер�і� Exif"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "Підтримувана вер�і� цього �тандарту. Якщо у цьому полі не вказано значенн�, вважатиметь��, що дані не відповідають �тандарту."
 
 #: libexif/exif-tag.c:520
 msgid "Date and Time (Original)"
-msgstr ""
+msgstr "Дата і ча� (зніманн�)"
 
 #: libexif/exif-tag.c:521
-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 ""
+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 "Дата і ча�, коли було �творено початкове зображенн�. Дл� цифрових фотоапаратів дата і ча� запи�у цифрових даних."
 
 #: libexif/exif-tag.c:526
 msgid "Date and Time (Digitized)"
-msgstr ""
+msgstr "Дата і ча� (оцифровуванн�)"
 
 #: libexif/exif-tag.c:527
 msgid "The date and time when the image was stored as digital data."
-msgstr ""
+msgstr "Дата і ча�, коли зображенн� було збережено у форматі цифрових даних."
 
 #: libexif/exif-tag.c:530
 msgid "Components Configuration"
-msgstr ""
+msgstr "�алаштуванн� компонентів"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
+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 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."
+msgstr "Відомо�ті, �пецифічні дл� �ти�нених даних. Канали кожного з компонентів упор�дковують�� від першого компонента до четвертого. Дл� не�ти�нених даних упор�дкуванн� даних визначаєть�� міткою <PhotometricInterpretation>. Втім, о�кільки <PhotometricInterpretation> може визначати лише пор�док Y, Cb і Cr, ц� мітка потрібна дл� випадків, коли у �ти�нених даних викори�товують�� компоненти, відмінні від Y, Cb і Cr, а також дл� уможливленн� підтримки інших по�лідовно�тей компонентів."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
-msgstr ""
+msgstr "Кількі�ть �ти�нених бітів на пік�ель"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Відомо�ті, �пецифічні дл� �ти�нених даних. Режим �ти�ненн�, �кий викори�тано дл� �ти�канн� зображенн�, визначаєть�� у бітах на пік�ель."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Швидкі�ть затвору"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Швидкі�ть затвору. Одиницею є значенн� параметра APEX (Additive System of Photographic Exposure або адитивної �и�теми ек�понуванн� фотографій)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
-msgstr ""
+msgstr "Діафрагма об’єктива. Одиницею є значенн� APEX."
 
 #: libexif/exif-tag.c:553
 msgid "Brightness"
 msgstr "Я�краві�ть"
 
 #: libexif/exif-tag.c:554
-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 ""
+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 "Значенн� ��краво�ті. Одиницею є значенн� APEX. Зазвичай, визначаєть�� у діапазоні від -99.99 до 99.99."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
 msgstr "Ухил ек�позиції"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "Ухил ек�позиції. Одиниц�ми є значенн� APEX. Зазвичай, визначаєть�� у діапазоні від -99.99 до 99.99."
 
 #: libexif/exif-tag.c:562
 msgid "Maximum Aperture Value"
-msgstr ""
+msgstr "Мак�имальне значенн� діафрагми"
 
 #: libexif/exif-tag.c:563
-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 ""
+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 "�айменше значенн� F об'єктива. Одиницею є значенн� APEX. Зазвичай, задаєть�� у діапазоні від 00.00 до 99.99, але не обмежуєть�� цим діапазоном."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
@@ -3398,11 +3143,11 @@ msgstr "Від�тань до об’єкта"
 
 #: libexif/exif-tag.c:569
 msgid "The distance to the subject, given in meters."
-msgstr ""
+msgstr "Від�тань до об’єкта, вказана у метрах."
 
 #: libexif/exif-tag.c:572
 msgid "The metering mode."
-msgstr ""
+msgstr "Режим вимірюванн�."
 
 #: libexif/exif-tag.c:574
 msgid "Light Source"
@@ -3410,298 +3155,207 @@ msgstr "Джерело �вітла"
 
 #: libexif/exif-tag.c:575
 msgid "The kind of light source."
-msgstr ""
+msgstr "Тип джерела �вітла."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
-msgstr ""
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
+msgstr "Ц� мітка запи�уєть��, �кщо знімок �творюєть�� за допомогою �тробо�копічного �вітла (�палаху)."
 
 #: libexif/exif-tag.c:582
-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 ""
+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 "Справжн� фокальна від�тань об’єктива у мм. Перетворенн� до фокальної від�тані 35-мм плівкової фотокамери не виконуєть��."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr "Площа об'єкту"
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
-msgstr ""
+msgid "This tag indicates the location and area of the main subject in the overall scene."
+msgstr "Ц� мітка визначає розташуванн� і обла�ть о�новного об’єкта у�ієї �цени."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
-msgstr ""
+msgstr "Стандартний ідентифікатор TIFF/EP"
 
 #: libexif/exif-tag.c:591
 msgid "Maker Note"
-msgstr ""
+msgstr "�отатка виробника"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Мітка дл� виробників за�обів запи�у Exif дл� запи�у будь-�кої бажаної інформації. Вмі�т мітки визначаєть�� виробником."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
-msgstr ""
+msgstr "Коментар кори�тувача"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "Мітка дл� запи�у кори�тувачами Exif ключових �лів або коментарів щодо зображенн�, окрім тих, �кі запи�ано у <ImageDescription>, і без обмежень на кодуванн� �имволів мітки <ImageDescription>. Кодуванн� �имволів, викори�тане у мітці <UserComment>, визначаєть�� на о�нові коду ідентифікатора у фік�ованій 8-байтовій обла�ті на початку обла�ті даних мітки. �евикори�тану ча�тину обла�ті заповнюють �имволом NULL («00.h»). Коди ідентифікаторів надають�� у результаті реє�трації. Спо�іб призначенн� та довідкові дані щодо кожного кодуванн� �имволів визначають�� у �пецифікації. Значенн� CountN визначаєть�� на о�нові 8 байтів у обла�ті кодуванн� �имволів і кілько�ті байтів у ча�тині коментар� кори�тувача. О�кільки TYPE не �кладаєть�� з �имволів ASCII, немає потреби у завершенні мітки �имволом NULL. Кодом ідентифікатора дл� обла�ті <UserComment> може бути визначений код, зокрема JIS або ASCII, або значенн� Undefined. �евизначена назва належить до типу UndefinedText, а код ідентифікатора заповнюєть�� 8 байтами NULL («00.H»). У за�обі читанн� Exif, �кий читає мітку <UserComment> має бути функці� дл� визначенн� коду ідентифікатора. �а�вні�ть цієї функції не є обов'�зковою у за�обах читанн� Exif, �кі не викори�товують мітку <UserComment>. Якщо обла�ть <UserComment> не визначаєть�� окремо, рекомендовано викори�товувати код ідентифікатора ASCII і заповнювати ча�тину коментар� кори�тувача �имволом пробілу [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
-msgstr ""
+msgstr "Ча� ча�ток �екунди"
 
 #: libexif/exif-tag.c:620
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
-msgstr ""
+msgstr "Ц� мітка викори�товуєть�� дл� запи�уванн� ча�ток �екунд дл� мітки <DateTime>."
 
 #: libexif/exif-tag.c:624
 msgid "Sub-second Time (Original)"
-msgstr ""
+msgstr "Ча� ча�ток �екунди (початковий)"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
-msgstr ""
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr "Ц� мітка викори�товуєть�� дл� запи�уванн� ча�ток �екунд дл� мітки <DateTimeOriginal>."
 
 #: libexif/exif-tag.c:629
 msgid "Sub-second Time (Digitized)"
-msgstr ""
+msgstr "Дробові ча�тки �екунд ча�у (оцифровуванн�)"
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
-msgstr ""
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr "Ц� мітка викори�товуєть�� дл� запи�уванн� ча�ток �екунд дл� мітки <DateTimeDigitized>."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
-msgstr ""
+msgstr "Заголовок XP"
 
 #: libexif/exif-tag.c:635
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
-msgstr ""
+msgstr "Р�док �имволів, що мі�тить заголовок зображенн� у кодуванні UTF-16LE."
 
 #: libexif/exif-tag.c:639
 msgid "XP Comment"
-msgstr ""
+msgstr "Коментар XP"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
-msgstr ""
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
+msgstr "Р�док �имволів, що мі�тить коментар щодо зображенн�, закодований у UTF-16LE."
 
 #: libexif/exif-tag.c:644
 msgid "XP Author"
-msgstr ""
+msgstr "�втор XP"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
-msgstr ""
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
+msgstr "Р�док �имволів, що мі�тить ім’� творц� зображенн�, закодований у UTF-16LE."
 
 #: libexif/exif-tag.c:649
 msgid "XP Keywords"
-msgstr ""
+msgstr "Ключові �лова XP"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr ""
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "Р�док �имволів, що мі�тить ключові �лова дл� опи�у зображенн�, закодований у UTF-16LE."
 
 #: libexif/exif-tag.c:654
 msgid "XP Subject"
-msgstr ""
+msgstr "Об’єкт XP"
 
 #: libexif/exif-tag.c:655
 msgid "A character string giving the image subject, encoded in UTF-16LE."
-msgstr ""
+msgstr "Р�док �имволів, що мі�тить дані щодо об’єкта зображенн�, у кодуванні UTF-16LE."
 
 #: libexif/exif-tag.c:659
 msgid "The FlashPix format version supported by a FPXR file."
-msgstr ""
+msgstr "Вер�і� форматуванн� FlashPix, підтримувана файлом FPXR."
 
 #: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "Про�тір кольорів"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "Мітка відомо�тей щодо про�тору кольорів завжди запи�уєть�� �к �пецифікатор про�тору кольорів. Зазвичай, дл� визначенн� про�тору кольорів на о�нові умов щодо монітора пер�онального комп'ютера і �ередовищі викори�товуєть�� sRGB (=1). Якщо викори�товуєть�� про�тір кольорів, відмінний від sRGB, в�тановлюєть�� значенн� Uncalibrated (=FFFF.H). Дані зображенн�, запи�аного �к Uncalibrated, можуть вважати�� даними sRGB при перетворенні до FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
-msgstr ""
+msgstr "Розмірні�ть у пік�ел�х за X"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Специфічні дл� �ти�канн� відомо�ті. Якщо запи�уєть�� файл зі �ти�неними даними, до цієї мітки має бути запи�ано коректну ширину змі�товного зображенн�, незалежно від того, чи є фа�ка і позначка перезапу�ку. У не�ти�нених файлах цієї мітки не повинно бути."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
-msgstr ""
+msgstr "Розмірні�ть у пік�ел�х за Y"
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
+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, 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."
+msgstr "Відомо�ті, �пецифічні дл� �ти�нених даних. При запи�і �ти�неного файла до цієї мітки має бути запи�ано коректну ви�оту змі�товної ча�тини зображенн�, незалежно від на�вно�ті фа�ки або позначки перезапу�ку. У не�ти�неному файлі цієї мітки не повинно бути. О�кільки у вертикальному напр�мку фа�ка є непотрібною, кількі�ть р�дків, запи�ана у цій мітці коректної ви�оти зображенн�, фактично дорівнює значенню, запи�аному у SOF."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
-msgstr ""
+msgstr "Пов’�заний звуковий файл"
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Ц� мітка викори�товуєть�� дл� запи�уванн� назви файла звукових даних, пов'�заних із даними зображенн�. Єдиними даними у цій мітці є назва файла звукових даних Exif і �уфік� назви (р�док ASCII, що �кладаєть�� із 8 �имволів + «.» + 3 �имволи). Шл�х до файла не запи�уєть��. Умови щодо звукових даних і назви файла визначають�� �пецифікацією. При викори�танні цієї мітки файли звукових даних має бути запи�ано відповідно до формату звукових даних Exif. За�оби запи�у можуть зберігати дані, зокрема звукові дані у APP2, �к дані розширеного потоку FlashPix. Прив'�зка файлів зображень Exif до файлів звукових даних виконуєть�� у будь-�кий з трьох �по�обів, [1], [2] або [3]. Якщо із одним файлом пов'�зано декілька файлів, у �по�іб [2] або [3], вказаний вище формат викори�товуєть�� дл� запи�у лише однієї назви файла звукових даних. Якщо файлів звукових даних декілька, вказують перший запи�аний файл. У випадку [3], наприклад, дл� файла зображенн� Exif «DSC00001.JPG» вказано лише «SND00001.WAV» �к пов'�заний файл звукових даних Exif. Якщо файлів звукових даних Exif три, «SND00001.WAV», «SND00002.WAV» та «SND00003.WAV», вказуєть�� назва файла зображенн� Exif дл� кожного з них, «DSC00001.JPG». Шл�хом поєднанн� даних щодо зв'�зків може бути забезпечено підтримку різних можливо�тей відтворенн�. Спо�іб викори�танн� відомо�тей щодо зв'�зків між файлами має бути визначено на боці за�обу відтворенн�. О�кільки ці дані зберігають�� у форматі р�дка ASCII, р�док �лід завершувати �имволом NULL. Якщо дл� прив'�зки файлів звукових даних викори�товуєть�� ц� мітка, зв'�зок звукового файла із файлом даних зображенн� має бути також вказано і у файлі звукових даних."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
-msgstr ""
+msgstr "Вказівник IFD �умі�но�ті"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "IFD �умі�но�ті �кладаєть�� з міток, �кі зберігають дані дл� забезпеченн� �умі�но�ті і на �кі вказує на�тупна мітка, розташована у IFD Exif. Структура �умі�но�ті IFD �умно�ті є такою �амою, що і визначена TIFF �труктура IFD, але вона не мі�тить даних зображенн�."
 
 #: libexif/exif-tag.c:729
 msgid "Flash Energy"
 msgstr "Енергі� �палаху"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Вказує на �тробо�копічну енергію у момент �творенн� зображенн�, вимір�ну у одиниц�х потужно�ті промен� (у канделах) на �екунду (BCPS)."
 
 #: libexif/exif-tag.c:734
 msgid "Spatial Frequency Response"
-msgstr ""
+msgstr "Відповідь щодо про�торових ча�тот"
 
 #: libexif/exif-tag.c:735
-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 ""
+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 "У цій мітці зберігаєть�� про�торова таблиц� ча�тот і значенн� SFR фотоапарата або при�трою отриманн� зображенн� у напр�мку ширини зображенн�, ви�оти зображенн� та діагональному напр�мку, �к вказано в ISO 12233."
 
 #: libexif/exif-tag.c:741
 msgid "Focal Plane X-Resolution"
 msgstr "Роздільна здатні�ть фокальної площини X"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Вказує на кількі�ть пік�елів у напр�мку ширини зображенн� (X) на <FocalPlaneResolutionUnit> у фокальній площині фотоапарата."
 
 #: libexif/exif-tag.c:746
 msgid "Focal Plane Y-Resolution"
 msgstr "Роздільна здатні�ть фокальної площини Y"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Вказує на кількі�ть пік�елів у напр�мку ви�оти зображенн� (V) на <FocalPlaneResolutionUnit> у фокальній площині фотоапарата."
 
 #: libexif/exif-tag.c:751
 msgid "Focal Plane Resolution Unit"
 msgstr "Одиниц� роздільно�ті у фокальній площині"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Вказує на одиницю виміру <FocalPlaneXResolution> і <FocalPlaneYResolution>. Те �аме значенн�, що і <ResolutionUnit>."
 
 #: libexif/exif-tag.c:757
 msgid "Subject Location"
 msgstr "Знаходженн� об'єкта"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Вказує на розташуванн� о�новного об'єкта �цени. Значенн� цієї мітки відповідає пік�елю у центрі о�новного об'єкта відно�ного лівого краю, до обробки з обертанн�м, вказаним за допомогою мітки <Rotation>. Перше значенн� вказує номер �товпчика за X, а друге вказує на номер р�дка за Y."
 
 #: libexif/exif-tag.c:765
 msgid "Exposure Index"
 msgstr "Показник ек�позиції"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
-msgstr ""
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Вказує на індек� ек�позиції, вибраний на фотоапараті або при�трої введенн� даних під ча� �творенн� зображенн�."
 
 #: libexif/exif-tag.c:769
 msgid "Sensing Method"
@@ -3709,82 +3363,63 @@ msgstr "Метод розпізнаванн�"
 
 #: libexif/exif-tag.c:770
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr ""
+msgstr "Визначає тип датчика зображенн� на фотоапараті або при�трої вхідних даних."
 
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
-msgstr ""
+msgstr "Файлове джерело"
 
 #: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Вказує на джерело зображенн�. Якщо зображенн� було запи�ано цифровим дзеркальним фотоапаратом, значенн�м цієї мітки завжди буде 3, значенн�, �ке означає викори�танн� цифрового дзеркального фотоапарата."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
-msgstr ""
+msgstr "Тип �цени"
 
 #: libexif/exif-tag.c:779
-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 ""
+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 "Вказує на тип �цени. Якщо зображенн� запи�ано цифровим дзеркальним фотоапаратом, значенн� цієї мітки має завжди бути в�тановлено у 1, що означає, що зображенн� було зн�то безпо�ередньо."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
 msgstr "�етипове перетворено"
 
 #: libexif/exif-tag.c:790
-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 ""
+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 "Ц� мітка вказує на викори�танн� �пеціальної обробки даних зображенн�, зокрема обробки дл� при�то�овуванн� до при�трою виведенн�. Якщо виконуєть�� �пеціальна обробка, вважаєть��, що за�іб читанн� має вимкнути або мінімізувати будь-�ку подальшу обробку."
 
 #: libexif/exif-tag.c:796
-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 ""
+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 "Ц� мітка вказує на режим ек�понуванн�, �кий було в�тановлено під ча� �творенн� зображенн�. У режимі автозлитт� ек�позицій фотоапарат знімає по�лідовні�ть кадрів тієї �амої �цени із різними параметрами ек�понуванн�."
 
 #: libexif/exif-tag.c:801
 msgid "This tag indicates the white balance mode set when the image was shot."
-msgstr ""
+msgstr "Ц� мітка визначає режим балан�у білого кольору, в�тановлений під ча� зніманн�."
 
 #: libexif/exif-tag.c:805
 msgid "Digital Zoom Ratio"
 msgstr "Коефіцієнт цифрового збільшенн�"
 
 #: libexif/exif-tag.c:806
-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 ""
+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 "Ц� мітка мі�тить дані щодо коефіцієнта цифрового ма�штабуванн�, �ке було викори�тано під ча� зйомки. Якщо чи�ельником запи�аного значенн� є 0, вважаєть��, що цифрове ма�штабуванн� не було за�то�овано."
 
 #: libexif/exif-tag.c:811
 msgid "Focal Length in 35mm Film"
 msgstr "Фокальна довжина дл� 35 мм плівки"
 
 #: libexif/exif-tag.c:812
-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 ""
+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 "Ц� мітка визначає еквівалентну фокальну від�тань дл� 35мм-плівкового фотоапарата, у мм. Значенн� 0 означає, що фокальна від�тань є невідомою. Зауважте, що ц� мітка відрізн�єть�� від мітки FocalLength."
 
 #: libexif/exif-tag.c:818
 msgid "Scene Capture Type"
-msgstr "Тип �цени"
+msgstr "Тип захопленн� �цени"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
+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 scene type <SceneType> tag."
+msgstr "Ц� мітка вказує на тип �цени, �ку було зн�то. �ею також можна �кори�тати�� дл� запи�уванн� режиму, у �кому було виконано зйомку. Зауважте, що це значенн� відрізн�єть�� від типу �цени у мітці <SceneType>."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
@@ -3792,36 +3427,27 @@ msgstr "Регул�тор по�иленн�"
 
 #: libexif/exif-tag.c:825
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr ""
+msgstr "Ц� мітка визначає �тепінь загального коригуванн� рівн� зображенн�."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Ц� мітка вказує на напр�м обробки контра�тно�ті, за�то�ований фотоапаратом під ча� зніманн�."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Ц� мітка вказує на напр�м обробки на�ичено�ті, за�то�ований фотоапаратом під ча� зніманн�."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Ц� мітка вказує на напр�м обробки різко�ті, за�то�ований фотоапаратом під ча� зніманн�."
 
 #: libexif/exif-tag.c:841
 msgid "Device Setting Description"
-msgstr ""
+msgstr "Опи� параметрів при�трою"
 
 #: libexif/exif-tag.c:842
-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 ""
+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 "Ц� мітка вказує на відомо�ті щодо умов зніманн� зображенн� певною моделлю фотоапарата. Мітка викори�товуєть�� дл� зберіганн� даних щодо умов зйомки дл� за�обу читанн�."
 
 #: libexif/exif-tag.c:848
 msgid "Subject Distance Range"
@@ -3829,18 +3455,15 @@ msgstr "Діапазон від�тані до об’єкта"
 
 #: libexif/exif-tag.c:849
 msgid "This tag indicates the distance to the subject."
-msgstr ""
+msgstr "Цей теґ мі�тить дані щодо від�тані до об’єкта зйомки."
 
 #: libexif/exif-tag.c:851
 msgid "Image Unique ID"
-msgstr ""
+msgstr "Унікальний ідентифікатор зображенн�"
 
 #: libexif/exif-tag.c:852
-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 ""
+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 "Ц� мітка мі�тить унікальний ідентифікатор, �кий надаєть�� кожному окремому зображенню. Вмі�т запи�уєть�� у форматі р�дка �имволів ASCII, еквівалентного ші�тнадц�тковому позначенню, і має фік�овану довжину у 128 бітів."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
@@ -3848,48 +3471,44 @@ msgstr "Гама"
 
 #: libexif/exif-tag.c:858
 msgid "Indicates the value of coefficient gamma."
-msgstr ""
+msgstr "Показує значенн� коефіцієнта гамма."
 
 #: libexif/exif-tag.c:860
 msgid "PRINT Image Matching"
-msgstr ""
+msgstr "PRINT Image Matching"
 
 #: libexif/exif-tag.c:861
 msgid "Related to Epson's PRINT Image Matching technology"
-msgstr ""
+msgstr "Пов’�зано із технологією PRINT Image Matching компанії Epson"
 
 #: libexif/exif-tag.c:863
 msgid "Padding"
 msgstr "Заповненн�"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Ц� мітка резервує мі�це, �ке згодом може бути викори�тано дл� додаванн� додаткових метаданих. �ові метадані може бути запи�ано на мі�це цієї мітки з викори�танн�м лише ча�тки отриманого об'єму даних і резервуванн�м решти мі�ц� дл� зберіганн� нових або розширених міток метаданих."
 
 #: libexif/fuji/mnote-fuji-entry.c:62
 msgid "Softest"
-msgstr ""
+msgstr "�айм’�кший"
 
 #: libexif/fuji/mnote-fuji-entry.c:66
 msgid "Hardest"
-msgstr ""
+msgstr "�айжор�ткіший"
 
 #: libexif/fuji/mnote-fuji-entry.c:67 libexif/fuji/mnote-fuji-entry.c:96
 msgid "Medium soft"
-msgstr ""
+msgstr "Помірно м’�кий"
 
 #: libexif/fuji/mnote-fuji-entry.c:68 libexif/fuji/mnote-fuji-entry.c:94
 msgid "Medium hard"
-msgstr ""
+msgstr "Помірно жор�ткий"
 
 #: libexif/fuji/mnote-fuji-entry.c:69 libexif/fuji/mnote-fuji-entry.c:90
 #: libexif/fuji/mnote-fuji-entry.c:98 libexif/fuji/mnote-fuji-entry.c:182
 msgid "Film simulation mode"
-msgstr ""
+msgstr "Режим імітації плівки"
 
 #: libexif/fuji/mnote-fuji-entry.c:79
 msgid "Incandescent"
@@ -3910,15 +3529,15 @@ msgstr "Оригінал"
 #: libexif/fuji/mnote-fuji-entry.c:124 libexif/pentax/mnote-pentax-entry.c:164
 #: libexif/pentax/mnote-pentax-entry.c:299
 msgid "Program AE"
-msgstr ""
+msgstr "Програмне автоек�понуванн�"
 
 #: libexif/fuji/mnote-fuji-entry.c:125
 msgid "Natural photo"
-msgstr ""
+msgstr "Звичайна фотографі�"
 
 #: libexif/fuji/mnote-fuji-entry.c:126
 msgid "Vibration reduction"
-msgstr ""
+msgstr "У�уванн� тремтінн�"
 
 #: libexif/fuji/mnote-fuji-entry.c:127
 msgid "Sunset"
@@ -3942,27 +3561,27 @@ msgstr "Тек�т"
 
 #: libexif/fuji/mnote-fuji-entry.c:132
 msgid "NP & flash"
-msgstr ""
+msgstr "NP і �палах"
 
 #: libexif/fuji/mnote-fuji-entry.c:137
 msgid "Aperture priority AE"
-msgstr ""
+msgstr "AE-пріоритет діафрагми"
 
 #: libexif/fuji/mnote-fuji-entry.c:138
 msgid "Shutter priority AE"
-msgstr ""
+msgstr "AE-пріоритет затвору"
 
 #: libexif/fuji/mnote-fuji-entry.c:146
 msgid "F-Standard"
-msgstr ""
+msgstr "F-�тандартний"
 
 #: libexif/fuji/mnote-fuji-entry.c:147
 msgid "F-Chrome"
-msgstr ""
+msgstr "F-гама"
 
 #: libexif/fuji/mnote-fuji-entry.c:148
 msgid "F-B&W"
-msgstr ""
+msgstr "F-B&W"
 
 #: libexif/fuji/mnote-fuji-entry.c:151
 msgid "No blur"
@@ -3970,11 +3589,11 @@ msgstr "Без розмиванн�"
 
 #: libexif/fuji/mnote-fuji-entry.c:152
 msgid "Blur warning"
-msgstr ""
+msgstr "Попередженн� щодо розмито�ті"
 
 #: libexif/fuji/mnote-fuji-entry.c:155
 msgid "Focus good"
-msgstr ""
+msgstr "Добре фоку�уванн�"
 
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
@@ -3982,11 +3601,11 @@ msgstr "Поза фоку�ом"
 
 #: libexif/fuji/mnote-fuji-entry.c:159
 msgid "AE good"
-msgstr ""
+msgstr "Добре автоек�понуванн�"
 
 #: libexif/fuji/mnote-fuji-entry.c:160
 msgid "Over exposed"
-msgstr ""
+msgstr "Переек�поноване"
 
 #: libexif/fuji/mnote-fuji-entry.c:164
 msgid "Wide"
@@ -3994,35 +3613,35 @@ msgstr "Широкий"
 
 #: libexif/fuji/mnote-fuji-entry.c:167
 msgid "F0/Standard"
-msgstr ""
+msgstr "F0/Стандартний"
 
 #: libexif/fuji/mnote-fuji-entry.c:168
 msgid "F1/Studio portrait"
-msgstr ""
+msgstr "F1/Студійний портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:169
 msgid "F1a/Professional portrait"
-msgstr ""
+msgstr "F1a/Профе�ійний портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:170
 msgid "F1b/Professional portrait"
-msgstr ""
+msgstr "F1b/Профе�ійний портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:171
 msgid "F1c/Professional portrait"
-msgstr ""
+msgstr "F1c/Профе�ійний портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:172
 msgid "F2/Fujichrome"
-msgstr ""
+msgstr "F2/Fujichrome"
 
 #: libexif/fuji/mnote-fuji-entry.c:173
 msgid "F3/Studio portrait Ex"
-msgstr ""
+msgstr "F3/Розширений �тудійний портрет"
 
 #: libexif/fuji/mnote-fuji-entry.c:174
 msgid "F4/Velvia"
-msgstr ""
+msgstr "F4/Velvia"
 
 #: libexif/fuji/mnote-fuji-entry.c:177
 msgid "Auto (100-400%)"
@@ -4049,99 +3668,99 @@ msgstr "%2.2f мм"
 #: libexif/pentax/mnote-pentax-entry.c:451
 #, c-format
 msgid "%i bytes unknown data"
-msgstr ""
+msgstr "%i байтів невідомих даних"
 
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
-msgstr ""
+msgstr "Вер�і� нотаток виробника"
 
 #: libexif/fuji/mnote-fuji-tag.c:37
 msgid "This number is unique and based on the date of manufacture."
-msgstr ""
+msgstr "Цей номер є унікальним, за�нованим на даті виробленн�."
 
 #: libexif/fuji/mnote-fuji-tag.c:41
 msgid "Chromaticity Saturation"
-msgstr ""
+msgstr "Хроматична на�ичені�ть"
 
 #: libexif/fuji/mnote-fuji-tag.c:44
 msgid "Flash Firing Strength Compensation"
-msgstr ""
+msgstr "Компен�аці� потужно�ті запаленн� �палаху"
 
 #: libexif/fuji/mnote-fuji-tag.c:46
 msgid "Focusing Mode"
-msgstr ""
+msgstr "Режим фоку�уванн�"
 
 #: libexif/fuji/mnote-fuji-tag.c:47
 msgid "Focus Point"
-msgstr ""
+msgstr "Точка фоку�уванн�"
 
 #: libexif/fuji/mnote-fuji-tag.c:48
 msgid "Slow Synchro Mode"
-msgstr ""
+msgstr "Режим повільної �инхронізації"
 
 #: libexif/fuji/mnote-fuji-tag.c:49 libexif/pentax/mnote-pentax-tag.c:72
 msgid "Picture Mode"
-msgstr ""
+msgstr "Режим зображенн�"
 
 #: libexif/fuji/mnote-fuji-tag.c:50
 msgid "Continuous Taking"
-msgstr ""
+msgstr "�еперервне зніманн�"
 
 #: libexif/fuji/mnote-fuji-tag.c:51
 msgid "Continuous Sequence Number"
-msgstr ""
+msgstr "�омер у неперервній по�лідовно�ті"
 
 #: libexif/fuji/mnote-fuji-tag.c:52
 msgid "FinePix Color"
-msgstr ""
+msgstr "Колір FinePix"
 
 #: libexif/fuji/mnote-fuji-tag.c:53
 msgid "Blur Check"
-msgstr ""
+msgstr "Перевірка розмиванн�"
 
 #: libexif/fuji/mnote-fuji-tag.c:54
 msgid "Auto Focus Check"
-msgstr ""
+msgstr "Перевірка автофоку�уванн�"
 
 #: libexif/fuji/mnote-fuji-tag.c:55
 msgid "Auto Exposure Check"
-msgstr ""
+msgstr "Перевірка автоек�понуванн�"
 
 #: libexif/fuji/mnote-fuji-tag.c:56
 msgid "Dynamic Range"
-msgstr ""
+msgstr "Динамічний діапазон"
 
 #: libexif/fuji/mnote-fuji-tag.c:57
 msgid "Film Simulation Mode"
-msgstr ""
+msgstr "Режим імітації плівки"
 
 #: libexif/fuji/mnote-fuji-tag.c:58
 msgid "Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Режим широкого динамічного діапазону"
 
 #: libexif/fuji/mnote-fuji-tag.c:59
 msgid "Development Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Режим про�вленн� з широким динамічним діапазоном"
 
 #: libexif/fuji/mnote-fuji-tag.c:60
 msgid "Minimum Focal Length"
-msgstr ""
+msgstr "Мінімальна фоку�на від�тань"
 
 #: libexif/fuji/mnote-fuji-tag.c:61
 msgid "Maximum Focal Length"
-msgstr ""
+msgstr "Мак�имальна фоку�на від�тань"
 
 #: libexif/fuji/mnote-fuji-tag.c:62
 msgid "Maximum Aperture at Minimum Focal"
-msgstr ""
+msgstr "Мак�. діафрагма при мін. фоку�ній від�тані"
 
 #: libexif/fuji/mnote-fuji-tag.c:63
 msgid "Maximum Aperture at Maximum Focal"
-msgstr ""
+msgstr "Мак�. діафрагма при мак�. фоку�ній від�тані"
 
 #: libexif/fuji/mnote-fuji-tag.c:65
 msgid "Order Number"
-msgstr ""
+msgstr "Пор�дковий номер"
 
 #: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
 msgid "Frame Number"
@@ -4150,75 +3769,75 @@ msgstr "Кількі�ть кадрів"
 #: libexif/olympus/mnote-olympus-entry.c:49
 #, c-format
 msgid "Invalid format '%s', expected '%s' or '%s'."
-msgstr ""
+msgstr "�екоректний формат «%s», мало бути «%s» або «%s»."
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF non D lens"
-msgstr ""
+msgstr "Об'єктив із AF без D"
 
 #: libexif/olympus/mnote-olympus-entry.c:94
 msgid "AF-D or AF-S lens"
-msgstr ""
+msgstr "Об'єктив AF-D або AF-S"
 
 #: libexif/olympus/mnote-olympus-entry.c:95
 msgid "AF-D G lens"
-msgstr ""
+msgstr "Об'єктив AF-D G"
 
 #: libexif/olympus/mnote-olympus-entry.c:96
 msgid "AF-D VR lens"
-msgstr ""
+msgstr "Об'єктив AF-D VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "AF-D G VR lens"
-msgstr ""
+msgstr "Об'єктив AF-D G VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:101
 msgid "Flash unit unknown"
-msgstr ""
+msgstr "�евідомий модуль �палаху"
 
 #: libexif/olympus/mnote-olympus-entry.c:102
 msgid "Flash is external"
-msgstr ""
+msgstr "Спалах є зовнішнім"
 
 #: libexif/olympus/mnote-olympus-entry.c:103
 msgid "Flash is on camera"
-msgstr ""
+msgstr "Спалах вбудовано до фотоапарата"
 
 #: libexif/olympus/mnote-olympus-entry.c:106
 msgid "VGA basic"
-msgstr ""
+msgstr "VGA, базова"
 
 #: libexif/olympus/mnote-olympus-entry.c:107
 msgid "VGA normal"
-msgstr ""
+msgstr "VGA, звичайна"
 
 #: libexif/olympus/mnote-olympus-entry.c:108
 msgid "VGA fine"
-msgstr ""
+msgstr "VGA, �кі�на"
 
 #: libexif/olympus/mnote-olympus-entry.c:109
 msgid "SXGA basic"
-msgstr ""
+msgstr "SXGA, базова"
 
 #: libexif/olympus/mnote-olympus-entry.c:110
 msgid "SXGA normal"
-msgstr ""
+msgstr "SXGA, звичайна"
 
 #: libexif/olympus/mnote-olympus-entry.c:111
 msgid "SXGA fine"
-msgstr ""
+msgstr "SXGA, �кі�на"
 
 #: libexif/olympus/mnote-olympus-entry.c:112
 msgid "2 Mpixel basic"
-msgstr ""
+msgstr "2-мегапік�ельне, базова"
 
 #: libexif/olympus/mnote-olympus-entry.c:113
 msgid "2 Mpixel normal"
-msgstr ""
+msgstr "2-мегапік�ельне, звичайна"
 
 #: libexif/olympus/mnote-olympus-entry.c:114
 msgid "2 Mpixel fine"
-msgstr ""
+msgstr "2-мегапік�ельне, �кі�не"
 
 #: libexif/olympus/mnote-olympus-entry.c:117
 msgid "Color"
@@ -4263,7 +3882,7 @@ msgstr "Шаблон"
 
 #: libexif/olympus/mnote-olympus-entry.c:137
 msgid "Incandescence"
-msgstr ""
+msgstr "Лампа розжарюванн�"
 
 #: libexif/olympus/mnote-olympus-entry.c:138
 msgid "Fluorescence"
@@ -4271,107 +3890,107 @@ msgstr "Свіченн�"
 
 #: libexif/olympus/mnote-olympus-entry.c:140
 msgid "SpeedLight"
-msgstr ""
+msgstr "SpeedLight"
 
 #: libexif/olympus/mnote-olympus-entry.c:143
 msgid "No fisheye"
-msgstr ""
+msgstr "Без «риб'�чого ока»"
 
 #: libexif/olympus/mnote-olympus-entry.c:144
 msgid "Fisheye on"
-msgstr ""
+msgstr "Із «риб'�чим оком»"
 
 #: libexif/olympus/mnote-olympus-entry.c:147
 msgid "Normal, SQ"
-msgstr ""
+msgstr "Звичайне, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:148
 msgid "Normal, HQ"
-msgstr ""
+msgstr "Звичайне, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:149
 msgid "Normal, SHQ"
-msgstr ""
+msgstr "Звичайне, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:150
 msgid "Normal, RAW"
-msgstr ""
+msgstr "Звичайне, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:151
 msgid "Normal, SQ1"
-msgstr ""
+msgstr "Звичайне, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:152
 msgid "Normal, SQ2"
-msgstr ""
+msgstr "Звичайне, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:153
 msgid "Normal, super high"
-msgstr ""
+msgstr "Звичайне, надви�оке"
 
 #: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Normal, standard"
-msgstr ""
+msgstr "Звичайне, �тандартне"
 
 #: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, SQ"
-msgstr ""
+msgstr "Які�не, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, HQ"
-msgstr ""
+msgstr "Які�не, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SHQ"
-msgstr ""
+msgstr "Які�не, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, RAW"
-msgstr ""
+msgstr "Які�не, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Fine, SQ1"
-msgstr ""
+msgstr "Які�не, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Fine, SQ2"
-msgstr ""
+msgstr "Які�не, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Fine, super high"
-msgstr ""
+msgstr "Які�не, надви�оке"
 
 #: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, SQ"
-msgstr ""
+msgstr "Дуже �кі�не, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, HQ"
-msgstr ""
+msgstr "Дуже �кі�не, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SHQ"
-msgstr ""
+msgstr "Дуже �кі�не, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, RAW"
-msgstr ""
+msgstr "Дуже �кі�не, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, SQ1"
-msgstr ""
+msgstr "Дуже �кі�не, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:167
 msgid "Super fine, SQ2"
-msgstr ""
+msgstr "Дуже �кі�не, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:168
 msgid "Super fine, super high"
-msgstr ""
+msgstr "Дуже �кі�не, надви�оке"
 
 #: libexif/olympus/mnote-olympus-entry.c:169
 msgid "Super fine, high"
-msgstr ""
+msgstr "Дуже �кі�не, ви�оке"
 
 #: libexif/olympus/mnote-olympus-entry.c:172
 #: libexif/olympus/mnote-olympus-entry.c:177
@@ -4383,7 +4002,7 @@ msgstr "�і"
 
 #: libexif/olympus/mnote-olympus-entry.c:183
 msgid "On (Preset)"
-msgstr ""
+msgstr "Увімкнено (шаблон)"
 
 #: libexif/olympus/mnote-olympus-entry.c:188
 msgid "Fill"
@@ -4391,7 +4010,7 @@ msgstr "Заповнити"
 
 #: libexif/olympus/mnote-olympus-entry.c:195
 msgid "Internal + external"
-msgstr ""
+msgstr "Внутрішнє+зовнішнє"
 
 #: libexif/olympus/mnote-olympus-entry.c:224
 msgid "Interlaced"
@@ -4409,23 +4028,23 @@ msgstr "�айкраща"
 
 #: libexif/olympus/mnote-olympus-entry.c:232
 msgid "Adjust exposure"
-msgstr ""
+msgstr "Коригуванн� ек�позиції"
 
 #: libexif/olympus/mnote-olympus-entry.c:235
 msgid "Spot focus"
-msgstr ""
+msgstr "Фоку�уванн� за пл�мами"
 
 #: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Normal focus"
-msgstr ""
+msgstr "Звичайне фоку�уванн�"
 
 #: libexif/olympus/mnote-olympus-entry.c:239
 msgid "Record while down"
-msgstr ""
+msgstr "Запи�увати, доки нати�нено"
 
 #: libexif/olympus/mnote-olympus-entry.c:240
 msgid "Press start, press stop"
-msgstr ""
+msgstr "�ати�ніть «�тарт», нати�ніть «�топ»"
 
 #: libexif/olympus/mnote-olympus-entry.c:248
 msgid "ISO 50"
@@ -4479,11 +4098,11 @@ msgstr "20 кадрів/�ек"
 #: libexif/olympus/mnote-olympus-entry.c:381
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
-msgstr ""
+msgstr "Виправленн� червоного: %f, виправленн� �инього: %f"
 
 #: libexif/olympus/mnote-olympus-entry.c:388
 msgid "No manual focus selection"
-msgstr ""
+msgstr "Без вибору фоку�уванн� вручну"
 
 #: libexif/olympus/mnote-olympus-entry.c:391
 #, c-format
@@ -4492,69 +4111,69 @@ msgstr "%2.2f метрів"
 
 #: libexif/olympus/mnote-olympus-entry.c:417
 msgid "AF position: center"
-msgstr ""
+msgstr "Позиці� �Ф: центр"
 
 #: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: top"
-msgstr ""
+msgstr "Позиці� �Ф: вгорі"
 
 #: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: bottom"
-msgstr ""
+msgstr "Позиці� �Ф: внизу"
 
 #: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: left"
-msgstr ""
+msgstr "Позиці� �Ф: ліворуч"
 
 #: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: right"
-msgstr ""
+msgstr "Позиці� �Ф: праворуч"
 
 #: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: upper-left"
-msgstr ""
+msgstr "Позиці� �Ф: вгорі ліворуч"
 
 #: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-right"
-msgstr ""
+msgstr "Позиці� �Ф: вгорі праворуч"
 
 #: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: lower-left"
-msgstr ""
+msgstr "Позиці� �Ф: внизу ліворуч"
 
 #: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-right"
-msgstr ""
+msgstr "Позиці� �Ф: внизу праворуч"
 
 #: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: far left"
-msgstr ""
+msgstr "Позиці� �Ф: далеко ліворуч"
 
 #: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far right"
-msgstr ""
+msgstr "Позиці� �Ф: далеко праворуч"
 
 #: libexif/olympus/mnote-olympus-entry.c:428
 msgid "Unknown AF position"
-msgstr ""
+msgstr "�евідома позиці� �Ф"
 
 #: libexif/olympus/mnote-olympus-entry.c:439
 #: libexif/olympus/mnote-olympus-entry.c:509
 #, c-format
 msgid "Internal error (unknown value %hi)"
-msgstr ""
+msgstr "Внутрішн� помилка (невідоме значенн� %hi)"
 
 #: libexif/olympus/mnote-olympus-entry.c:447
 #: libexif/olympus/mnote-olympus-entry.c:517
 #, c-format
 msgid "Unknown value %hi"
-msgstr ""
+msgstr "�евідоме значенн� %hi"
 
 #: libexif/olympus/mnote-olympus-entry.c:542
 #: libexif/olympus/mnote-olympus-entry.c:562
 #, c-format
 msgid "Unknown %hu"
-msgstr ""
+msgstr "�евідоме %hu"
 
 #: libexif/olympus/mnote-olympus-entry.c:559
 msgid "2 sec."
@@ -4571,15 +4190,15 @@ msgstr "�втоматично"
 #: libexif/olympus/mnote-olympus-entry.c:732
 #, c-format
 msgid "Manual: %liK"
-msgstr ""
+msgstr "Вручну: %liK"
 
 #: libexif/olympus/mnote-olympus-entry.c:735
 msgid "Manual: unknown"
-msgstr ""
+msgstr "Вручну: невідомо"
 
 #: libexif/olympus/mnote-olympus-entry.c:741
 msgid "One-touch"
-msgstr ""
+msgstr "Один дотик"
 
 #: libexif/olympus/mnote-olympus-entry.c:797
 #: libexif/olympus/mnote-olympus-entry.c:807
@@ -4589,7 +4208,7 @@ msgstr "�е�кінченний"
 #: libexif/olympus/mnote-olympus-entry.c:815
 #, c-format
 msgid "%i bytes unknown data: "
-msgstr ""
+msgstr "%i байтів невідомих даних: "
 
 #: libexif/olympus/mnote-olympus-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:53
@@ -4606,52 +4225,52 @@ msgstr "Збільшенн� різко�ті зображенн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:44
 msgid "Flash Setting"
-msgstr ""
+msgstr "Параметри �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
 msgid "White Balance Fine Adjustment"
-msgstr ""
+msgstr "Точне коригуванн� балан�у білого"
 
 #: libexif/olympus/mnote-olympus-tag.c:47
 msgid "White Balance RB"
-msgstr ""
+msgstr "RB балан�у білого"
 
 #: libexif/olympus/mnote-olympus-tag.c:49
 msgid "ISO Selection"
-msgstr ""
+msgstr "Вибір ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Preview Image IFD"
-msgstr ""
+msgstr "Зображенн� попереднього перегл�ду IFD"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Offset of the preview image directory (IFD) inside the file."
-msgstr ""
+msgstr "Від�туп каталогу зображень попереднього перегл�ду (IFD) у файлі."
 
 #: libexif/olympus/mnote-olympus-tag.c:51
 msgid "Exposurediff ?"
-msgstr ""
+msgstr "Exposurediff ?"
 
 #: libexif/olympus/mnote-olympus-tag.c:54
 msgid "Image Boundary"
-msgstr ""
+msgstr "Межа зображенн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:56
 msgid "Flash Exposure Bracket Value"
-msgstr ""
+msgstr "Значенн� вилки ек�позиції �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:57
 msgid "Exposure Bracket Value"
-msgstr ""
+msgstr "Значенн� вилки ек�позиції"
 
 #: libexif/olympus/mnote-olympus-tag.c:58
 #: libexif/olympus/mnote-olympus-tag.c:96
 msgid "Image Adjustment"
-msgstr ""
+msgstr "Коригуванн� зображенн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:59
 msgid "Tone Compensation"
-msgstr ""
+msgstr "Компен�аці� тону"
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
@@ -4665,7 +4284,7 @@ msgstr "Об’єктив"
 #: libexif/olympus/mnote-olympus-tag.c:135
 #: libexif/olympus/mnote-olympus-tag.c:185
 msgid "Manual Focus Distance"
-msgstr ""
+msgstr "Фоку�на від�тань вручну"
 
 #: libexif/olympus/mnote-olympus-tag.c:65
 msgid "Flash Used"
@@ -4673,19 +4292,19 @@ msgstr "Викори�тано �палах"
 
 #: libexif/olympus/mnote-olympus-tag.c:66
 msgid "AF Focus Position"
-msgstr ""
+msgstr "Позиці� фоку�уванн� дл� автофоку�уванн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:67
 msgid "Bracketing"
-msgstr ""
+msgstr "�втовилка"
 
 #: libexif/olympus/mnote-olympus-tag.c:69
 msgid "Lens F Stops"
-msgstr ""
+msgstr "Позиції фоку�уванн� об'єктива"
 
 #: libexif/olympus/mnote-olympus-tag.c:70
 msgid "Contrast Curve"
-msgstr ""
+msgstr "Крива контра�тно�ті"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
 #: libexif/olympus/mnote-olympus-tag.c:95
@@ -4695,7 +4314,7 @@ msgstr "Режим кольорів"
 
 #: libexif/olympus/mnote-olympus-tag.c:72
 msgid "Light Type"
-msgstr ""
+msgstr "Тип о�вітленн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:74
 msgid "Hue Adjustment"
@@ -4709,40 +4328,40 @@ msgstr "Вилученн� шумів"
 
 #: libexif/olympus/mnote-olympus-tag.c:79
 msgid "Sensor Pixel Size"
-msgstr ""
+msgstr "Розмір точки на датчику"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
 msgid "Image Data Size"
-msgstr ""
+msgstr "Розмір даних зображенн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
 msgid "Size of compressed image data in bytes."
-msgstr ""
+msgstr "Розмір �ти�нених даних зображенн� у байтах."
 
 #: libexif/olympus/mnote-olympus-tag.c:84
 msgid "Total Number of Pictures Taken"
-msgstr ""
+msgstr "Загальна кількі�ть зроблених знімків"
 
 #: libexif/olympus/mnote-olympus-tag.c:86
 msgid "Optimize Image"
-msgstr ""
+msgstr "Оптимізаці� зображенн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:88
 msgid "Vari Program"
-msgstr ""
+msgstr "Програма Vari"
 
 #: libexif/olympus/mnote-olympus-tag.c:89
 msgid "Capture Editor Data"
-msgstr ""
+msgstr "Дані редактора захопленн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:90
 msgid "Capture Editor Version"
-msgstr ""
+msgstr "Вер�і� редактора захопленн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:97
 #: libexif/olympus/mnote-olympus-tag.c:183
 msgid "CCD Sensitivity"
-msgstr ""
+msgstr "Чутливі�ть ПЗЗ"
 
 #: libexif/olympus/mnote-olympus-tag.c:99
 msgid "Focus"
@@ -4754,23 +4373,23 @@ msgstr "Перетворювач"
 
 #: libexif/olympus/mnote-olympus-tag.c:105
 msgid "Thumbnail Image"
-msgstr ""
+msgstr "Зображенн�-мініатюра"
 
 #: libexif/olympus/mnote-olympus-tag.c:106
 msgid "Speed/Sequence/Panorama Direction"
-msgstr ""
+msgstr "�апр�мок швидко�ті/по�лідовно�ті/панорами"
 
 #: libexif/olympus/mnote-olympus-tag.c:109
 msgid "Black & White Mode"
-msgstr ""
+msgstr "Чорно-білий режим"
 
 #: libexif/olympus/mnote-olympus-tag.c:111
 msgid "Focal Plane Diagonal"
-msgstr ""
+msgstr "Діагональ у фокальній площині"
 
 #: libexif/olympus/mnote-olympus-tag.c:112
 msgid "Lens Distortion Parameters"
-msgstr ""
+msgstr "Параметри викривленн� об’єктивом"
 
 #: libexif/olympus/mnote-olympus-tag.c:114
 msgid "Info"
@@ -4778,32 +4397,32 @@ msgstr "Інформаці�"
 
 #: libexif/olympus/mnote-olympus-tag.c:115
 msgid "Camera ID"
-msgstr ""
+msgstr "Ід. фотоапарата"
 
 #: libexif/olympus/mnote-olympus-tag.c:116
 msgid "Precapture Frames"
-msgstr ""
+msgstr "Попереднє захопленн� кадрів"
 
 #: libexif/olympus/mnote-olympus-tag.c:117
 msgid "White Board"
-msgstr ""
+msgstr "Біла дошка"
 
 #: libexif/olympus/mnote-olympus-tag.c:118
 msgid "One Touch White Balance"
-msgstr ""
+msgstr "Балан� білого у один дотик"
 
 #: libexif/olympus/mnote-olympus-tag.c:119
 msgid "White Balance Bracket"
-msgstr ""
+msgstr "Вилка балан�у білого"
 
 #: libexif/olympus/mnote-olympus-tag.c:120
 #: libexif/pentax/mnote-pentax-tag.c:123
 msgid "White Balance Bias"
-msgstr ""
+msgstr "Ухил балан�у білого"
 
 #: libexif/olympus/mnote-olympus-tag.c:121
 msgid "Data Dump"
-msgstr ""
+msgstr "Дамп даних"
 
 #: libexif/olympus/mnote-olympus-tag.c:124
 msgid "ISO Value"
@@ -4823,11 +4442,11 @@ msgstr "При�трій �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:130
 msgid "Sensor Temperature"
-msgstr ""
+msgstr "Температура датчика"
 
 #: libexif/olympus/mnote-olympus-tag.c:131
 msgid "Lens Temperature"
-msgstr ""
+msgstr "Температура об’єктива"
 
 #: libexif/olympus/mnote-olympus-tag.c:132
 msgid "Light Condition"
@@ -4835,19 +4454,19 @@ msgstr "Умови о�вітленн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:136
 msgid "Zoom Step Count"
-msgstr ""
+msgstr "Кількі�ть кроків ма�штабуванн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:137
 msgid "Focus Step Count"
-msgstr ""
+msgstr "Кількі�ть кроків фоку�уванн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:138
 msgid "Sharpness Setting"
-msgstr ""
+msgstr "Параметр різко�ті"
 
 #: libexif/olympus/mnote-olympus-tag.c:139
 msgid "Flash Charge Level"
-msgstr ""
+msgstr "Рівень зар�ду �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:140
 msgid "Color Matrix"
@@ -4873,39 +4492,39 @@ msgstr "Балан� �инього"
 
 #: libexif/olympus/mnote-olympus-tag.c:145
 msgid "Color Matrix Number"
-msgstr ""
+msgstr "�омер матриці кольору"
 
 #: libexif/olympus/mnote-olympus-tag.c:147
 msgid "Flash Exposure Comp"
-msgstr ""
+msgstr "Компен�аці� ек�позиції �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:148
 msgid "Internal Flash Table"
-msgstr ""
+msgstr "Вбудована таблиц� �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:149
 msgid "External Flash G Value"
-msgstr ""
+msgstr "G-значенн� зовнішнього �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:150
 msgid "External Flash Bounce"
-msgstr ""
+msgstr "Відбитт� зовнішнього �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:151
 msgid "External Flash Zoom"
-msgstr ""
+msgstr "Ма�штаб зовнішнього �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:152
 msgid "External Flash Mode"
-msgstr ""
+msgstr "Режим зовнішнього �палаху"
 
 #: libexif/olympus/mnote-olympus-tag.c:153
 msgid "Contrast Setting"
-msgstr ""
+msgstr "Параметр контра�тно�ті"
 
 #: libexif/olympus/mnote-olympus-tag.c:154
 msgid "Sharpness Factor"
-msgstr ""
+msgstr "Коефіцієнт різко�ті"
 
 #: libexif/olympus/mnote-olympus-tag.c:155
 msgid "Color Control"
@@ -4913,112 +4532,112 @@ msgstr "Керуванн� кольором"
 
 #: libexif/olympus/mnote-olympus-tag.c:156
 msgid "Olympus Image Width"
-msgstr ""
+msgstr "Ширина зображенн� Olympus"
 
 #: libexif/olympus/mnote-olympus-tag.c:157
 msgid "Olympus Image Height"
-msgstr ""
+msgstr "Ви�ота зображенн� Olympus"
 
 #: libexif/olympus/mnote-olympus-tag.c:158
 msgid "Scene Detect"
-msgstr ""
+msgstr "Ви�вленн� �цени"
 
 #: libexif/olympus/mnote-olympus-tag.c:159
 msgid "Compression Ratio"
-msgstr ""
+msgstr "Рівень �ти�канн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:160
 msgid "Preview Image Valid"
-msgstr ""
+msgstr "Коректні�ть зображенн� попереднього перегл�ду"
 
 #: libexif/olympus/mnote-olympus-tag.c:161
 msgid "AF Result"
-msgstr ""
+msgstr "Результат автофоку�уванн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:162
 msgid "CCD Scan Mode"
-msgstr ""
+msgstr "Режим �кануванн� ПЗЗ"
 
 #: libexif/olympus/mnote-olympus-tag.c:164
 msgid "Infinity Lens Step"
-msgstr ""
+msgstr "Крок об'єктива у не�кінченно�ті"
 
 #: libexif/olympus/mnote-olympus-tag.c:165
 msgid "Near Lens Step"
-msgstr ""
+msgstr "Крок об'єктива на близькій від�тані"
 
 #: libexif/olympus/mnote-olympus-tag.c:166
 msgid "Light Value Center"
-msgstr ""
+msgstr "Центральне значенн� о�вітлено�ті"
 
 #: libexif/olympus/mnote-olympus-tag.c:167
 msgid "Light Value Periphery"
-msgstr ""
+msgstr "Периферійне значенн� о�вітлено�ті"
 
 #: libexif/olympus/mnote-olympus-tag.c:170
 msgid "Sequential Shot"
-msgstr ""
+msgstr "По�лідовне зніманн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:171
 msgid "Wide Range"
-msgstr ""
+msgstr "Широкий діапазон"
 
 #: libexif/olympus/mnote-olympus-tag.c:172
 msgid "Color Adjustment Mode"
-msgstr ""
+msgstr "Режим коригуванн� кольорів"
 
 #: libexif/olympus/mnote-olympus-tag.c:174
 msgid "Quick Shot"
-msgstr ""
+msgstr "Швидкий знімок"
 
 #: libexif/olympus/mnote-olympus-tag.c:176
 msgid "Voice Memo"
-msgstr ""
+msgstr "Голо�ова нотатка"
 
 #: libexif/olympus/mnote-olympus-tag.c:177
 msgid "Record Shutter Release"
-msgstr ""
+msgstr "Запи� �пу�ку затвора"
 
 #: libexif/olympus/mnote-olympus-tag.c:178
 msgid "Flicker Reduce"
-msgstr ""
+msgstr "Зменшенн� блиманн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:179
 msgid "Optical Zoom"
-msgstr ""
+msgstr "Оптичне ма�штабуванн�"
 
 #: libexif/olympus/mnote-olympus-tag.c:181
 msgid "Light Source Special"
-msgstr ""
+msgstr "Спеціальне джерело �вітла"
 
 #: libexif/olympus/mnote-olympus-tag.c:182
 msgid "Resaved"
-msgstr ""
+msgstr "Повторно збережено"
 
 #: libexif/olympus/mnote-olympus-tag.c:184
 msgid "Scene Select"
-msgstr ""
+msgstr "Вибір �цени"
 
 #: libexif/olympus/mnote-olympus-tag.c:186
 msgid "Sequence Shot Interval"
-msgstr ""
+msgstr "Інтервал у по�лідовно�ті знімків"
 
 #: libexif/olympus/mnote-olympus-tag.c:189
 msgid "Epson Image Width"
-msgstr ""
+msgstr "Ширина зображенн� Epson"
 
 #: libexif/olympus/mnote-olympus-tag.c:190
 msgid "Epson Image Height"
-msgstr ""
+msgstr "Ви�ота зображенн� Epson"
 
 #: libexif/olympus/mnote-olympus-tag.c:191
 msgid "Epson Software Version"
-msgstr ""
+msgstr "Вер�і� програмного забезпеченн� Epson"
 
 #: libexif/pentax/mnote-pentax-entry.c:80
 #: libexif/pentax/mnote-pentax-entry.c:134
 msgid "Multi-exposure"
-msgstr ""
+msgstr "Мультиек�понуванн�"
 
 #: libexif/pentax/mnote-pentax-entry.c:83
 #: libexif/pentax/mnote-pentax-entry.c:137
@@ -5032,7 +4651,7 @@ msgstr "Краще"
 
 #: libexif/pentax/mnote-pentax-entry.c:92
 msgid "Flash on"
-msgstr ""
+msgstr "Спалах увімкнено"
 
 #: libexif/pentax/mnote-pentax-entry.c:140
 msgid "TIFF"
@@ -5056,7 +4675,7 @@ msgstr "Поверхн� і �ніг"
 
 #: libexif/pentax/mnote-pentax-entry.c:172
 msgid "Sunset or candlelight"
-msgstr ""
+msgstr "Захід �онц� чи �вітло �вічки"
 
 #: libexif/pentax/mnote-pentax-entry.c:173
 msgid "Autumn"
@@ -5064,11 +4683,11 @@ msgstr "О�інь"
 
 #: libexif/pentax/mnote-pentax-entry.c:178
 msgid "Self portrait"
-msgstr ""
+msgstr "�втопортрет"
 
 #: libexif/pentax/mnote-pentax-entry.c:179
 msgid "Illustrations"
-msgstr ""
+msgstr "Ілю�трації"
 
 #: libexif/pentax/mnote-pentax-entry.c:180
 msgid "Digital filter"
@@ -5080,72 +4699,72 @@ msgstr "Їжа"
 
 #: libexif/pentax/mnote-pentax-entry.c:183
 msgid "Green mode"
-msgstr ""
+msgstr "Режим зеленого"
 
 #: libexif/pentax/mnote-pentax-entry.c:184
 msgid "Light pet"
-msgstr ""
+msgstr "Світла тварина"
 
 #: libexif/pentax/mnote-pentax-entry.c:185
 msgid "Dark pet"
-msgstr ""
+msgstr "Темна тварина"
 
 #: libexif/pentax/mnote-pentax-entry.c:186
 msgid "Medium pet"
-msgstr ""
+msgstr "Проміжна тварина"
 
 #: libexif/pentax/mnote-pentax-entry.c:188
 #: libexif/pentax/mnote-pentax-entry.c:296
 msgid "Candlelight"
-msgstr ""
+msgstr "Світло �вічок"
 
 #: libexif/pentax/mnote-pentax-entry.c:189
 msgid "Natural skin tone"
-msgstr ""
+msgstr "�атуральні тони шкіри"
 
 #: libexif/pentax/mnote-pentax-entry.c:190
 msgid "Synchro sound record"
-msgstr ""
+msgstr "Синхронний запи� звуку"
 
 #: libexif/pentax/mnote-pentax-entry.c:191
 msgid "Frame composite"
-msgstr ""
+msgstr "Композиці� кадру"
 
 #: libexif/pentax/mnote-pentax-entry.c:194
 msgid "Auto, did not fire"
-msgstr ""
+msgstr "�вто, не �працювала"
 
 #: libexif/pentax/mnote-pentax-entry.c:196
 msgid "Auto, did not fire, red-eye reduction"
-msgstr ""
+msgstr "�вто, не �працювала, прибиранн� «червоних очей»"
 
 #: libexif/pentax/mnote-pentax-entry.c:197
 msgid "Auto, fired"
-msgstr ""
+msgstr "�вто, �працювала"
 
 #: libexif/pentax/mnote-pentax-entry.c:199
 msgid "Auto, fired, red-eye reduction"
-msgstr ""
+msgstr "�вто, �працювала, у�уванн� «червоних очей»"
 
 #: libexif/pentax/mnote-pentax-entry.c:201
 msgid "On, wireless"
-msgstr ""
+msgstr "Увімкнено, бездротовий"
 
 #: libexif/pentax/mnote-pentax-entry.c:202
 msgid "On, soft"
-msgstr ""
+msgstr "Увімкнено, програмний"
 
 #: libexif/pentax/mnote-pentax-entry.c:203
 msgid "On, slow-sync"
-msgstr ""
+msgstr "Увімкнено, повільна �инхронізаці�"
 
 #: libexif/pentax/mnote-pentax-entry.c:204
 msgid "On, slow-sync, red-eye reduction"
-msgstr ""
+msgstr "Увімкнено, повільна �инхронізаці�, у�уванн� «червоних очей»"
 
 #: libexif/pentax/mnote-pentax-entry.c:205
 msgid "On, trailing-curtain sync"
-msgstr ""
+msgstr "Увімкнено, �инхронізаці� із кінцем фронту"
 
 #: libexif/pentax/mnote-pentax-entry.c:213
 msgid "AF-S"
@@ -5189,7 +4808,7 @@ msgstr "Внизу праворуч"
 
 #: libexif/pentax/mnote-pentax-entry.c:228
 msgid "Fixed center"
-msgstr ""
+msgstr "Фік�ована за центром"
 
 #: libexif/pentax/mnote-pentax-entry.c:232
 msgid "Multiple"
@@ -5205,7 +4824,7 @@ msgstr "По�ередині знизу"
 
 #: libexif/pentax/mnote-pentax-entry.c:257
 msgid "User selected"
-msgstr ""
+msgstr "Вибрана кори�тувачем"
 
 #: libexif/pentax/mnote-pentax-entry.c:282
 msgid "3008x2008 or 3040x2024"
@@ -5219,7 +4838,7 @@ msgstr "Цифровий фільтр?"
 #: libexif/pentax/mnote-pentax-entry.c:383
 #, c-format
 msgid "Internal error (unknown value %i %i)"
-msgstr ""
+msgstr "Внутрішн� помилка (невідоме значенн� %i %i)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
@@ -5240,7 +4859,7 @@ msgstr "Кольори"
 
 #: libexif/pentax/mnote-pentax-tag.c:59
 msgid "PrintIM Settings"
-msgstr ""
+msgstr "Параметри PrintIM"
 
 #: libexif/pentax/mnote-pentax-tag.c:60 libexif/pentax/mnote-pentax-tag.c:131
 msgid "Time Zone"
@@ -5256,11 +4875,11 @@ msgstr "Розмір перегл�ду"
 
 #: libexif/pentax/mnote-pentax-tag.c:65
 msgid "Preview Length"
-msgstr ""
+msgstr "Тривалі�ть попереднього перегл�ду"
 
 #: libexif/pentax/mnote-pentax-tag.c:66 libexif/pentax/mnote-pentax-tag.c:122
 msgid "Preview Start"
-msgstr ""
+msgstr "Почати попередній перегл�д"
 
 #: libexif/pentax/mnote-pentax-tag.c:67
 msgid "Model Identification"
@@ -5276,11 +4895,11 @@ msgstr "Ча�"
 
 #: libexif/pentax/mnote-pentax-tag.c:75
 msgid "AF Point Selected"
-msgstr ""
+msgstr "Вибрана точка �Ф"
 
 #: libexif/pentax/mnote-pentax-tag.c:76
 msgid "Auto AF Point"
-msgstr ""
+msgstr "�втоматична точка �Ф"
 
 #: libexif/pentax/mnote-pentax-tag.c:77
 msgid "Focus Position"
@@ -5292,7 +4911,7 @@ msgstr "Коефіцієнт ISO"
 
 #: libexif/pentax/mnote-pentax-tag.c:83
 msgid "Auto Bracketing"
-msgstr ""
+msgstr "�втоматичне злитт� ек�позицій"
 
 #: libexif/pentax/mnote-pentax-tag.c:85
 msgid "White Balance Mode"
@@ -5300,7 +4919,7 @@ msgstr "Режим балан�у білого"
 
 #: libexif/pentax/mnote-pentax-tag.c:93
 msgid "World Time Location"
-msgstr ""
+msgstr "Розташуванн� за в�е�вітнім ча�ом"
 
 #: libexif/pentax/mnote-pentax-tag.c:94
 msgid "Hometown City"
@@ -5312,19 +4931,19 @@ msgstr "Мі�то призначенн�"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Hometown DST"
-msgstr ""
+msgstr "Мі�цевий ча� (DST)"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Home Daylight Savings Time"
-msgstr ""
+msgstr "Мі�цевий ча� з врахуванн�м переведенн� ча�у"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
 msgid "Destination DST"
-msgstr ""
+msgstr "Ча� мі�ц� призначенн� (DST)"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
 msgid "Destination Daylight Savings Time"
-msgstr ""
+msgstr "Ча� мі�ц� призначенн� з врахуванн�м переведенн� ча�у"
 
 #: libexif/pentax/mnote-pentax-tag.c:99
 msgid "Image Processing"
@@ -5332,23 +4951,23 @@ msgstr "Обробка зображень"
 
 #: libexif/pentax/mnote-pentax-tag.c:100
 msgid "Picture Mode (2)"
-msgstr ""
+msgstr "Режим знімка (2)"
 
 #: libexif/pentax/mnote-pentax-tag.c:103
 msgid "Image Area Offset"
-msgstr ""
+msgstr "Від�туп обла�ті зображенн�"
 
 #: libexif/pentax/mnote-pentax-tag.c:104
 msgid "Raw Image Size"
-msgstr ""
+msgstr "Розмір цифрового негатива"
 
 #: libexif/pentax/mnote-pentax-tag.c:105
 msgid "Autofocus Points Used"
-msgstr ""
+msgstr "Викори�тано точки автофоку�уванн�"
 
 #: libexif/pentax/mnote-pentax-tag.c:107
 msgid "Camera Temperature"
-msgstr ""
+msgstr "Температура фотоапарата"
 
 #: libexif/pentax/mnote-pentax-tag.c:110
 msgid "Image Tone"
@@ -5356,7 +4975,7 @@ msgstr "Тон зображенн�"
 
 #: libexif/pentax/mnote-pentax-tag.c:111
 msgid "Shake Reduction Info"
-msgstr ""
+msgstr "Відомо�ті щодо у�уванн� тремтінн�"
 
 #: libexif/pentax/mnote-pentax-tag.c:112
 msgid "Black Point"
@@ -5384,11 +5003,11 @@ msgstr "Дані щодо акумул�тора"
 
 #: libexif/pentax/mnote-pentax-tag.c:119
 msgid "Hometown City Code"
-msgstr ""
+msgstr "Код мі�та перебуванн�"
 
 #: libexif/pentax/mnote-pentax-tag.c:120
 msgid "Destination City Code"
-msgstr ""
+msgstr "Код мі�та призначенн�"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
 msgid "Object Distance"
@@ -5396,19 +5015,19 @@ msgstr "Від�тань до об’єкта"
 
 #: libexif/pentax/mnote-pentax-tag.c:125
 msgid "Distance of photographed object in millimeters."
-msgstr ""
+msgstr "Від�тань до зн�того об’єкта у міліметрах."
 
 #: libexif/pentax/mnote-pentax-tag.c:126
 msgid "Flash Distance"
-msgstr ""
+msgstr "Від�тань �палаху"
 
 #: libexif/pentax/mnote-pentax-tag.c:132
 msgid "Bestshot Mode"
-msgstr ""
+msgstr "Режим Bestshot"
 
 #: libexif/pentax/mnote-pentax-tag.c:133
 msgid "CCS ISO Sensitivity"
-msgstr ""
+msgstr "ISO-чутливі�ть ПЗЗ"
 
 #: libexif/pentax/mnote-pentax-tag.c:135
 msgid "Enhancement"
@@ -5416,8 +5035,11 @@ msgstr "Покращенн�"
 
 #: libexif/pentax/mnote-pentax-tag.c:136
 msgid "Finer"
-msgstr ""
+msgstr "Краще"
 
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
-msgstr ""
+msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
+
+#~ msgid "FNumber"
+#~ msgstr "Чи�ло F"
diff --git a/po/vi.gmo b/po/vi.gmo
deleted file mode 100644
index c49f52b..0000000
--- a/po/vi.gmo
+++ /dev/null
diff --git a/po/vi.po b/po/vi.po
index fb7d762..218ebbc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,25 +1,28 @@
 # Vietnamese translation for LibEXIF.
-# Copyright © 2012 Free Software Foundation, Inc.
+# Bản dịch tiếng Việt dành cho LibEXIF.
+# Copyright © 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libexif package.
+# Tham khảo các khái niệm tại:
+# * <http://www.kodak.com/global/plugins/acrobat/en/service/digCam/exifStandard2.pdf>
+# * <http://www.media.mit.edu/pia/Research/deepview/exif.html>
 # Clytie Siddall <clytie@riverland.net.au>, 2006-2010.
-# Trần Ng�c Quân <vnwildman@gmail.com>, 2012.
+# Trần Ng�c Quân <vnwildman@gmail.com>, 2012, 2015, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif-0.6.21-pre1\n"
+"Project-Id-Version: libexif 0.6.22-pre1\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
-"PO-Revision-Date: 2012-07-03 07:23+0700\n"
+"POT-Creation-Date: 2016-09-02 00:46+0200\n"
+"PO-Revision-Date: 2016-09-03 08:58+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
-"Language: vi\n"
+"Language: vi_VN\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.8\n"
-"X-Poedit-Language: Vietnamese\n"
-"X-Poedit-Country: VIET NAM\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
@@ -27,21 +30,21 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-entry.c:39
 #, c-format
 msgid "Invalid format '%s', expected '%s'."
-msgstr "�ịnh dạng không hợp lệ \"%s\", mong ch� \"%s\"."
+msgstr "�ịnh dạng không hợp lệ \"%s\", cần \"%s\"."
 
 #: libexif/canon/mnote-canon-entry.c:52 libexif/fuji/mnote-fuji-entry.c:47
 #: libexif/olympus/mnote-olympus-entry.c:62
 #: libexif/pentax/mnote-pentax-entry.c:51
 #, c-format
 msgid "Invalid number of components (%i, expected %i)."
-msgstr "Số thành phần không hợp lệ (%i, mong ch� %i)."
+msgstr "Số thành phần không hợp lệ (%i, cần %i)."
 
 #: libexif/canon/mnote-canon-entry.c:61
 #: libexif/olympus/mnote-olympus-entry.c:72
 #: libexif/pentax/mnote-pentax-entry.c:61
 #, c-format
 msgid "Invalid number of components (%i, expected %i or %i)."
-msgstr "Số thành phần không hợp lệ (%i, mong ch� %i hay %i)."
+msgstr "Số thành phần không hợp lệ (%i, cần %i hay %i)."
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
 #: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
@@ -76,7 +79,7 @@ msgstr "Tiết kiệm"
 
 #: libexif/canon/mnote-canon-entry.c:80
 msgid "Fine"
-msgstr "Chính xác"
+msgstr "�ẹp"
 
 #: libexif/canon/mnote-canon-entry.c:81 libexif/fuji/mnote-fuji-entry.c:178
 #: libexif/pentax/mnote-pentax-entry.c:141
@@ -193,21 +196,21 @@ msgstr "AF chụp một"
 
 #: libexif/canon/mnote-canon-entry.c:98
 msgid "AI servo AF"
-msgstr "AF dịch vụ trí tuệ"
+msgstr "AF AI động cơ tùy động"
 
 #: libexif/canon/mnote-canon-entry.c:99
 msgid "AI focus AF"
-msgstr "AF tiêu điểm trí tuệ"
+msgstr "AF AI lấy nét"
 
 #: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103
 msgid "Manual focus"
-msgstr "Tiêu điểm thủ công"
+msgstr "Lấy nét thủ công"
 
 #: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:132
 #: libexif/canon/mnote-canon-entry.c:187
 #: libexif/pentax/mnote-pentax-entry.c:212
 msgid "Pan focus"
-msgstr "Kéo ngang tiêu điểm"
+msgstr "Kéo ngang lấy nét"
 
 #: libexif/canon/mnote-canon-entry.c:105
 msgid "JPEG"
@@ -271,7 +274,7 @@ msgstr "Màn hình rộng"
 
 #: libexif/canon/mnote-canon-entry.c:120
 msgid "Full auto"
-msgstr "Tự động đầy đủ"
+msgstr "Hoàn toàn tự động"
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
@@ -324,7 +327,7 @@ msgstr "Kiểu nâu đen"
 #: libexif/pentax/mnote-pentax-entry.c:294
 #: libexif/pentax/mnote-pentax-entry.c:300
 msgid "Portrait"
-msgstr "Thẳng đứng"
+msgstr "Chân dung"
 
 #: libexif/canon/mnote-canon-entry.c:129 libexif/fuji/mnote-fuji-entry.c:122
 msgid "Sports"
@@ -334,7 +337,7 @@ msgstr "Thể thao"
 #: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
 #: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
 msgid "Black & white"
-msgstr "�en trắng"
+msgstr "�en & trắng"
 
 #: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
 msgid "Vivid"
@@ -343,12 +346,12 @@ msgstr "Sặc sỡ"
 #: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
 #: libexif/canon/mnote-canon-entry.c:434
 msgid "Neutral"
-msgstr "Trung lập"
+msgstr "Trung tính"
 
 #: libexif/canon/mnote-canon-entry.c:135
 #: libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
-msgstr "�èn nháy bị tắt"
+msgstr "�èn nháy tắt"
 
 #: libexif/canon/mnote-canon-entry.c:136
 msgid "Long shutter"
@@ -382,7 +385,7 @@ msgstr "Bãi biển"
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
 msgid "Underwater"
-msgstr "Dưới mặt nước"
+msgstr "DÆ°á»›i nÆ°á»›c"
 
 #: libexif/canon/mnote-canon-entry.c:143 libexif/fuji/mnote-fuji-entry.c:134
 msgid "Snow"
@@ -390,11 +393,11 @@ msgstr "Tuyết"
 
 #: libexif/canon/mnote-canon-entry.c:144
 msgid "Kids & pets"
-msgstr "Trẻ con và Vật cưng"
+msgstr "Trẻ con và thú cưng"
 
 #: libexif/canon/mnote-canon-entry.c:145
 msgid "Night snapshot"
-msgstr "Ảnh chụp đem"
+msgstr "Ảnh chụp đêm"
 
 #: libexif/canon/mnote-canon-entry.c:146
 msgid "Digital macro"
@@ -410,7 +413,7 @@ msgstr "Ảnh tĩnh"
 
 #: libexif/canon/mnote-canon-entry.c:149
 msgid "Color accent"
-msgstr "Màu nhấn"
+msgstr "Nhấn màu"
 
 #: libexif/canon/mnote-canon-entry.c:150
 msgid "Color swap"
@@ -418,7 +421,7 @@ msgstr "Trao đổi màu"
 
 #: libexif/canon/mnote-canon-entry.c:151
 msgid "Aquarium"
-msgstr "Bể nuôi"
+msgstr "Bể cảnh"
 
 #: libexif/canon/mnote-canon-entry.c:152
 msgid "ISO 3200"
@@ -527,11 +530,11 @@ msgstr "Gần"
 
 #: libexif/canon/mnote-canon-entry.c:185
 msgid "Middle range"
-msgstr "Phạm vị giữa"
+msgstr "Vùng giữa"
 
 #: libexif/canon/mnote-canon-entry.c:186
 msgid "Far range"
-msgstr "Phạm vị xa"
+msgstr "Vùng xa"
 
 #: libexif/canon/mnote-canon-entry.c:189
 #: libexif/pentax/mnote-pentax-entry.c:210
@@ -587,7 +590,7 @@ msgstr "Ưu tiên TV"
 
 #: libexif/canon/mnote-canon-entry.c:200
 msgid "Av-priority"
-msgstr "Ưu tiên nghe nhín"
+msgstr "Ưu tiên AV"
 
 #: libexif/canon/mnote-canon-entry.c:202
 msgid "A-DEP"
@@ -973,15 +976,15 @@ msgstr "AE chuẩn"
 
 #: libexif/canon/mnote-canon-entry.c:300
 msgid "Exposure compensation"
-msgstr "Sự bù phơi nắng"
+msgstr "Sự bù phơi sáng"
 
 #: libexif/canon/mnote-canon-entry.c:301
 msgid "AE lock"
-msgstr "Khoá AE"
+msgstr "Khóa AE"
 
 #: libexif/canon/mnote-canon-entry.c:302
 msgid "AE lock + exposure compensation"
-msgstr "Khoá AE + bù phơi nắng"
+msgstr "Khóa AE + bù phơi sáng"
 
 #: libexif/canon/mnote-canon-entry.c:303
 msgid "No AE"
@@ -1029,7 +1032,7 @@ msgstr "Thu/phóng"
 
 #: libexif/canon/mnote-canon-entry.c:332
 msgid "Sunny"
-msgstr "Trời có nă�ng"
+msgstr "Tr�i nắng"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
 #: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
@@ -1102,7 +1105,7 @@ msgstr "Cảnh đem"
 
 #: libexif/canon/mnote-canon-entry.c:355
 msgid "Center-right"
-msgstr "Giữa bên phải"
+msgstr "Giữa-phải"
 
 #: libexif/canon/mnote-canon-entry.c:357
 msgid "Left-right"
@@ -1130,15 +1133,15 @@ msgstr "Bật (chụp 3)"
 
 #: libexif/canon/mnote-canon-entry.c:365
 msgid "EOS high-end"
-msgstr "EOS cấp cao"
+msgstr "EOS cao cấp"
 
 #: libexif/canon/mnote-canon-entry.c:366
 msgid "Compact"
-msgstr "G�n"
+msgstr "Máy ảnh du lịch"
 
 #: libexif/canon/mnote-canon-entry.c:367
 msgid "EOS mid-range"
-msgstr "EOS cấp vừa"
+msgstr "EOS trung cấp"
 
 #: libexif/canon/mnote-canon-entry.c:369
 msgid "Rotate 90 CW"
@@ -1154,7 +1157,7 @@ msgstr "Xoay 270º xuôi chi�u"
 
 #: libexif/canon/mnote-canon-entry.c:372
 msgid "Rotated by software"
-msgstr "Do phần m�m xoay"
+msgstr "�ược xoay bằng phần m�m"
 
 #: libexif/canon/mnote-canon-entry.c:384
 #: libexif/olympus/mnote-olympus-entry.c:612
@@ -1284,43 +1287,43 @@ msgstr "%u mm"
 
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
-msgstr "Thiết lập (Phần �ầu)"
+msgstr "Cài đặt (Phần đầu tiên)"
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
 #: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
-msgstr "Tiêu Cự"
+msgstr "Tiêu cự"
 
 #: libexif/canon/mnote-canon-tag.c:37
 msgid "Settings (Second Part)"
-msgstr "Thiết lập (Phần thứ Hai)"
+msgstr "Cài đặt (Phần thứ hai)"
 
 #: libexif/canon/mnote-canon-tag.c:38
 #: libexif/olympus/mnote-olympus-entry.c:601
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
-msgstr "Cảnh quay lia"
+msgstr "Chụp toàn cảnh"
 
 #: libexif/canon/mnote-canon-tag.c:39
 msgid "Image Type"
-msgstr "Kiểu Ảnh"
+msgstr "Kiểu ảnh"
 
 #: libexif/canon/mnote-canon-tag.c:40 libexif/olympus/mnote-olympus-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:113
 msgid "Firmware Version"
-msgstr "Phiên bản phần vững"
+msgstr "Phiên bản Firmware"
 
 #: libexif/canon/mnote-canon-tag.c:41
 msgid "Image Number"
-msgstr "Số thứ tự Ảnh"
+msgstr "Số thứ tự ảnh"
 
 #: libexif/canon/mnote-canon-tag.c:42
 msgid "Owner Name"
-msgstr "Tên Chủ"
+msgstr "Tên chủ sở hữu"
 
 #: libexif/canon/mnote-canon-tag.c:43
 msgid "Color Information"
-msgstr "Thông tin Màu sắc"
+msgstr "Thông tin màu sắc"
 
 #: libexif/canon/mnote-canon-tag.c:44 libexif/fuji/mnote-fuji-tag.c:37
 #: libexif/olympus/mnote-olympus-tag.c:81
@@ -1330,11 +1333,11 @@ msgstr "Số sản xuất"
 
 #: libexif/canon/mnote-canon-tag.c:45
 msgid "Custom Functions"
-msgstr "Chức năng Tự ch�n"
+msgstr "Chức năng tự ch�n"
 
 #: libexif/canon/mnote-canon-tag.c:56 libexif/fuji/mnote-fuji-tag.c:45
 msgid "Macro Mode"
-msgstr "Chế độ Vĩ lệnh"
+msgstr "Chế độ vĩ lệnh"
 
 #: libexif/canon/mnote-canon-tag.c:57 libexif/canon/mnote-canon-tag.c:117
 #: libexif/olympus/mnote-olympus-tag.c:175
@@ -1354,11 +1357,11 @@ msgstr "Chất lượng"
 #: libexif/olympus/mnote-olympus-tag.c:127
 #: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
-msgstr "Chế độ �èn nháy"
+msgstr "Chế độ đèn nháy"
 
 #: libexif/canon/mnote-canon-tag.c:60 libexif/pentax/mnote-pentax-tag.c:101
 msgid "Drive Mode"
-msgstr "Chế độ �ẩy lên"
+msgstr "Chế độ đẩy lên"
 
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
@@ -1367,19 +1370,19 @@ msgstr "Chế độ �ẩy lên"
 #: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
 #: libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
-msgstr "Chế độ Tiêu điểm"
+msgstr "Chế độ lấy nét"
 
 #: libexif/canon/mnote-canon-tag.c:62 libexif/pentax/mnote-pentax-tag.c:127
 msgid "Record Mode"
-msgstr "Chế độ Thu"
+msgstr "Chế độ ghi"
 
 #: libexif/canon/mnote-canon-tag.c:63 libexif/pentax/mnote-pentax-tag.c:71
 msgid "Image Size"
-msgstr "Cỡ Ảnh"
+msgstr "Cỡ ảnh"
 
 #: libexif/canon/mnote-canon-tag.c:64
 msgid "Easy Shooting Mode"
-msgstr "Chế độ Chụp dễ"
+msgstr "Chế độ chụp dễ"
 
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
@@ -1406,7 +1409,7 @@ msgstr "Bão hòa"
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
-msgstr "Sắc"
+msgstr "Sắc nét"
 
 #: libexif/canon/mnote-canon-tag.c:69
 msgid "ISO"
@@ -1415,11 +1418,11 @@ msgstr "ISO"
 #: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
-msgstr "Chế độ �o"
+msgstr "Chế độ đo"
 
 #: libexif/canon/mnote-canon-tag.c:71 libexif/olympus/mnote-olympus-tag.c:133
 msgid "Focus Range"
-msgstr "Phạm vị Tiêu điểm"
+msgstr "Vùng lấy nét"
 
 #: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
 msgid "AF Point"
@@ -1427,20 +1430,20 @@ msgstr "�iểm AF"
 
 #: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
 msgid "Exposure Mode"
-msgstr "Chế độ Phơi nắng"
+msgstr "Chế độ phơi sáng"
 
 #: libexif/canon/mnote-canon-tag.c:74 libexif/olympus/mnote-olympus-tag.c:61
 #: libexif/pentax/mnote-pentax-tag.c:106
 msgid "Lens Type"
-msgstr "Kiểu �ng kính"
+msgstr "Kiểu ống kính"
 
 #: libexif/canon/mnote-canon-tag.c:75
 msgid "Long Focal Length of Lens"
-msgstr "Tiêu cự Dài của �ng kính"
+msgstr "Tiêu cự dài của ống kính"
 
 #: libexif/canon/mnote-canon-tag.c:76
 msgid "Short Focal Length of Lens"
-msgstr "Tiêu cự Ngắn của �ng kính"
+msgstr "Tiêu cự ngắn của ống kính"
 
 #: libexif/canon/mnote-canon-tag.c:77
 msgid "Focal Units per mm"
@@ -1448,31 +1451,31 @@ msgstr "�ơn vị Tiêu từng mm"
 
 #: libexif/canon/mnote-canon-tag.c:78
 msgid "Maximal Aperture"
-msgstr "Khẩu độ Tối đa"
+msgstr "Khẩu độ tối đa"
 
 #: libexif/canon/mnote-canon-tag.c:79
 msgid "Minimal Aperture"
-msgstr "Khẩu độ Tối thiểu"
+msgstr "Khẩu độ tối thiểu"
 
 #: libexif/canon/mnote-canon-tag.c:80
 msgid "Flash Activity"
-msgstr "Hoạt động �èn nháy"
+msgstr "Hoạt động đèn nháy"
 
 #: libexif/canon/mnote-canon-tag.c:81
 msgid "Flash Details"
-msgstr "Chi tiết �èn nháy"
+msgstr "Chi tiết đèn nháy"
 
 #: libexif/canon/mnote-canon-tag.c:83
 msgid "AE Setting"
-msgstr "Thiết lập AE"
+msgstr "Cài đặt AE"
 
 #: libexif/canon/mnote-canon-tag.c:84
 msgid "Image Stabilization"
-msgstr "Làm Ổn định Ảnh"
+msgstr "Làm ổn định ảnh"
 
 #: libexif/canon/mnote-canon-tag.c:85
 msgid "Display Aperture"
-msgstr "Khẩu độ Trình bày"
+msgstr "Khẩu độ trình bày"
 
 #: libexif/canon/mnote-canon-tag.c:86
 msgid "Zoom Source Width"
@@ -1484,7 +1487,7 @@ msgstr "Rộng �ích Phóng to"
 
 #: libexif/canon/mnote-canon-tag.c:88
 msgid "Photo Effect"
-msgstr "Hiệu ứng Ảnh chụp"
+msgstr "Hiệu ứng ảnh chụp"
 
 #: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
 msgid "Manual Flash Output"
@@ -1492,11 +1495,11 @@ msgstr "Mở �èn nháy bằng Tay"
 
 #: libexif/canon/mnote-canon-tag.c:90
 msgid "Color Tone"
-msgstr "Sắc Màu"
+msgstr "Tông màu"
 
 #: libexif/canon/mnote-canon-tag.c:91
 msgid "Focal Type"
-msgstr "Kiểu Tiêu điểm"
+msgstr "Kiểu lấy nét"
 
 #: libexif/canon/mnote-canon-tag.c:93
 msgid "Focal Plane X Size"
@@ -1508,7 +1511,7 @@ msgstr "Cỡ Y Phẳng Tiêu"
 
 #: libexif/canon/mnote-canon-tag.c:95
 msgid "Auto ISO"
-msgstr "Tá»± Ä‘á»™ng ISO"
+msgstr "ISO tá»± Ä‘á»™ng"
 
 #: libexif/canon/mnote-canon-tag.c:96
 msgid "Shot ISO"
@@ -1520,16 +1523,16 @@ msgstr "EV đã đo"
 
 #: libexif/canon/mnote-canon-tag.c:98
 msgid "Target Aperture"
-msgstr "Khẩu độ �ích"
+msgstr "Khẩu độ đích"
 
 #: libexif/canon/mnote-canon-tag.c:99
 msgid "Target Exposure Time"
-msgstr "Th�i gian Phơi nắng �ích"
+msgstr "Th�i gian phơi sáng đích"
 
 #: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
 #: libexif/pentax/mnote-pentax-tag.c:81
 msgid "Exposure Compensation"
-msgstr "Sự bù Phơi nắng"
+msgstr "Sự bù phơi sáng"
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
 #: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
@@ -1537,7 +1540,7 @@ msgstr "Sự bù Phơi nắng"
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
 msgid "White Balance"
-msgstr "Cân bằmg Trắng"
+msgstr "Cân bằng trắng"
 
 #: libexif/canon/mnote-canon-tag.c:102
 msgid "Slow Shutter"
@@ -1545,7 +1548,7 @@ msgstr "Chập Chậm"
 
 #: libexif/canon/mnote-canon-tag.c:103
 msgid "Sequence Number"
-msgstr "Số nối tiếp"
+msgstr "Số liên tiếp"
 
 #: libexif/canon/mnote-canon-tag.c:104
 msgid "Flash Guide Number"
@@ -1554,7 +1557,7 @@ msgstr "Số dẫn �èn nháy"
 #: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
 #: libexif/pentax/mnote-pentax-tag.c:109
 msgid "Flash Exposure Compensation"
-msgstr "Sự bù Phơi nắng �èn nháy"
+msgstr "Sự bù phơi sáng �èn nháy"
 
 #: libexif/canon/mnote-canon-tag.c:107
 msgid "AE Bracketing"
@@ -1566,20 +1569,21 @@ msgstr "Giá trị Ngoặc AE"
 
 #: libexif/canon/mnote-canon-tag.c:109
 msgid "Focus Distance Upper"
-msgstr "Tầm Tiêu điểm Trên"
+msgstr "Tầm lấy nét Trên"
 
 #: libexif/canon/mnote-canon-tag.c:110
 msgid "Focus Distance Lower"
-msgstr "Tầm Tiêu điểm Dưới"
+msgstr "Tầm lấy nét Dưới"
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
-msgstr "Số F"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:469
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr "Số-F"
 
 #: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
-msgstr "Th�i gian Phơi nắng"
+msgstr "Th�i gian phơi sáng"
 
 #: libexif/canon/mnote-canon-tag.c:113
 msgid "Bulb Duration"
@@ -1587,11 +1591,11 @@ msgstr "Th�i gian Bóng đèn"
 
 #: libexif/canon/mnote-canon-tag.c:114
 msgid "Camera Type"
-msgstr "Kiểu Máy Ảnh"
+msgstr "Kiểu máy ảnh"
 
 #: libexif/canon/mnote-canon-tag.c:115
 msgid "Auto Rotate"
-msgstr "Tá»± Ä‘á»™ng Xoay"
+msgstr "Tá»± Ä‘á»™ng xoay"
 
 #: libexif/canon/mnote-canon-tag.c:116
 msgid "ND Filter"
@@ -1599,15 +1603,15 @@ msgstr "L�c ND"
 
 #: libexif/canon/mnote-canon-tag.c:119
 msgid "Panorama Frame"
-msgstr "Khung Cảnh Quay Lia"
+msgstr "Khung cảnh quay lia"
 
 #: libexif/canon/mnote-canon-tag.c:120
 msgid "Panorama Direction"
-msgstr "Hướng Cảnh Quay Lia"
+msgstr "Hướng cảnh quay lia"
 
 #: libexif/canon/mnote-canon-tag.c:121
 msgid "Tone Curve"
-msgstr "Cong Sắc"
+msgstr "�ư�ng cong sắc"
 
 #: libexif/canon/mnote-canon-tag.c:122
 msgid "Sharpness Frequency"
@@ -1615,7 +1619,7 @@ msgstr "Tần số độ Sắc"
 
 #: libexif/canon/mnote-canon-tag.c:124
 msgid "Picture Style"
-msgstr "Kiểu Ảnh"
+msgstr "Kiểu ảnh"
 
 # Name: don't translate / Tên: đừng dịch
 #: libexif/exif-byte-order.c:33
@@ -1656,9 +1660,7 @@ msgid "Follow specification"
 msgstr "Theo đặc tả"
 
 #: libexif/exif-data.c:1181
-msgid ""
-"Add, correct and remove entries to get EXIF data that follows the "
-"specification."
+msgid "Add, correct and remove entries to get EXIF data that follows the specification."
 msgstr "Thêm, sửa và gỡ b� mục nhập để tạo dữ liệu EXIF tùy theo đặc tả."
 
 #: libexif/exif-data.c:1183
@@ -1666,62 +1668,35 @@ msgid "Do not change maker note"
 msgstr "Không thay đổi ghi chú hãng chế tạo"
 
 #: libexif/exif-data.c:1184
-msgid ""
-"When loading and resaving Exif data, save the maker note unmodified. Be "
-"aware that the maker note can get corrupted."
-msgstr ""
-"Khi nạp và lưu lại dữ liệu EXIF, lưu ghi chú hãng chế tạo, không sửa đổi nó. "
-"Lưu ý rằng ghi chú hãng chế tạo có thể bị h�ng."
+msgid "When loading and resaving Exif data, save the maker note unmodified. Be aware that the maker note can get corrupted."
+msgstr "Khi nạp và lưu lại dữ liệu EXIF, lưu ghi chú hãng chế tạo, không sửa đổi nó. Lưu ý rằng ghi chú hãng chế tạo có thể bị h�ng."
 
 #: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
 #, c-format
-msgid ""
-"Tag '%s' was of format '%s' (which is against specification) and has been "
-"changed to format '%s'."
-msgstr ""
-"Thẻ \"%s\" có định dạng \"%s\" (mà vi phạm đặc tả) và đã được thay đổi thành "
-"định dạng \"%s\"."
+msgid "Tag '%s' was of format '%s' (which is against specification) and has been changed to format '%s'."
+msgstr "Thẻ \"%s\" có định dạng \"%s\" (mà vi phạm đặc tả) và đã được thay đổi thành định dạng \"%s\"."
 
 #: libexif/exif-entry.c:271
 #, c-format
-msgid ""
-"Tag '%s' is of format '%s' (which is against specification) but cannot be "
-"changed to format '%s'."
-msgstr ""
-"Thẻ \"%s\" có định dạng \"%s\" (mà vi phạm đặc tả) mà không thể thay đổi "
-"thành định dạng \"%s\"."
+msgid "Tag '%s' is of format '%s' (which is against specification) but cannot be changed to format '%s'."
+msgstr "Thẻ \"%s\" có định dạng \"%s\" (mà vi phạm đặc tả) mà không thể thay đổi thành định dạng \"%s\"."
 
 #: libexif/exif-entry.c:354
 #, c-format
-msgid ""
-"Tag 'UserComment' had invalid format '%s'. Format has been set to "
-"'undefined'."
-msgstr ""
-"Thẻ \"Ngư�i dùng Ghi chú\" có định dạng không hợp lệ \"%s\". �ịnh dạng nó đã "
-"được đặt thành \"chưa định nghĩa\"."
+msgid "Tag 'UserComment' had invalid format '%s'. Format has been set to 'undefined'."
+msgstr "Thẻ \"Ngư�i dùng Ghi chú\" có định dạng không hợp lệ \"%s\". �ịnh dạng nó đã được đặt thành \"chưa định nghĩa\"."
 
 #: libexif/exif-entry.c:381
-msgid ""
-"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
-"the specification."
-msgstr ""
-"Thẻ \"Ngư�i dùng Ghi chú\" đã được mở rộng đến ít nhất 8 byte để tùy theo "
-"đặc tả."
+msgid "Tag 'UserComment' has been expanded to at least 8 bytes in order to follow the specification."
+msgstr "Thẻ \"Ngư�i dùng Ghi chú\" đã được mở rộng đến ít nhất 8 byte để tùy theo đặc tả."
 
 #: libexif/exif-entry.c:396
-msgid ""
-"Tag 'UserComment' is not empty but does not start with a format identifier. "
-"This has been fixed."
-msgstr ""
-"Thẻ \"Ngư�i dùng Ghi chú\" khác trống mà không bắt đầu với dấu hiệu định "
-"dạng: đã được sửa."
+msgid "Tag 'UserComment' is not empty but does not start with a format identifier. This has been fixed."
+msgstr "Thẻ \"Ngư�i dùng Ghi chú\" khác trống mà không bắt đầu với dấu hiệu định dạng: đã được sửa."
 
 #: libexif/exif-entry.c:424
-msgid ""
-"Tag 'UserComment' did not start with a format identifier. This has been "
-"fixed."
-msgstr ""
-"Thẻ \"Ngư�i dùng Ghi chú\" không bắt đầu với dấu hiệu định dạng: đã được sửa."
+msgid "Tag 'UserComment' did not start with a format identifier. This has been fixed."
+msgstr "Thẻ \"Ngư�i dùng Ghi chú\" không bắt đầu với dấu hiệu định dạng: đã được sửa."
 
 #: libexif/exif-entry.c:462
 #, c-format
@@ -1736,14 +1711,12 @@ msgstr "%i byte kiểu dữ liệu không được hỗ trợ"
 #: libexif/exif-entry.c:642
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
-"Thẻ \"%s\" chứa dữ liệu ở định dạng không hợp lệ (\"%s\", mong ch� \"%s\")."
+msgstr "Thẻ \"%s\" chứa dữ liệu ở định dạng không hợp lệ (\"%s\", cần \"%s\")."
 
 #: libexif/exif-entry.c:655
 #, c-format
-msgid ""
-"The tag '%s' contains an invalid number of components (%i, expected %i)."
-msgstr "Thẻ \"%s\" chứa số thành phần không hợp lệ (%i, mong ch� %i)."
+msgid "The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "Thẻ \"%s\" chứa số thành phần không hợp lệ (%i, cần %i)."
 
 #: libexif/exif-entry.c:669
 msgid "Chunky format"
@@ -1756,31 +1729,31 @@ msgstr "�ịnh dạng phẳng"
 #: libexif/exif-entry.c:671 libexif/exif-entry.c:763
 #: test/nls/test-codeset.c:54
 msgid "Not defined"
-msgstr "Chưa xác định"
+msgstr "Chưa định nghĩa"
 
 #: libexif/exif-entry.c:671
 msgid "One-chip color area sensor"
-msgstr "Máy nhạy vùng màu phiến tinh thể đơn"
+msgstr "Cảm biến vùng màu phiến tinh thể đơn"
 
 #: libexif/exif-entry.c:672
 msgid "Two-chip color area sensor"
-msgstr "Máy nhạy vùng màu phiến tinh thể đôi"
+msgstr "Cảm biến vùng màu phiến tinh thể đôi"
 
 #: libexif/exif-entry.c:672
 msgid "Three-chip color area sensor"
-msgstr "Máy nhạy vùng màu phiến ba tinh thể"
+msgstr "Cảm biến vùng màu phiến ba tinh thể"
 
 #: libexif/exif-entry.c:673
 msgid "Color sequential area sensor"
-msgstr "Máy nhạy vùng màu tuần tự"
+msgstr "Cảm biến vùng màu tuần tự"
 
 #: libexif/exif-entry.c:673
 msgid "Trilinear sensor"
-msgstr "Máy nhạy ba tuyến"
+msgstr "Cảm biến ba tuyến"
 
 #: libexif/exif-entry.c:674
 msgid "Color sequential linear sensor"
-msgstr "Máy nhạy tuyến màu tuần tự"
+msgstr "Cảm biến màu tuyến tính"
 
 #: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
@@ -1861,11 +1834,11 @@ msgstr "Tiến trình riêng"
 
 #: libexif/exif-entry.c:687
 msgid "Auto exposure"
-msgstr "Tự động phơi sáng"
+msgstr "Phơi sáng tự động"
 
 #: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
-msgstr "Tự phơi sáng"
+msgstr "Phơi sáng thủ công"
 
 #: libexif/exif-entry.c:687
 msgid "Auto bracket"
@@ -1873,27 +1846,27 @@ msgstr "Tự động đặt giữa"
 
 #: libexif/exif-entry.c:689
 msgid "Auto white balance"
-msgstr "Tự động cán cân trắng"
+msgstr "Cân bằng trắng tự động"
 
 #: libexif/exif-entry.c:689
 msgid "Manual white balance"
-msgstr "Tự cán cân trắng"
+msgstr "Cân bằng trắng bằng tay"
 
 #: libexif/exif-entry.c:694
 msgid "Low gain up"
-msgstr "Lấn lên thấp"
+msgstr "Thấp khuếch đại xuống"
 
 #: libexif/exif-entry.c:694
 msgid "High gain up"
-msgstr "Lấn lên cao"
+msgstr "Cao khuếch đại lên"
 
 #: libexif/exif-entry.c:695
 msgid "Low gain down"
-msgstr "Khuếch đại thấp xuống"
+msgstr "Thấp khuếch đại xuống"
 
 #: libexif/exif-entry.c:695
 msgid "High gain down"
-msgstr "Khuếch đại cao xuống"
+msgstr "Cao khuếch đại xuống"
 
 #: libexif/exif-entry.c:697
 msgid "Low saturation"
@@ -1935,11 +1908,11 @@ msgstr "Tbình"
 
 #: libexif/exif-entry.c:717
 msgid "Center-weight"
-msgstr "Nặng giữa"
+msgstr "Nặng-giữa"
 
 #: libexif/exif-entry.c:719
 msgid "Multi spot"
-msgstr "�a chấm"
+msgstr "�a điểm"
 
 #: libexif/exif-entry.c:720
 msgid "Pattern"
@@ -1947,7 +1920,7 @@ msgstr "Mẫu"
 
 #: libexif/exif-entry.c:725
 msgid "Uncompressed"
-msgstr "Chưa nén"
+msgstr "Không nén"
 
 #: libexif/exif-entry.c:726
 msgid "LZW compression"
@@ -1959,7 +1932,7 @@ msgstr "Nén JPEG"
 
 #: libexif/exif-entry.c:729
 msgid "Deflate/ZIP compression"
-msgstr "Nén Zip/Deflate"
+msgstr "Nén/xả nén Zip"
 
 #: libexif/exif-entry.c:730
 msgid "PackBits compression"
@@ -1967,7 +1940,7 @@ msgstr "Nén PackBits"
 
 #: libexif/exif-entry.c:736
 msgid "Tungsten incandescent light"
-msgstr "�nh sáng nóng sáng Vonfam"
+msgstr "�nh sáng đèn dây tóc"
 
 #: libexif/exif-entry.c:738
 msgid "Fine weather"
@@ -1975,7 +1948,7 @@ msgstr "Tr�i đẹp"
 
 #: libexif/exif-entry.c:739
 msgid "Cloudy weather"
-msgstr "�ầy mây"
+msgstr "�ầy mây"
 
 #: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
@@ -2020,11 +1993,11 @@ msgstr "D75"
 
 #: libexif/exif-entry.c:751
 msgid "ISO studio tungsten"
-msgstr "Vonfam xưởng ISO"
+msgstr "�èn dây tóc trong studio chuẩn ISO"
 
 #: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Inch"
-msgstr "insơ"
+msgstr "Insơ"
 
 #: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "in"
@@ -2044,7 +2017,7 @@ msgstr "Chương trình chuẩn"
 
 #: libexif/exif-entry.c:766
 msgid "Aperture priority"
-msgstr "Ưu tiên Khẩu độ"
+msgstr "Ưu tiên khẩu độ"
 
 #: libexif/exif-entry.c:766 libexif/exif-tag.c:550
 msgid "Aperture"
@@ -2052,7 +2025,7 @@ msgstr "Khẩu độ"
 
 #: libexif/exif-entry.c:767
 msgid "Shutter priority"
-msgstr "Ưu tiên chập"
+msgstr "Ưu tiên tốc độ"
 
 #: libexif/exif-entry.c:767
 msgid "Shutter"
@@ -2085,7 +2058,7 @@ msgstr "Chế độ nằm ngang (chụp phong cảnh với n�n rõ)"
 #: libexif/exif-entry.c:778 libexif/exif-entry.c:783
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
-msgstr "�èn nháy chưa mở"
+msgstr "�èn nháy không chớp"
 
 #: libexif/exif-entry.c:778
 msgid "No flash"
@@ -2093,7 +2066,7 @@ msgstr "Không đèn nháy"
 
 #: libexif/exif-entry.c:779
 msgid "Flash fired"
-msgstr "�èn nháy đã mở"
+msgstr "�èn nháy đã chớp"
 
 #: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
@@ -2172,20 +2145,12 @@ msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr "�èn nháy đã mở, chế độ nháy bắt buộc, chế độ giảm mắt đ�"
 
 #: libexif/exif-entry.c:803
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
-"detected"
-msgstr ""
-"�èn nháy đã mở, chế độ nháy bắt buộc, chế độ giảm mắt đ�, chưa phát hiện ánh "
-"sáng trở v�"
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
+msgstr "�èn nháy đã mở, chế độ nháy bắt buộc, chế độ giảm mắt đ�, chưa phát hiện ánh sáng trở v�"
 
 #: libexif/exif-entry.c:805
-msgid ""
-"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
-"detected"
-msgstr ""
-"�èn nháy đã mở, chế độ nháy bắt buộc, chế độ giảm mắt đ�, chưa phát hiện ánh "
-"sáng trở v�"
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
+msgstr "�èn nháy đã mở, chế độ nháy bắt buộc, chế độ giảm mắt đ�, chưa phát hiện ánh sáng trở v�"
 
 #: libexif/exif-entry.c:807
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
@@ -2196,16 +2161,12 @@ msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "�èn nháy đã mở, chế độ tự động, chế độ giảm mắt đ�"
 
 #: libexif/exif-entry.c:809
-msgid ""
-"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
-"�èn nháy đã mở, chế độ tự động, chưa phát hiện ánh sáng trở v�, chế độ giảm "
-"mắt đ�"
+msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr "�èn nháy đã mở, chế độ tự động, chưa phát hiện ánh sáng trở v�, chế độ giảm mắt đ�"
 
 #: libexif/exif-entry.c:811
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"�èn nháy đã mở, chế độ tự động, phát hiện ánh sáng trở v�, chế độ giảm mắt đ�"
+msgstr "�èn nháy đã mở, chế độ tự động, phát hiện ánh sáng trở v�, chế độ giảm mắt đ�"
 
 #: libexif/exif-entry.c:815
 msgid "?"
@@ -2234,12 +2195,12 @@ msgstr "Adobe RGB"
 
 #: libexif/exif-entry.c:823
 msgid "Uncalibrated"
-msgstr "Chưa định chuẩn"
+msgstr "Chưa cân chuẩn"
 
 #: libexif/exif-entry.c:878
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
-msgstr "Mục nhập có kích cỡ không hợp lệ (%i, mong ch� %li x %i)."
+msgstr "Mục nhập có kích cỡ không hợp lệ (%i, cần %li x %i)."
 
 #: libexif/exif-entry.c:911
 msgid "Unsupported UNICODE string"
@@ -2251,8 +2212,7 @@ msgstr "Chuỗi JIS không được hỗ trợ"
 
 #: libexif/exif-entry.c:935
 msgid "Tag UserComment contains data but is against specification."
-msgstr ""
-"Thẻ \"GhichúNgư�idùng\" (UserComment) chứa dữ liệu nhưng dựa vào đặc tả."
+msgstr "Thẻ \"GhichúNgư�idùng\" (UserComment) chứa dữ liệu nhưng dựa vào đặc tả."
 
 #: libexif/exif-entry.c:939
 #, c-format
@@ -2266,7 +2226,7 @@ msgstr "Không biết phiên bản EXIF"
 #: libexif/exif-entry.c:951
 #, c-format
 msgid "Exif Version %d.%d"
-msgstr "Phiên bản EXIF %d.%d"
+msgstr "EXIF phiên bản %d.%d"
 
 #: libexif/exif-entry.c:962
 msgid "FlashPix Version 1.0"
@@ -2280,19 +2240,19 @@ msgstr "FlashPix phiên bản 1.01"
 msgid "Unknown FlashPix Version"
 msgstr "Không biết phiên bản FlashPix"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1668
+#: libexif/exif-entry.c:1673 libexif/exif-entry.c:1677
+#: libexif/exif-entry.c:1682 libexif/exif-entry.c:1683
 msgid "[None]"
 msgstr "[Không có]"
 
 #: libexif/exif-entry.c:981
 msgid "(Photographer)"
-msgstr "(Nhà nhiếp ảnh)"
+msgstr "(Nhiếp ảnh gia)"
 
 #: libexif/exif-entry.c:1000
 msgid "(Editor)"
-msgstr "(Nhà soạn thảo)"
+msgstr "(Ngư�i sửa)"
 
 #: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
 #: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
@@ -2308,7 +2268,7 @@ msgstr " (f/%.01f)"
 #: libexif/exif-entry.c:1059
 #, c-format
 msgid " (35 equivalent: %d mm)"
-msgstr " (35 tÆ°Æ¡ng Ä‘Æ°Æ¡ng: %d mm)"
+msgstr " (tÆ°Æ¡ng Ä‘Æ°Æ¡ng 35: %d mm)"
 
 #: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
 msgid " sec."
@@ -2373,7 +2333,7 @@ msgstr "B"
 
 #: libexif/exif-entry.c:1149
 msgid "Reserved"
-msgstr "Dành riêng"
+msgstr "�ể dành"
 
 #: libexif/exif-entry.c:1172
 msgid "Directly photographed"
@@ -2400,7 +2360,7 @@ msgstr "Trong há»™p (rá»™ng %i, cao %i) chung quanh (x,y) = (%i,%i)"
 #: libexif/exif-entry.c:1219
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
-msgstr "Số thành phần bất ng� (%li, mong ch� 2, 3, hay 4)."
+msgstr "Số thành phần bất ng� (%li, cần 2, 3, hay 4)."
 
 #: libexif/exif-entry.c:1257
 msgid "Sea level"
@@ -2457,7 +2417,7 @@ msgstr "SDài"
 
 #: libexif/exif-format.c:47
 msgid "Float"
-msgstr "�P�"
+msgstr "DC�"
 
 #: libexif/exif-format.c:48
 msgid "Double"
@@ -2498,441 +2458,279 @@ msgstr "Dữ liệu được cung cấp không tùy theo đặc tả."
 
 #: libexif/exif-tag.c:62
 msgid "GPS Tag Version"
-msgstr "Phiên bản Thẻ GPS"
+msgstr "Phiên bản thẻ GPS"
 
 #: libexif/exif-tag.c:63
-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> "
-"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
-"2.0.0.0, the tag value is 02000000.H)."
-msgstr ""
-"Ngụ ý phiên bản của <IFD thông tin GPS>. Phiên bản được hiển thị là "
-"<2.0.0.0>. Thẻ này bắt buộc khi có thẻ <thông tin GPS>. (Ghi chú: thẻ <ID "
-"phiên bản GPS> được đưa ra theo byte, khác với thẻ <phiên bản Exif>. Khi "
-"phiên bản là <2.0.0.0>, giá trị thẻ là <02000000.H>)."
+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> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H)."
+msgstr "Cho biết phiên bản của <IFD thông tin GPS>. Phiên bản được hiển thị là <2.0.0.0>. Thẻ này bắt buộc khi có thẻ <thông tin GPS>. (Ghi chú: thẻ <ID phiên bản GPS> được đưa ra theo byte, khác với thẻ <phiên bản Exif>. Khi phiên bản là <2.0.0.0>, giá trị thẻ là <02000000.H>)."
 
 #: libexif/exif-tag.c:69
 msgid "Interoperability Index"
-msgstr "Chỉ mục Tương hành"
+msgstr "Chỉ số tương hành"
 
 #: libexif/exif-tag.c:70
-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 ""
-"Ngụ ý cách nhận diện quy tắc khả năng thao tác với nhau. Hãy dùng \"R98\" "
-"cho Quy tắc ExifR98. Bốn byte được dùng, gồm mã kết thúc (RỖNG). Hãy xem tài "
-"liệu riêng Các Quy tắc Khả năng Thao tác với nhau (ExifR98) cho các thẻ khác "
-"được dùng cho ExifR98."
+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 "Cho biết cách nhận diện quy tắc khả năng thao tác với nhau. Hãy dùng \"R98\" cho Quy tắc ExifR98. Bốn byte được dùng, gồm mã kết thúc (RỖNG). Hãy xem tài liệu riêng Các Quy tắc Khả năng Thao tác với nhau (ExifR98) cho các thẻ khác được dùng cho ExifR98."
 
 #: libexif/exif-tag.c:76
 msgid "North or South Latitude"
 msgstr "�ộ vĩ Bắc hay Nam"
 
 #: libexif/exif-tag.c:77
-msgid ""
-"Indicates whether the latitude is north or south latitude. The ASCII value "
-"'N' indicates north latitude, and 'S' is south latitude."
-msgstr ""
-"Ngụ ý có độ vĩ Bắc hay Nam.  Giá trị ASCII <N> ngụ ý độ vĩ Bắc, còn <S> là "
-"độ vĩ Nam."
+msgid "Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
+msgstr "Cho biết có độ vĩ Bắc hay Nam.  Giá trị ASCII <N> cho biết độ vĩ Bắc, còn <S> là độ vĩ Nam."
 
 #: libexif/exif-tag.c:81
 msgid "Interoperability Version"
-msgstr "Phiên bản Tương hành"
+msgstr "Phiên bản tương hành"
 
 #: libexif/exif-tag.c:83
 msgid "Latitude"
-msgstr "�ộ vĩ"
+msgstr "VÄ© Ä‘á»™"
 
 #: libexif/exif-tag.c:84
-msgid ""
-"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."
-msgstr ""
-"Ngụ ý độ vĩ. �ộ vĩ được thế hiện là ba giá trị HỮU TỶ đưa ra độ, phút và "
-"giây riêng từng. Khi thế hiện độ, phút và giây, định dạng là <đđ/1,pp/1,"
-"gg/1>. Khi dùng độ và phút, và, lấy thí dụ, phần độ được đưa ra đến hai lần "
-"số, định dạng là <đđ/1,pppp/100,0/1>."
+msgid "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."
+msgstr "Cho biết độ vĩ. �ộ vĩ được thế hiện là ba giá trị HỮU TỶ đưa ra độ, phút và giây riêng từng. Khi thế hiện độ, phút và giây, định dạng là <đđ/1,pp/1,gg/1>. Khi dùng độ và phút, và, lấy thí dụ, phần độ được đưa ra đến hai lần số, định dạng là <đđ/1,pppp/100,0/1>."
 
 #: libexif/exif-tag.c:91
 msgid "East or West Longitude"
 msgstr "�ộ kinh �ông hay Tây"
 
 #: libexif/exif-tag.c:92
-msgid ""
-"Indicates whether the longitude is east or west longitude. ASCII 'E' "
-"indicates east longitude, and 'W' is west longitude."
-msgstr ""
-"Ngụ ý có độ kinh �ông hay Tây. Giá trị ASCII <E> ngụ ý độ kinh �ông, còn <W> "
-"là độ kinh Tây."
+msgid "Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr "Chỉ ra nó là độ kinh �ông hay Tây. Giá trị ASCII <E> ý là độ kinh �ông, còn <W> là độ kinh Tây."
 
 #: libexif/exif-tag.c:95
 msgid "Longitude"
-msgstr "�ộ kinh"
+msgstr "Kinh Ä‘á»™"
 
 #: libexif/exif-tag.c:96
-msgid ""
-"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."
-msgstr ""
-"Ngụ ý độ kinh. �ộ kinh được thế hiện là ba giá trị HỮU TỶ đưa ra độ, phút và "
-"giây riêng từng. Khi thế hiện độ, phút và giây, định dạng là <đđ/1,pp/1,"
-"gg/1>. Khi dùng độ và phút, và, lấy thí dụ, phần độ được đưa ra đến hai lần "
-"số, định dạng là <đđ/1,pppp/100,0/1>."
+msgid "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."
+msgstr "Cho biết kinh độ. �ộ kinh được thế hiện là ba giá trị HỮU TỶ đưa ra độ, phút và giây riêng từng. Khi thế hiện độ, phút và giây, định dạng là <đđ/1,pp/1,gg/1>. Khi dùng độ và phút, và, lấy thí dụ, phần độ được đưa ra đến hai lần số, định dạng là <đđ/1,pppp/100,0/1>."
 
 #: libexif/exif-tag.c:103
 msgid "Altitude Reference"
-msgstr "Tham chiếu Cao độ"
+msgstr "Tham chiếu cao độ"
 
 #: libexif/exif-tag.c:104
-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 "
-"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."
-msgstr ""
-"Ngụ ý cao độ được dùng là cao độ tham chiếu. Nếu tham chiếu là mặt biển và "
-"cao độ trên mặt biển, đưa ra 0. Nếu cao độ dưới mặt biển, đưa ra 1, và cao "
-"độ được ngụ ý là giá trị tuyệt đối trong thẻ <cao độ GSP>. �ơn vị tham chiếu "
-"là mét. Ghi chú rằng thẻ này là kiểu BYTE, khác với các thẻ tham chiếu khác."
+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 is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GPSAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags."
+msgstr "Cho biết cao độ được dùng là cao độ tham chiếu. Nếu tham chiếu là mặt biển và cao độ trên mặt biển, đưa ra 0. Nếu cao độ dưới mặt biển, đưa ra 1, và cao độ được cho biết là giá trị tuyệt đối trong thẻ GPSAltitude. �ơn vị tham chiếu là mét. Chú ý rằng thẻ này là kiểu BYTE, khác với các thẻ tham chiếu khác."
 
 #: libexif/exif-tag.c:110
 msgid "Altitude"
 msgstr "Cao Ä‘á»™"
 
 #: libexif/exif-tag.c:111
-msgid ""
-"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
-"expressed as one RATIONAL value. The reference unit is meters."
-msgstr ""
-"Ngụ ý cao độ, đựa vào tham chiếu trong <tham chiếu cao độ GPS>. Cao độ được "
-"thế hiện là một giá trị HỮU TỶ. �ơn vị tham chiếu là mét."
+msgid "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters."
+msgstr "Cho biết cao độ, đựa vào tham chiếu trong <tham chiếu cao độ GPS>. Cao độ được thế hiện là một giá trị HỮU TỶ. �ơn vị tham chiếu là mét."
 
 #: libexif/exif-tag.c:114
 msgid "GPS Time (Atomic Clock)"
-msgstr "Gi� GPS (�ồng hồ Nguyên tử)"
+msgstr "Gi� GPS (�ồng hồ nguyên tử)"
 
 #: libexif/exif-tag.c:115
-msgid ""
-"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
-"expressed as three RATIONAL values giving the hour, minute, and second."
-msgstr ""
-"Ngụ ý th�i gian theo UTC (Th�i gian Thế giới). Nhãn th�i gian được thể hiện "
-"theo ba giá trị HỮU TỶ là giá, phút và giây."
+msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr "Cho biết th�i gian theo UTC (Th�i gian Thế giới). Nhãn th�i gian được thể hiện theo ba giá trị HỮU TỶ là giá, phút và giây."
 
 #: libexif/exif-tag.c:118
 msgid "GPS Satellites"
 msgstr "Vệ tinh GPS"
 
 #: libexif/exif-tag.c:119
-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, "
-"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 shall be set to NULL."
-msgstr ""
-"Ngụ ý những vệ tinh GPS được dùng để đo lư�ng. Thẻ này có khả năng diễn tả "
-"số các vệ tinh, mã số của mỗi vệ tinh, góc nâng, góc phương vị, SNR và thông "
-"tin khác theo kiểu ASCII. �ịnh dạng không phải được chỉ ra. Nếu thiết bị "
-"nhận GPS không có khả năng đo lư�ng thì giá trị của thẻ này được đặt thành "
-"NULL (vô giá trị)."
+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, 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 shall be set to NULL."
+msgstr "Cho biết những vệ tinh GPS được dùng để đo lư�ng. Thẻ này có khả năng diễn tả số các vệ tinh, mã số của mỗi vệ tinh, góc nâng, góc phương vị, SNR và thông tin khác theo kiểu ASCII. �ịnh dạng không phải được chỉ ra. Nếu thiết bị nhận GPS không có khả năng đo lư�ng thì giá trị của thẻ này được đặt thành NULL (vô giá trị)."
 
 #: libexif/exif-tag.c:125
 msgid "GPS Receiver Status"
 msgstr "Trạng thái máy nhận GPS"
 
 #: libexif/exif-tag.c:126
-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 ""
-"Ngụ ý trạng thái của thiết bị nhận GPS vào lúc thu ảnh. \"A\" có nghĩa là "
-"đang đo lư�ng; \"V\" có nghĩa là sự đo là Tương hành."
+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 "Cho biết trạng thái của thiết bị nhận GPS vào lúc thu ảnh. \"A\" có nghĩa là đang đo lư�ng; \"V\" có nghĩa là sự đo là Tương hành."
 
 #: libexif/exif-tag.c:129
 msgid "GPS Measurement Mode"
 msgstr "Chế độ �o GPS"
 
 #: libexif/exif-tag.c:130
-msgid ""
-"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
-"and '3' means three-dimensional measurement is in progress."
-msgstr ""
-"Ngụ ý chế độ đo lư�ng GPS. \"2\" có nghĩa là đang đo lư�ng theo hai chi�u ; "
-"\"3\" có nghĩa là đang đo lư�ng theo ba chi�u (3D)."
+msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
+msgstr "Cho biết chế độ đo lư�ng GPS. \"2\" có nghĩa là đang đo lư�ng theo hai chi�u ; \"3\" có nghĩa là đang đo lư�ng theo ba chi�u (3D)."
 
 #: libexif/exif-tag.c:133
 msgid "Measurement Precision"
-msgstr "�o Chính Xác"
+msgstr "�ộ chính xác đo lư�ng"
 
 #: libexif/exif-tag.c:134
-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 ""
-"Ngụ ý DOP của GPS (độ chính xác của dữ liệu). Giá trị HDOP được ghi trong "
-"khi đo lư�ng theo hai chi�u, và giá trị PDOP được ghi trong khi đo lư�ng "
-"theo ba chi�u."
+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 "Cho biết DOP của GPS (độ chính xác của dữ liệu). Giá trị HDOP được ghi trong khi đo lư�ng theo hai chi�u, và giá trị PDOP được ghi trong khi đo lư�ng theo ba chi�u."
 
 #: libexif/exif-tag.c:137
 msgid "Speed Unit"
 msgstr "�ơn vị Tốc độ"
 
 #: libexif/exif-tag.c:138
-msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
-"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
-"Ngụ ý đơn vị dùng để thể hiện tốc độ di chuyển của thiết bị nhận GPS:\n"
-" • K\tkilômét/gi�\n"
-" • M\tlý/gi�\n"
-" • N\thải lý"
+"Cho biết đơn vị dùng để thể hiện tốc độ di chuyển của thiết bị nhận GPS:\n"
+" * K\tkilômét/gi�\n"
+" * M\tdặm/gi�\n"
+" * N\thải lý"
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS Receiver"
-msgstr "Tốc độ máy nhận GPS"
+msgstr "Tốc độ bộ nhận GPS"
 
 #: libexif/exif-tag.c:142
 msgid "Indicates the speed of GPS receiver movement."
-msgstr "Ngụ ý tốc độ di chuyển của thiết bị nhận GPS."
+msgstr "Cho biết tốc độ di chuyển của thiết bị nhận GPS."
 
 #: libexif/exif-tag.c:143
 msgid "Reference for direction of movement"
 msgstr "Tham chiếu v� hướng di chuyển"
 
 #: libexif/exif-tag.c:144
-msgid ""
-"Indicates the reference for giving the direction of GPS receiver movement. "
-"'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"Ngụ ý tham chiếu để cung cấp hướng theo đó thiết bị nhận GPS di chuyển. \"T"
-"\" là hướng đúng, còn \"M\" là hướng từ."
+msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Cho biết tham chiếu để cung cấp hướng theo đó thiết bị nhận GPS di chuyển. \"T\" là hướng đúng, còn \"M\" là hướng từ."
 
 #: libexif/exif-tag.c:147
 msgid "Direction of Movement"
 msgstr "Hướng di chuyển"
 
 #: libexif/exif-tag.c:148
-msgid ""
-"Indicates the direction of GPS receiver movement. The range of values is "
-"from 0.00 to 359.99."
-msgstr ""
-"Ngụ ý hướng theo đó thiết bị nhận GPS di chuyển. Giá trị nằm trong phạm vi "
-"0.00 đến 359.99."
+msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
+msgstr "Cho biết hướng theo đó thiết bị nhận GPS di chuyển. Giá trị nằm trong phạm vi 0.00 đến 359.99."
 
 #: libexif/exif-tag.c:150
 msgid "GPS Image Direction Reference"
 msgstr "Tham chiếu Hướng Ảnh GPS"
 
 #: libexif/exif-tag.c:151
-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 ""
-"Ngụ ý tham chiếu để cung cấp hướng của ảnh khi nó được bắt. \"T\" là hướng "
-"đúng, còn \"M\" là hướng từ."
+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 "Cho biết tham chiếu để cung cấp hướng của ảnh khi nó được bắt. \"T\" là hướng đúng, còn \"M\" là hướng từ."
 
 #: libexif/exif-tag.c:153
 msgid "GPS Image Direction"
 msgstr "Hướng ảnh GPS"
 
 #: libexif/exif-tag.c:154
-msgid ""
-"Indicates the direction of the image when it was captured. The range of "
-"values is from 0.00 to 359.99."
-msgstr ""
-"Ngụ ý hướng của ảnh khi nó được bắt. Giá trị nằm trong phạm vi 0.00 đến "
-"359.99."
+msgid "Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99."
+msgstr "Cho biết hướng của ảnh khi nó được bắt. Giá trị nằm trong phạm vi 0.00 đến 359.99."
 
 #: libexif/exif-tag.c:156
 msgid "Geodetic Survey Data Used"
 msgstr "Dùng dữ liệu quan sát đo đạc"
 
 #: libexif/exif-tag.c:157
-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'. "
-"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
-"recorded."
-msgstr ""
-"Ngụ ý dữ liệu quan sát đo đạc được dùng bởi thiết bị nhận GPS. Nếu dữ liệu "
-"quan sát bị giới hạn ở Nhật bản thì giá trị của thẻ này là \"TOKYO\" hay "
-"\"WGS-84\". Nếu một thẻ Thông tin GPS được ghi thì rất khuyên cũng ghi thẻ "
-"này."
+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'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
+msgstr "Cho biết dữ liệu quan sát đo đạc được dùng bởi thiết bị nhận GPS. Nếu dữ liệu quan sát bị giới hạn ở Nhật bản thì giá trị của thẻ này là \"TOKYO\" hay \"WGS-84\". Nếu một thẻ Thông tin GPS được ghi thì rất khuyên cũng ghi thẻ này."
 
 #: libexif/exif-tag.c:161
 msgid "Reference For Latitude of Destination"
 msgstr "Tham chiếu v� độ vĩ của đích đến"
 
 #: libexif/exif-tag.c:162
-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 ""
-"Ngụ ý nếu đích đến có độ vĩ Bắc hay Nam. Giá trị ASCII \"N\" ngụ ý độ vĩ "
-"Bắc, còn \"S\" là độ vĩ Nam."
+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 "Cho biết nếu đích đến có độ vĩ Bắc hay Nam. Giá trị ASCII \"N\" cho biết độ vĩ Bắc, còn \"S\" là độ vĩ Nam."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of Destination"
 msgstr "�ộ vĩ đích"
 
 #: libexif/exif-tag.c:166
-msgid ""
-"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."
-msgstr ""
-"Ngụ ý độ vĩ của điểm đích đến. �ộ vĩ được thế hiện là ba giá trị HỮU TỶ đưa "
-"ra độ, phút và giây riêng từng. Khi thế hiện độ, phút và giây, định dạng "
-"thư�ng là \"đđ/1,pp/1,gg/1\". Khi dùng độ và phút, và, lấy thí dụ, phần độ "
-"được đưa ra đến hai lần số, định dạng là \"đđ/1,pppp/100,0/1\"."
+msgid "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."
+msgstr "Cho biết độ vĩ của điểm đích đến. �ộ vĩ được thế hiện là ba giá trị HỮU TỶ đưa ra độ, phút và giây riêng từng. Khi thế hiện độ, phút và giây, định dạng thư�ng là \"đđ/1,pp/1,gg/1\". Khi dùng độ và phút, và, lấy thí dụ, phần độ được đưa ra đến hai lần số, định dạng là \"đđ/1,pppp/100,0/1\"."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for Longitude of Destination"
 msgstr "Tham chiếu v� kinh độ của đích đến"
 
 #: libexif/exif-tag.c:174
-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 ""
-"Ngụ ý nếu đích đến có độ kinh �ông hay Tây. Giá trị ASCII \"E\" ngụ ý độ "
-"kinh �ông, còn \"W\" là độ kinh Tây."
+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 "Cho biết nếu đích đến có độ kinh �ông hay Tây. Giá trị ASCII \"E\" cho biết độ kinh �ông, còn \"W\" là độ kinh Tây."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of Destination"
-msgstr "�ộ kinh đích"
+msgstr "Kinh độ của đích"
 
 #: libexif/exif-tag.c:178
-msgid ""
-"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."
-msgstr ""
-"Ngụ ý độ kinh của điểm đích đến. �ộ kinh được thế hiện là ba giá trị HỮU TỶ "
-"đưa ra độ, phút và giây riêng từng. Khi thế hiện độ, phút và giây, định dạng "
-"là \"đđ/1,pp/1,gg/1\". Khi dùng độ và phút, và, lấy thí dụ, phần độ được đưa "
-"ra đến hai lần số, định dạng là \"đđ/1,pppp/100,0/1\"."
+msgid "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."
+msgstr "Cho biết độ kinh của điểm đích đến. �ộ kinh được thế hiện là ba giá trị HỮU TỶ đưa ra độ, phút và giây riêng từng. Khi thế hiện độ, phút và giây, định dạng là \"đđ/1,pp/1,gg/1\". Khi dùng độ và phút, và, lấy thí dụ, phần độ được đưa ra đến hai lần số, định dạng là \"đđ/1,pppp/100,0/1\"."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for Bearing of Destination"
 msgstr "Tham chiếu v� vị trí phương hướng của đích đến"
 
 #: libexif/exif-tag.c:187
-msgid ""
-"Indicates the reference used for giving the bearing to the destination "
-"point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr ""
-"Ngụ ý tham chiếu dùng để cung cấp vị trí phương hướng tới điểm đích đến. \"T"
-"\" là hướng đúng, còn \"M\" là hướng từ."
+msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr "Cho biết tham chiếu dùng để cung cấp vị trí phương hướng tới điểm đích đến. \"T\" là hướng đúng, còn \"M\" là hướng từ."
 
 #: libexif/exif-tag.c:190
 msgid "Bearing of Destination"
 msgstr "Vị trí phương hướng đích"
 
 #: libexif/exif-tag.c:191
-msgid ""
-"Indicates the bearing to the destination point. The range of values is from "
-"0.00 to 359.99."
-msgstr ""
-"Ngụ ý vị trí phương hướng tới điểm đích đến. Giá trị nằm trong phạm vi 0.00 "
-"đến 359.99."
+msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
+msgstr "Cho biết vị trí phương hướng tới điểm đích đến. Giá trị nằm trong phạm vi 0.00 đến 359.99."
 
 #: libexif/exif-tag.c:193
 msgid "Reference for Distance to Destination"
 msgstr "Tham chiếu v� khoảng cách đích đến"
 
 #: libexif/exif-tag.c:194
-msgid ""
-"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
-msgstr ""
-"Chỉ ra đơn vị dùng để biểu diễn khoảng cách tới điểm đích đến. 'K', 'M' và "
-"'N' tương ứng với kilômét, dặm và hải lý."
+msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr "Chỉ ra đơn vị dùng để biểu diễn khoảng cách tới điểm đích đến. “K�, “M� và “N� tương ứng với kilômét, dặm và hải lý."
 
 #: libexif/exif-tag.c:197
 msgid "Distance to Destination"
-msgstr "Cách đích"
+msgstr "Khoảng cách đến đích"
 
 #: libexif/exif-tag.c:198
 msgid "Indicates the distance to the destination point."
-msgstr "Ngụ ý khoảng cách tới điểm đích đến."
+msgstr "Cho biết khoảng cách tới điểm đích đến."
 
 #: libexif/exif-tag.c:199
 msgid "Name of GPS Processing Method"
 msgstr "Tên của phương pháp xử lý GPS"
 
 #: libexif/exif-tag.c:200
-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. Since the Type is not ASCII, NULL "
-"termination is not necessary."
-msgstr ""
-"Một chuỗi ký tự mà ghi tên của phương pháp dùng để tìm vị trí. Byte đầu tiên "
-"ngụ ý mã ký tự, sau đó là tên của phương pháp. Vì Kiểu khác ASCII, không cần "
-"chấm dứt."
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Một chuỗi ký tự mà ghi tên của phương pháp dùng để tìm vị trí. Byte đầu tiên cho biết mã ký tự, sau đó là tên của phương pháp. Vì Kiểu khác ASCII, không cần chấm dứt."
 
 #: libexif/exif-tag.c:205
 msgid "Name of GPS Area"
 msgstr "Tên của vùng GPS"
 
 #: libexif/exif-tag.c:206
-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. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
-"Một chuỗi ký tự mà ghi tên của vùng GPS. Byte đầu tiên ngụ ý mã ký tự, sau "
-"đó là tên của vùng GPS. Vì Kiểu khác ASCII, không cần chấm dứt."
+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. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr "Một chuỗi ký tự mà ghi tên của vùng GPS. Byte đầu tiên cho biết mã ký tự, sau đó là tên của vùng GPS. Vì Kiểu khác ASCII, không cần chấm dứt."
 
 #: libexif/exif-tag.c:210
 msgid "GPS Date"
 msgstr "Ngày GPS"
 
 #: libexif/exif-tag.c:211
-msgid ""
-"A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
-"the string is 11 bytes including NULL."
-msgstr ""
-"Một chuỗi ký tự mà ghi thông tin v� ngày tháng và th�i gian tương ứng với "
-"UTC (Th�i gian Thế giới). �ịnh dạng là \"NNNN:TT:nn\". Chi�u dài của chuỗi "
-"là 11 byte bao gồm NULL."
+msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
+msgstr "Một chuỗi ký tự mà ghi thông tin v� ngày tháng và th�i gian tương ứng với UTC (Th�i gian Thế giới). �ịnh dạng là \"NNNN:TT:nn\". Chi�u dài của chuỗi là 11 byte bao gồm NULL."
 
 #: libexif/exif-tag.c:215
 msgid "GPS Differential Correction"
 msgstr "Sửa chữa phân biệt GPS"
 
 #: libexif/exif-tag.c:216
+msgid "Indicates whether differential correction is applied to the GPS receiver."
+msgstr "Cho biết nếu chức năng sửa chữa phân biệt được áp dụng cho thiết bị nhận GPS hay không."
+
+#: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
 msgid ""
-"Indicates whether differential correction is applied to the GPS receiver."
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
 msgstr ""
-"Ngụ ý nếu chức năng sửa chữa phân biệt được áp dụng cho thiết bị nhận GPS "
-"hay không."
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr "Kiểu tập tin con mới"
 
@@ -2942,135 +2740,83 @@ msgstr "Sự chỉ chung v� kiểu dữ liệu được chứa trong tập tin
 
 #: libexif/exif-tag.c:222
 msgid "Image Width"
-msgstr "Rộng Ảnh"
+msgstr "Chi�u rộng ảnh"
 
 #: libexif/exif-tag.c:223
-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 ""
-"Số cột dữ liệu ảnh, bằng số điểm ảnh trong mỗi hàng. Trong dữ liệu đã nén "
-"JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
+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 "Số cột dữ liệu ảnh, bằng số điểm ảnh trong mỗi hàng. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
 
 #: libexif/exif-tag.c:227
 msgid "Image Length"
-msgstr "Dài Ảnh"
+msgstr "Chi�u cao ảnh"
 
 #: libexif/exif-tag.c:228
-msgid ""
-"The number of rows of image data. In JPEG compressed data a JPEG marker is "
-"used instead of this tag."
-msgstr ""
-"Số hàng dữ liệu ảnh. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng "
-"thay vào thẻ này."
+msgid "The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Số hàng dữ liệu ảnh. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
 msgstr "Bit/mẫu"
 
 #: libexif/exif-tag.c:232
-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 "
-"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
-"this tag."
-msgstr ""
-"Số bit trong mỗi thành phần ảnh. �ối với tiêu chuẩn này, mỗi thành phần của "
-"ảnh chiếm 8 bit, thì giá trị của thẻ này là 8. Xem thêm <SamplesPerPixel> "
-"(mẫu trên địểm ảnh). Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng "
-"thay vào thẻ này."
+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 <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Số bit trong mỗi thành phần ảnh. �ối với tiêu chuẩn này, mỗi thành phần của ảnh chiếm 8 bit, thì giá trị của thẻ này là 8. Xem thêm <SamplesPerPixel> (mẫu trên địểm ảnh). Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
 msgstr "Nén"
 
 #: libexif/exif-tag.c:238
-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 ""
-"Lược đồ nén được dùng cho dữ liệu ảnh. Khi một ảnh chính được nén dạng JPEG, "
-"sự chỉ rõ này không cần thiết nên bị b� đi. Khi hình thu nh� dùng nén JPEG, "
-"giá trị thẻ này được đặt là 6."
+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 "Lược đồ nén được dùng cho dữ liệu ảnh. Khi một ảnh chính được nén dạng JPEG, sự chỉ rõ này không cần thiết nên bị b� đi. Khi hình thu nh� dùng nén JPEG, giá trị thẻ này được đặt là 6."
 
 #: libexif/exif-tag.c:244
 msgid "Photometric Interpretation"
 msgstr "Thông dịch �o Ảnh chụp"
 
 #: libexif/exif-tag.c:245
-msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
-msgstr ""
-"Sự hợp thành điểm ảnh. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được "
-"dùng thay vào thẻ này."
+msgid "The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr "Sự hợp thành điểm ảnh. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
 
 #: libexif/exif-tag.c:249
 msgid "Fill Order"
-msgstr "Thứ tự Tô đầy"
+msgstr "Thứ tự tô đầy"
 
 #: libexif/exif-tag.c:251
 msgid "Document Name"
-msgstr "Tên Tài liệu"
+msgstr "Tên tài liệu"
 
 #: libexif/exif-tag.c:253
 msgid "Image Description"
-msgstr "Mô tả Ảnh"
+msgstr "Mô tả ảnh"
 
 #: libexif/exif-tag.c:254
-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 "
-"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
-"is to be used."
-msgstr ""
-"Chuỗi ký tự chỉ tên ảnh. Nó có thể là chú thích như \"�i chơi với bạn bè\". "
-"Không thể sử dụng mã ký tự byte đôi. Khi mã byte đôi cần thiết, hãy dùng thẻ "
-"Exif Rieng <Ngư�i dùng ghi chú>."
+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 used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used."
+msgstr "Chuỗi ký tự chỉ tên ảnh. Nó có thể là chú thích như \"�i chơi với bạn bè\". Không thể sử dụng mã ký tự byte đôi. Khi mã byte đôi cần thiết, hãy dùng thẻ Exif Rieng <Ngư�i dùng ghi chú>."
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
 msgstr "Hãng chế tạo"
 
 #: libexif/exif-tag.c:261
-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 ""
-"Hãng chế tạo thiết bị thu thanh. Nó là hãng chế tạo DSC, máy quét, bộ số tự "
-"hóa ảnh động hay thiết bị khác đã tạo ra ảnh. Khi trư�ng trống, nó được xử "
-"lý là không rõ."
+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 "Hãng chế tạo thiết bị thu thanh. Nó là hãng chế tạo DSC, máy quét, bộ số tự hóa ảnh động hay thiết bị khác đã tạo ra ảnh. Khi trư�ng trống, nó được xử lý là không rõ."
 
 #: libexif/exif-tag.c:267
 msgid "Model"
 msgstr "Mô hình"
 
 #: libexif/exif-tag.c:268
-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 ""
-"Tên hay số mô hình của thiết bị. Giá trị này là tên hay số mô hình của DSC, "
-"máy quét, bộ số tự hóa ảnh động hay thiết bị khác đã tạo ra ảnh. Khi trư�ng "
-"trống, nó được xử lý là không rõ."
+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 "Tên hay số mô hình của thiết bị. Giá trị này là tên hay số mô hình của DSC, máy quét, bộ số tự hóa ảnh động hay thiết bị khác đã tạo ra ảnh. Khi trư�ng trống, nó được xử lý là không rõ."
 
 #: libexif/exif-tag.c:273
 msgid "Strip Offsets"
 msgstr "Hiệu số mảnh"
 
 #: libexif/exif-tag.c:274
-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 "
-"JPEG compressed data this designation is not needed and is omitted. See also "
-"<RowsPerStrip> and <StripByteCounts>."
-msgstr ""
-"Cho mỗi mảnh, hiệu số byte của mảnh đó. Khuyên ch�n nó để bảo đảm số byte "
-"mảnh không phải hơn 64 Kb. �ối với dữ liệu đã nén JPEG, không cần sự chỉ rõ "
-"này nên nó bị b� đi. Xem thêm <hàng trên mảnh> và <số byte mảnh>."
+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 JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>."
+msgstr "Cho mỗi mảnh, hiệu số byte của mảnh đó. Khuyên ch�n nó để bảo đảm số byte mảnh không phải hơn 64 Kb. �ối với dữ liệu đã nén JPEG, không cần sự chỉ rõ này nên nó bị b� đi. Xem thêm <hàng trên mảnh> và <số byte mảnh>."
 
 #: libexif/exif-tag.c:280
 msgid "Orientation"
@@ -3085,296 +2831,160 @@ msgid "Samples per Pixel"
 msgstr "Mẫu/�iểm ảnh"
 
 #: libexif/exif-tag.c:285
-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 ""
-"Số thành phần trên mỗi điểm ảnh. Vì tiêu chuẩn này áp dụng vào ảnh kiểu RGB "
-"và YCbCr, giá trị được đặt cho thẻ này là 3. Trong dữ liệu đã nén JPEG, một "
-"dấu hiệu JPEG được dùng thay vào thẻ này."
+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 "Số thành phần trên mỗi điểm ảnh. Vì tiêu chuẩn này áp dụng vào ảnh kiểu RGB và YCbCr, giá trị được đặt cho thẻ này là 3. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
 
 #: libexif/exif-tag.c:290
 msgid "Rows per Strip"
 msgstr "Hàng/Mảnh"
 
 #: libexif/exif-tag.c:291
-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 "
-"designation is not needed and is omitted. See also <StripOffsets> and "
-"<StripByteCounts>."
-msgstr ""
-"Số hàng trên mỗi mảnh, số hàng trong ảnh của một mãnh khi ảnh chia cho nhi�u "
-"mảnh. �ối với dữ liệu đã nén JPEG, không cần sự chỉ rõ này nên nó bị b� đi. "
-"Xem them <Hiệu số mảnh> và <số byte mảnh>."
+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 designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>."
+msgstr "Số hàng trên mỗi mảnh, số hàng trong ảnh của một mãnh khi ảnh chia cho nhi�u mảnh. �ối với dữ liệu đã nén JPEG, không cần sự chỉ rõ này nên nó bị b� đi. Xem them <Hiệu số mảnh> và <số byte mảnh>."
 
 #: libexif/exif-tag.c:297
 msgid "Strip Byte Count"
 msgstr "Byte/Mảnh"
 
 #: libexif/exif-tag.c:298
-msgid ""
-"The total number of bytes in each strip. With JPEG compressed data this "
-"designation is not needed and is omitted."
-msgstr ""
-"Tổng số byte trên mỗi mảnh. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG "
-"được dùng thay vào thẻ này."
+msgid "The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted."
+msgstr "Tổng số byte trên mỗi mảnh. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
 
 #: libexif/exif-tag.c:301
 msgid "X-Resolution"
 msgstr "Phân giải X"
 
 #: libexif/exif-tag.c:302
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
-"When the image resolution is unknown, 72 [dpi] is designated."
-msgstr ""
-"Số điểm ảnh trên mỗi <đơn vị phân giải> v� hướng <rộng ảnh>. Khi không biết "
-"độ phân giải của ảnh, giá trị mặc định là 72 [dpi, chấm trên mỗi insơ bình "
-"phÆ°Æ¡ng]."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
+msgstr "Số điểm ảnh trên mỗi <đơn vị phân giải> v� hướng <rộng ảnh>. Khi không biết độ phân giải của ảnh, giá trị mặc định là 72 [dpi, chấm trên mỗi insơ bình phương]."
 
 #: libexif/exif-tag.c:306
 msgid "Y-Resolution"
 msgstr "Phân giải Y"
 
 #: libexif/exif-tag.c:307
-msgid ""
-"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
-"The same value as <XResolution> is designated."
-msgstr ""
-"Số điểm ảnh trên mỗi <đơn vị phân giải> v� hướng <dài ảnh>. Khi không biết "
-"độ phân giải của ảnh, giá trị mặc định là 72 [dpi, chấm trên mỗi insơ bình "
-"phÆ°Æ¡ng]."
+msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
+msgstr "Số điểm ảnh trên mỗi <đơn vị phân giải> v� hướng <dài ảnh>. Khi không biết độ phân giải của ảnh, giá trị mặc định là 72 [dpi, chấm trên mỗi insơ bình phương]."
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
-msgstr "Cấu hình Phẳng"
+msgstr "Cấu hình phẳng"
 
 #: libexif/exif-tag.c:312
-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 ""
-"Ngụ ý nếu thành phần điểm ảnh được thu thanh trong định dạng kiểu từng đoạn "
-"hay phẳng. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào "
-"thẻ này. Nếu không có trư�ng này, giả sử giá trị TIFF mặc định: 1 (kiểu từng "
-"đoạn)."
+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 "Cho biết nếu thành phần điểm ảnh được thu thanh trong định dạng kiểu từng đoạn hay phẳng. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này. Nếu không có trư�ng này, giả sử giá trị TIFF mặc định: 1 (kiểu từng đoạn)."
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
 msgstr "�ơn vị Phân giải"
 
 #: libexif/exif-tag.c:318
-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 ""
-"�ơn vị đo <độ phân giải X> và <độ phân giải Y> (cùng một đơn vị cho cả hai "
-"giá trị). Nếu không biết độ phân giải của ảnh, có đặt giá trị 2 (insơ)."
+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 "�ơn vị đo <độ phân giải X> và <độ phân giải Y> (cùng một đơn vị cho cả hai giá trị). Nếu không biết độ phân giải của ảnh, có đặt giá trị 2 (insơ)."
 
 #: libexif/exif-tag.c:323
 msgid "Transfer Function"
-msgstr "Hàm Truy�n"
+msgstr "Hàm truy�n"
 
 #: libexif/exif-tag.c:324
-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 ""
-"Hàm truy�n cho ảnh, được diễn tả trong kiểu dáng bảng. Bình thư�ng, không "
-"cần thẻ này, vì vùng màu được ghi rõ trong thẻ thông tin vùng màu (<vùng "
-"màu>)."
+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 "Hàm truy�n cho ảnh, được diễn tả trong kiểu dáng bảng. Bình thư�ng, không cần thẻ này, vì vùng màu được ghi rõ trong thẻ thông tin vùng màu (<vùng màu>)."
 
 #: libexif/exif-tag.c:328
 msgid "Software"
 msgstr "Phần m�m"
 
 #: libexif/exif-tag.c:329
-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 "
-"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."
-msgstr ""
-"Thẻ này ghi lưu tên và phiên bản của phần m�m hay phần vững của máy ảnh hay "
-"thiết bị ảnh được dùng để tạo ra ảnh. Không ghi rõ định dạng chi tiết, nhưng "
-"mà khuyên theo thí dụ được hiển thị bên dưới. Khi trư�ng này trống, giá trị "
-"được xử lý là không rõ."
+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 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."
+msgstr "Thẻ này ghi lưu tên và phiên bản của phần m�m hay phần vững của máy ảnh hay thiết bị ảnh được dùng để tạo ra ảnh. Không ghi rõ định dạng chi tiết, nhưng mà khuyên theo thí dụ được hiển thị bên dưới. Khi trư�ng này trống, giá trị được xử lý là không rõ."
 
 #: libexif/exif-tag.c:336
 msgid "Date and Time"
 msgstr "Ngày và Gi�"
 
 #: libexif/exif-tag.c:337
-msgid ""
-"The date and time of image creation. In this standard (EXIF-2.1) it is the "
-"date and time the file was changed."
-msgstr ""
-"Ngày và giở tạo ảnh. Trong tiêu chuẩn này (EXIF-2.1), nó là ngày và gi� sửa "
-"đổi tập tin."
+msgid "The date and time of image creation. In this standard (EXIF-2.1) it is the date and time the file was changed."
+msgstr "Ngày và giở tạo ảnh. Trong tiêu chuẩn này (EXIF-2.1), nó là ngày và gi� sửa đổi tập tin."
 
 #: libexif/exif-tag.c:340
 msgid "Artist"
 msgstr "Nghệ sĩ"
 
 #: libexif/exif-tag.c:341
-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 "
-"the information be written as in the example below for ease of "
-"Interoperability. When the field is left blank, it is treated as unknown."
-msgstr ""
-"Thẻ này ghi lưu tên của ngư�i sở hữu máy ảnh, nhà nhiếp ảnh hay ngư�i tạo "
-"ảnh. Không ghi rõ định dạng chi tiết, nhưng mà khuyên ghi thông tin theo thí "
-"dụ bên dưới, để làm dễ dàng thao thác với nhau. Khi trư�ng này trống, giá "
-"trị được xử lý là không rõ."
+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 the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown."
+msgstr "Thẻ này ghi lưu tên của ngư�i sở hữu máy ảnh, nhà nhiếp ảnh hay ngư�i tạo ảnh. Không ghi rõ định dạng chi tiết, nhưng mà khuyên ghi thông tin theo thí dụ bên dưới, để làm dễ dàng thao thác với nhau. Khi trư�ng này trống, giá trị được xử lý là không rõ."
 
 #: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr "�iểm Trắng"
 
 #: libexif/exif-tag.c:348
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the color space information tag "
-"(<ColorSpace>)."
-msgstr ""
-"Sắc độ của điểm trắng của ảnh. Bình thư�ng, không cần thẻ này, vì mi�n màu "
-"được ghi rõ trong thẻ thông tin mi�n màu (<ColorSpace>)."
+msgid "The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Sắc độ của điểm trắng của ảnh. Bình thư�ng, không cần thẻ này, vì mi�n màu được ghi rõ trong thẻ thông tin mi�n màu (<ColorSpace>)."
 
 #: libexif/exif-tag.c:353
 msgid "Primary Chromaticities"
-msgstr "Sắc độ Chính"
+msgstr "Sắc độ chính"
 
 #: libexif/exif-tag.c:354
-msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since color space is specified in the color space "
-"information tag (<ColorSpace>)."
-msgstr ""
-"Sắc độ của ba màu chính của ảnh. Bình thư�ng, không cần thẻ này, vì mi�n màu "
-"được ghi rõ trong thẻ thông tin mi�n màu (<ColorSpace>)."
+msgid "The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>)."
+msgstr "Sắc độ của ba màu chính của ảnh. Bình thư�ng, không cần thẻ này, vì mi�n màu được ghi rõ trong thẻ thông tin mi�n màu (<ColorSpace>)."
 
 #: libexif/exif-tag.c:359
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
-"�ược định nghĩa bởi Công ty Adobe để bật khả năng Cây TIFF ở trong tập tin "
-"TIFF."
+msgstr "�ược định nghĩa bởi Công ty Adobe để bật khả năng Cây TIFF ở trong tập tin TIFF."
 
 #: libexif/exif-tag.c:362
 msgid "Transfer Range"
-msgstr "Phạm vị Truy�n"
+msgstr "Vùng truy�n"
 
 #: libexif/exif-tag.c:366
 msgid "JPEG Interchange Format"
-msgstr "�ịnh dạng Hoán đổi JPEG"
+msgstr "�ịnh dạng hoán đổi JPEG"
 
 #: libexif/exif-tag.c:367
-msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
-msgstr ""
-"Hiệu số tới byte đầu (SOI) cũa dữ liệu hình thu nh� đã nén JPEG. Không dùng "
-"cho dữ liệu JPEG ảnh chính."
+msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
+msgstr "Hiệu số tới byte đầu (SOI) cũa dữ liệu hình thu nh� đã nén JPEG. Không dùng cho dữ liệu JPEG ảnh chính."
 
 #: libexif/exif-tag.c:372
 msgid "JPEG Interchange Format Length"
-msgstr "�ộ dài �ịnh dạng Hoán đổi JPEG"
+msgstr "�ộ dài �ịnh dạng hoán đổi JPEG"
 
 #: libexif/exif-tag.c:373
-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 ""
-"Số byte dữ liệu hình thu nh� đã nén JPEG. Không dùng cho dữ liệu JPEG ảnh "
-"chính. Hình thu nh� JPEG không được chia ra, nhưng được thu thanh dạng luồng "
-"bit JPEG liên tục từ SOI đến EOI. Dấu hiệu Appn và COM không nên được thu "
-"thanh. Hình thu nh� đã nén phải được thu thanh ở trong 64 Kb, gồm các dữ "
-"liệu cần thu thanh trong APP1."
+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 "Số byte dữ liệu hình thu nh� đã nén JPEG. Không dùng cho dữ liệu JPEG ảnh chính. Hình thu nh� JPEG không được chia ra, nhưng được thu thanh dạng luồng bit JPEG liên tục từ SOI đến EOI. Dấu hiệu Appn và COM không nên được thu thanh. Hình thu nh� đã nén phải được thu thanh ở trong 64 Kb, gồm các dữ liệu cần thu thanh trong APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
 msgstr "Hệ số YCbCr"
 
 #: libexif/exif-tag.c:383
-msgid ""
-"The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in \"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."
-msgstr ""
-"Những hệ số ma trận để chuyển đổi từ dữ liệu ảnh kiểu RGB sang YCbCr. Không "
-"có giá trị mặc định theo TIFF; ở đây dùng mặc định là giá trị đưa ra trong "
-"\"Hướng dẫn Mi�n Màu\". Mi�n màu được khai báo trong một thẻ thông tin mi�n "
-"màu, với giá trị mặc định là giá trị cho phép thao tác với nhau đặc tuyến "
-"ảnh tốt nhất với đi�u kiện này."
+msgid "The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in \"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."
+msgstr "Những hệ số ma trận để chuyển đổi từ dữ liệu ảnh kiểu RGB sang YCbCr. Không có giá trị mặc định theo TIFF; ở đây dùng mặc định là giá trị đưa ra trong \"Hướng dẫn Mi�n Màu\". Mi�n màu được khai báo trong một thẻ thông tin mi�n màu, với giá trị mặc định là giá trị cho phép thao tác với nhau đặc tuyến ảnh tốt nhất với đi�u kiện này."
 
 #: libexif/exif-tag.c:392
 msgid "YCbCr Sub-Sampling"
 msgstr "Phụ lấy mẫu YCbCr"
 
 #: libexif/exif-tag.c:393
-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 ""
-"Tỷ lệ lấy mẫu của thành phần độ màu so sánh với thành phần độ sáng. Trong dữ "
-"liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
+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 "Tỷ lệ lấy mẫu của thành phần độ màu so sánh với thành phần độ sáng. Trong dữ liệu đã nén JPEG, một dấu hiệu JPEG được dùng thay vào thẻ này."
 
 #: libexif/exif-tag.c:398
 msgid "YCbCr Positioning"
 msgstr "�ịnh vị YCbCr"
 
 #: libexif/exif-tag.c:399
-msgid ""
-"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."
-msgstr ""
-"Vị trí của thành phần độ màu so sánh với thành phần độ sáng. Trư�ng này hoạt "
-"động chỉ cho dữ liệu đã nén JPEG hay cho dữ liệu YCbCr chưa nén. Giá trị "
-"TIFF mặc định là 1 (giữa lại); nhưng khi <Y:Cb:Cr = 4:2:2>, trong tiêu chuẩn "
-"này khuyên dùng 2 (định vị với nhau) để thu thanh dữ liệu, để tăng chất "
-"lượng ảnh khi xem trên hệ thống TV. Khi không có trư�ng này, thiết bị đ�c sẽ "
-"giả sử giá trị TIFF mặc định. Khi <Y:Cb:Cr = 4:2:0>, khuyên dùng giá trị "
-"TIFF mặc định (giữa lại). Nếu thiết bị đ�c không có khả năng hỗ trợ cả hai "
-"kiểu <định vị YCbCr>, nó sẽ dùng giá trị TIFF mặc định, b� qua giá trị nào "
-"trong trư�ng này. Tốt hơn khi thiết bị đ�c hỗ trợ cả hai việc định vị giữa "
-"lại (centred) và định vị với nhau (co-sited)."
+msgid "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."
+msgstr "Vị trí của thành phần độ màu so sánh với thành phần độ sáng. Trư�ng này hoạt động chỉ cho dữ liệu đã nén JPEG hay cho dữ liệu YCbCr chưa nén. Giá trị TIFF mặc định là 1 (giữa lại); nhưng khi <Y:Cb:Cr = 4:2:2>, trong tiêu chuẩn này khuyên dùng 2 (định vị với nhau) để thu thanh dữ liệu, để tăng chất lượng ảnh khi xem trên hệ thống TV. Khi không có trư�ng này, thiết bị đ�c sẽ giả sử giá trị TIFF mặc định. Khi <Y:Cb:Cr = 4:2:0>, khuyên dùng giá trị TIFF mặc định (giữa lại). Nếu thiết bị đ�c không có khả năng hỗ trợ cả hai kiểu <định vị YCbCr>, nó sẽ dùng giá trị TIFF mặc định, b� qua giá trị nào trong trư�ng này. Tốt hơn khi thiết bị đ�c hỗ trợ cả hai việc định vị giữa lại (centred) và định vị với nhau (co-sited)."
 
 #: libexif/exif-tag.c:414
 msgid "Reference Black/White"
-msgstr "�en Trắng tham chiếu"
+msgstr "�en/Trắng tham chiếu"
 
 #: libexif/exif-tag.c:415
-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 "
-"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."
-msgstr ""
-"Giá trị điểm màu đen tham chiếu và giá trị điểm màu trắng tham chiếu. Không "
-"có giá trị TIFF mặc định, nhưng những giá trị bên dưới là mặc định trong "
-"trư�ng hợp này. Mi�n màu được khai báo trong thẻ thông tin mi�n màu, với giá "
-"trị mặc định là giá trị cho phép thao tác với nhau đặc tuyến ảnh tốt nhất "
-"với đi�u kiện này."
+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 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."
+msgstr "Giá trị điểm màu đen tham chiếu và giá trị điểm màu trắng tham chiếu. Không có giá trị TIFF mặc định, nhưng những giá trị bên dưới là mặc định trong trư�ng hợp này. Mi�n màu được khai báo trong thẻ thông tin mi�n màu, với giá trị mặc định là giá trị cho phép thao tác với nhau đặc tuyến ảnh tốt nhất với đi�u kiện này."
 
 #: libexif/exif-tag.c:423
 msgid "XML Packet"
@@ -3389,64 +2999,25 @@ msgid "CFA Pattern"
 msgstr "Mẫu CFA"
 
 #: libexif/exif-tag.c:439 libexif/exif-tag.c:785
-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 ""
-"Ngụ ý mẫu hình h�c mảng l�c màu (CFA) của máy nhạy ảnh, khi dùng một máy "
-"nhạy vùng màu phiến tinh thể đơn. Không áp dụng vào m�i phương pháp nhạy."
+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 "Cho biết mẫu hình h�c mảng l�c màu (CFA) của cảm biến ảnh, khi dùng một cảm biến vùng màu phiến tinh thể đơn. Không áp dụng vào m�i phương pháp dò tìm."
 
 #: libexif/exif-tag.c:443
 msgid "Battery Level"
-msgstr "Cấp Pin"
+msgstr "Mức pin"
 
 #: libexif/exif-tag.c:444
 msgid "Copyright"
 msgstr "Tác quy�n"
 
 #: libexif/exif-tag.c:445
-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 "
-"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) (see example 1). When only the photographer is given, it is "
-"terminated by one NULL code (see example 2). 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 (see example 3). "
-"When the field is left blank, it is treated as unknown."
-msgstr ""
-"Thông tin bản quy�n. Trong tiêu chuẩn này, thẻ được dùng để ngụ ý bản quy�n "
-"kiểu cả nhà nhiếp ảnh lẫn nhà soạn thảo đ�u. Nó là thông báo bản quy�n của "
-"ngư�i hay tổ chức tuyên bố các quy�n của ảnh đó. Câu bản quy�n thao tác với "
-"nhau, gồm ngày và các quy�n, nên được ghi vào trư�ng này. Lấy thí dụ, \"Bản "
-"quy�n ©, Nguyễn Văn Tuấn, 2006, bảo lưu m�i quy�n.\" Trong tiêu chuẩn này, "
-"trư�ng này thu thanh bản quy�n kiểu cả nhà nhiếp ảnh lẫn nhà soạn thảo đ�u, "
-"với mỗi bản quy�n được ghi lưu vào một phần câu riêng. Khi có sự phân biệt "
-"rõ giữa bản quy�n kiểu nhà nhiếp ảnh và nhà soạn thảo, hai đi�u nên được ghi "
-"theo thứ tự bản quy�n của nhà nhiếp ảnh đằng trước bản quy�n của nhà soạn "
-"thảo, giới hạn bởi NULL (rỗng). (Trong trư�ng hợp này, vì câu cũng kết thúc "
-"với NULL, có hai mã NULL [xem thí dụ 1]). Khi đưa ra chỉ bản quy�n của nhà "
-"nhiếp ảnh, nó được chấm dứt bởi một mã NULL (xem thí dụ 2). Khi đưa ra chỉ "
-"bản quy�n của nhà soạn thảo, nên ghi một dấu cách (cho phần nhà nhiếp ảnh), "
-"rồi mã NULL chấm dứt, rồi bản quy�n của nhà soạn thảo (xem thí dụ 3). Khi "
-"trư�ng còn trống, nó được xử lý là không rõ."
+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 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) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). 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 (see example 3). When the field is left blank, it is treated as unknown."
+msgstr "Thông tin bản quy�n. Trong tiêu chuẩn này, thẻ được dùng để cho biết bản quy�n kiểu cả nhà nhiếp ảnh lẫn nhà soạn thảo đ�u. Nó là thông báo bản quy�n của ngư�i hay tổ chức tuyên bố các quy�n của ảnh đó. Câu bản quy�n thao tác với nhau, gồm ngày và các quy�n, nên được ghi vào trư�ng này. Lấy thí dụ, \"Bản quy�n ©, Nguyễn Văn Tuấn, 2006, bảo lưu m�i quy�n.\" Trong tiêu chuẩn này, trư�ng này thu thanh bản quy�n kiểu cả nhà nhiếp ảnh lẫn nhà soạn thảo đ�u, với mỗi bản quy�n được ghi lưu vào một phần câu riêng. Khi có sự phân biệt rõ giữa bản quy�n kiểu nhà nhiếp ảnh và nhà soạn thảo, hai đi�u nên được ghi theo thứ tự bản quy�n của nhà nhiếp ảnh đằng trước bản quy�n của nhà soạn thảo, giới hạn bởi NULL (rỗng). (Trong trư�ng hợp này, vì câu cũng kết thúc với NULL, có hai mã NULL [xem thí dụ 1]). Khi đưa ra chỉ bản quy�n của nhà nhiếp ảnh, nó được chấm dứt bởi một mã NULL (xem thí dụ 2). Khi đưa ra chỉ bản quy�n của nhà soạn thảo, nên ghi một dấu cách (cho phần nhà nhiếp ảnh), rồi mã NULL chấm dứt, rồi bản quy�n của nhà soạn thảo (xem thí dụ 3). Khi trư�ng còn trống, nó được xử lý là không rõ."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Th�i gian phơi bày, theo giây."
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr "Số F"
-
 #: libexif/exif-tag.c:470
 msgid "The F number."
 msgstr "Số F."
@@ -3456,76 +3027,48 @@ msgid "Image Resources Block"
 msgstr "Khối Tài nguyên Ảnh"
 
 #: libexif/exif-tag.c:477
-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 ""
-"Bộ tr� tới IRD Exif. �ối với khả năng thao tác với nhau, IFD Exif có cùng "
-"một cấu trúc với IFD được ghi rõ trong TIFF. Tuy nhiên, bình thư�ng nó không "
-"chứa dữ liệu ảnh như TIFF."
+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 "Bộ tr� tới IRD Exif. �ối với khả năng thao tác với nhau, IFD Exif có cùng một cấu trúc với IFD được ghi rõ trong TIFF. Tuy nhiên, bình thư�ng nó không chứa dữ liệu ảnh như TIFF."
 
 #: libexif/exif-tag.c:485
 msgid "Exposure Program"
-msgstr "Chương trình Phơi nắng"
+msgstr "Chương trình phơi sáng"
 
 #: libexif/exif-tag.c:486
-msgid ""
-"The class of the program used by the camera to set exposure when the picture "
-"is taken."
-msgstr ""
-"Hạng của chương trình được dùng bởi máy ảnh để đặt độ phơi sáng khi chụp ảnh."
+msgid "The class of the program used by the camera to set exposure when the picture is taken."
+msgstr "Hạng của chương trình được dùng bởi máy ảnh để đặt độ phơi sáng khi chụp ảnh."
 
 #: libexif/exif-tag.c:490
 msgid "Spectral Sensitivity"
-msgstr "�ộ nhạy Quang phổ"
+msgstr "�ộ nhạy quang phổ"
 
 #: libexif/exif-tag.c:491
-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 ""
-"Ngụ ý độ nhạy quang phổ của mỗi kênh của máy ảnh được dùng. Giá trị của thẻ "
-"là chuỗi ASCII tương thích với tiêu chuẩn được phát triển bởi Uỷ ban Kỹ "
-"thuật ASTM."
+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 "Cho biết độ nhạy quang phổ của mỗi kênh của máy ảnh được dùng. Giá trị của thẻ là chuỗi ASCII tương thích với tiêu chuẩn được phát triển bởi Ủy ban Kỹ thuật ASTM."
 
 #: libexif/exif-tag.c:496
 msgid "GPS Info IFD Pointer"
 msgstr "Con tr� IFD thông tin GPS"
 
 #: libexif/exif-tag.c:497
-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 ""
-"Bộ tr� tới IFD Thông tin GPS. Cấu trúc thao tác với nhau của IFD Thông tin "
-"GPS, cùng với IFD Exif, không có dữ liệu ảnh."
+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 "Bộ tr� tới IFD Thông tin GPS. Cấu trúc thao tác với nhau của IFD Thông tin GPS, cùng với IFD Exif, không có dữ liệu ảnh."
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
 msgstr "Tỷ lệ tốc độ ISO"
 
 #: libexif/exif-tag.c:504
-msgid ""
-"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
-"specified in ISO 12232."
-msgstr ""
-"Ngụ ý Tốc độ ISO và �ộ Vĩ ISO của máy ảnh hay thiết bị nhập, như được ghi rõ "
-"trong ISO 12232."
+msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
+msgstr "Cho biết Tốc độ ISO và �ộ Vĩ ISO của máy ảnh hay thiết bị nhập, như được ghi rõ trong ISO 12232."
 
 #: libexif/exif-tag.c:507
 msgid "Opto-Electronic Conversion Function"
 msgstr "Hàm chuyển đổi quang điện tử h�c"
 
 #: libexif/exif-tag.c:508
-msgid ""
-"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
-"14524. <OECF> is the relationship between the camera optical input and the "
-"image values."
-msgstr ""
-"Ngụ ý Hàm Chuyển đổi Quang-�iện (OECF) được ghi rõ trong ISO 14524. <OECF> "
-"là quan hệ giữa dữ liệu nhập quang của máy ảnh, và các giá trị ảnh."
+msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values."
+msgstr "Cho biết hàm Chuyển đổi Quang-�iện (OECF) được ghi rõ trong ISO 14524. <OECF> là quan hệ giữa dữ liệu nhập quang của máy ảnh, và các giá trị ảnh."
 
 #: libexif/exif-tag.c:513
 msgid "Time Zone Offset"
@@ -3533,36 +3076,27 @@ msgstr "Hiệu Múi Gi�"
 
 #: libexif/exif-tag.c:514
 msgid "Encodes time zone of camera clock relative to GMT."
-msgstr ""
-"Mã hoá múi gi� của đồng hồ máy ảnh tương ứng với UTC (Th�i gian Thế giới)."
+msgstr "Mã hóa múi gi� của đồng hồ máy ảnh tương ứng với UTC (Th�i gian Thế giới)."
 
 #: libexif/exif-tag.c:515
 msgid "Exif Version"
 msgstr "Phiên bản Exif"
 
 #: libexif/exif-tag.c:516
-msgid ""
-"The version of this standard supported. Nonexistence of this field is taken "
-"to mean nonconformance to the standard."
-msgstr ""
-"Phiên bản tiêu chuẩn này được hỗ trợ. Nếu không có trư�ng này, giả sử không "
-"tuân theo tiêu chuẩn."
+msgid "The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard."
+msgstr "Phiên bản tiêu chuẩn này được hỗ trợ. Nếu không có trư�ng này, giả sử không tuân theo tiêu chuẩn."
 
 #: libexif/exif-tag.c:520
 msgid "Date and Time (Original)"
-msgstr "Ngày và Gi� (gốc)"
+msgstr "Ngày và Gi� (Gốc)"
 
 #: libexif/exif-tag.c:521
-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 ""
-"Ngày và gi� tạo ảnh gốc. �ối với máy ảnh tĩnh số, có ghi lưu ngày và gi� "
-"chụp ảnh."
+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 "Ngày và gi� tạo ảnh gốc. �ối với máy ảnh tĩnh số, có ghi lưu ngày và gi� chụp ảnh."
 
 #: libexif/exif-tag.c:526
 msgid "Date and Time (Digitized)"
-msgstr "Ngày và Gi� (đã số hóa)"
+msgstr "Ngày và Gi� (�ã số hóa)"
 
 #: libexif/exif-tag.c:527
 msgid "The date and time when the image was stored as digital data."
@@ -3570,48 +3104,27 @@ msgstr "Ngày tháng và th�i gian lưu ảnh dưới dạng dữ liệu số.
 
 #: libexif/exif-tag.c:530
 msgid "Components Configuration"
-msgstr "Cấu hình Thành phần"
+msgstr "Cấu hình thành phần"
 
 #: libexif/exif-tag.c:531
-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 "
-"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."
-msgstr ""
-"Thông tin đặc trưng cho dữ liệu đã nén. Những kênh của mỗi thành phần được "
-"sắp xếp theo thứ tự từ thành phần thứ nhất đến thứ tư. �ối với dữ liệu không "
-"được nén, cách sắp xếp dữ liệu được đưa ra trong thẻ <thông dịch đo ảnh "
-"chụp>. Tuy nhiên, vì thẻ <thông dịch đo ảnh chụp> có thể hiện được chỉ thứ "
-"tự của Y, CB và Cr, thẻ này được cung cấp cho các trư�ng hợp mà dữ liệu đã "
-"nén dùng thành phần khác với Y, Cb vra Cr, và để hiệu lực khả năng hỗ trợ "
-"các dãy khác."
+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 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."
+msgstr "Thông tin đặc trưng cho dữ liệu đã nén. Những kênh của mỗi thành phần được sắp xếp theo thứ tự từ thành phần thứ nhất đến thứ tư. �ối với dữ liệu không được nén, cách sắp xếp dữ liệu được đưa ra trong thẻ <thông dịch đo ảnh chụp>. Tuy nhiên, vì thẻ <thông dịch đo ảnh chụp> có thể hiện được chỉ thứ tự của Y, CB và Cr, thẻ này được cung cấp cho các trư�ng hợp mà dữ liệu đã nén dùng thành phần khác với Y, Cb vra Cr, và để hiệu lực khả năng hỗ trợ các dãy khác."
 
 #: libexif/exif-tag.c:541
 msgid "Compressed Bits per Pixel"
 msgstr "Số bit đã nén/điểm ảnh"
 
 #: libexif/exif-tag.c:542
-msgid ""
-"Information specific to compressed data. The compression mode used for a "
-"compressed image is indicated in unit bits per pixel."
-msgstr ""
-"Thông tin đặc trưng cho dữ liệu đã nén. Chế độ nén được dùng cho ảnh đã nén "
-"được ngụ ý theo đơn vị bit trên mỗi điểm ảnh."
+msgid "Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel."
+msgstr "Thông tin đặc trưng cho dữ liệu đã nén. Chế độ nén được dùng cho ảnh đã nén được đưa ra theo đơn vị bit trên mỗi điểm ảnh."
 
 #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr "Tốc độ Chập"
 
 #: libexif/exif-tag.c:547
-msgid ""
-"Shutter speed. The unit is the APEX (Additive System of Photographic "
-"Exposure) setting."
-msgstr ""
-"Tốc độ của chập. �ơn vị là thiết lập APEX (hệ thống phơi sáng chụp ảnh kiểu "
-"cộng vào)."
+msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting."
+msgstr "Tốc độ của chập. �ơn vị là cài đặt APEX (hệ thống phơi sáng chụp ảnh kiểu cộng vào)."
 
 #: libexif/exif-tag.c:551
 msgid "The lens aperture. The unit is the APEX value."
@@ -3622,41 +3135,28 @@ msgid "Brightness"
 msgstr "�ộ sáng"
 
 #: libexif/exif-tag.c:554
-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 ""
-"Giá trị của độ sáng. �ơn vị là giá trị APEX. Bình thư�ng, nó được đưa ra "
-"trong phạm vị <-99.99 ... 99.99>."
+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 "Giá trị của độ sáng. �ơn vị là giá trị APEX. Bình thư�ng, nó được đưa ra trong Vùng <-99.99 … 99.99>."
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
 msgstr "Khuynh hướng phơi sáng"
 
 #: libexif/exif-tag.c:559
-msgid ""
-"The exposure bias. The units is the APEX value. Ordinarily it is given in "
-"the range of -99.99 to 99.99."
-msgstr ""
-"Khuynh hướng của sự phơi sáng. �ơn vị là giá trị APEX. Bình thư�ng, nó được "
-"đưa ra trong phạm vị \"-99.99 ... 99.99\"."
+msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
+msgstr "Khuynh hướng của sự phơi sáng. �ơn vị là giá trị APEX. Bình thư�ng, nó được đưa ra trong phạm vi \"-99.99 … 99.99\"."
 
 #: libexif/exif-tag.c:562
 msgid "Maximum Aperture Value"
 msgstr "Giá trị Khẩu độ Tối đa"
 
 #: libexif/exif-tag.c:563
-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 ""
-"Số F nh� nhất của ống kính. �ơn vị là giá trị APEX. Bình thư�ng, nó được đưa "
-"ra trong phạm vị <00.00 ... 99.99>, nhưng mà nó vẫn không bị giới hạn thành "
-"phạm vị này."
+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 "Số F nh� nhất của ống kính. �ơn vị là giá trị APEX. Bình thư�ng, nó được đưa ra trong phạm vi <00.00 … 99.99>, nhưng mà nó vẫn không bị giới hạn thành phạm vi này."
 
 #: libexif/exif-tag.c:568
 msgid "Subject Distance"
-msgstr "Tầm Chủ ��"
+msgstr "Khoảng cách chủ thể"
 
 #: libexif/exif-tag.c:569
 msgid "The distance to the subject, given in meters."
@@ -3675,28 +3175,20 @@ msgid "The kind of light source."
 msgstr "Kiểu nguồn ánh dáng."
 
 #: libexif/exif-tag.c:578
-msgid ""
-"This tag is recorded when an image is taken using a strobe light (flash)."
+msgid "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr "Thẻ này được ghi lưu khi chụp ảnh bằng đèn nháy."
 
 #: libexif/exif-tag.c:582
-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 ""
-"Tiêu cự thật của ống kính, theo milimét. Không chuyển đổi sang tiêu cự của "
-"máy ảnh phim 35mm."
+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 "Tiêu cự thật của ống kính, theo milimét. Không chuyển đổi sang tiêu cự của máy ảnh phim 35mm."
 
 #: libexif/exif-tag.c:585
 msgid "Subject Area"
 msgstr "Diện tích chủ thể"
 
 #: libexif/exif-tag.c:586
-msgid ""
-"This tag indicates the location and area of the main subject in the overall "
-"scene."
-msgstr ""
-"Thẻ này ngụ ý vị trí và diện tích của chủ thể chính trong toàn bộ cảnh."
+msgid "This tag indicates the location and area of the main subject in the overall scene."
+msgstr "Thẻ này cho biết vị trí và diện tích của chủ thể chính trong toàn bộ cảnh."
 
 #: libexif/exif-tag.c:590
 msgid "TIFF/EP Standard ID"
@@ -3707,54 +3199,16 @@ msgid "Maker Note"
 msgstr "Hãng chế tạo ghi chú"
 
 #: libexif/exif-tag.c:592
-msgid ""
-"A tag for manufacturers of Exif writers to record any desired information. "
-"The contents are up to the manufacturer."
-msgstr ""
-"Thẻ cho hãng chê� tạo bộ ghi Exif, để ghi lưu thông tin nào đã muốn. Nội dung "
-"theo ý kiến của mỗi hãng chế tạo."
+msgid "A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer."
+msgstr "Thẻ cho hãng chế tạo bộ ghi Exif, để ghi lưu thông tin nào đã muốn. Nội dung theo ý kiến của mỗi hãng chế tạo."
 
 #: libexif/exif-tag.c:595
 msgid "User Comment"
-msgstr "Ngư�i dùng Ghi chú"
+msgstr "Ngư�i dùng ghi chú"
 
 #: libexif/exif-tag.c:596
-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. The character code used in the <UserComment> tag "
-"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL (\"00.h"
-"\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are defined in the specification. The "
-"value of CountN is determined based on the 8 bytes in the character code "
-"area and the number of bytes in the user comment part. Since the TYPE is not "
-"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
-"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
-"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
-"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
-"must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag. When a "
-"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
-"and that the following user comment part be filled with blank characters [20."
-"H]."
-msgstr ""
-"Thẻ này cho phép ngư�i dùng Exif ghi từ khoá hay ghi chú v� ảnh, thêm vào "
-"thông tin trong <ImageDescription> (mô tả ảnh), và không có hạn chế mã ký tự "
-"của thẻ <ImageDescription>. Mã ký tự dùng trong thẻ <UserComment> (Ngư�i "
-"dùng Ghi chú) được nhận diện dựa vào một mã số (ID) trong vùng 8-byte cố "
-"định tại đầu vùng dữ liệu thẻ. Phần vùng không dùng được đệm bằng NULL (vô "
-"giá trị: 00.h). Mã số được gán bằng cách đăng ký. Phương pháp chỉ rõ và tham "
-"chiếu đến mỗi mã ký tự được đưa ra trong đặc tả. Giá trị của CountN được "
-"tính dựa vào 8 byte trong vùng mã ký tự và số các byte trong phần ngư�i dùng "
-"ghi chú. Vì TYPE (kiểu) không phải là ASCII, không cần chấm dứt bằng NULL "
-"(vô giá trị). Mã số cho vùng <UserComment> có thẻ là mã �ã �ịnh Nghĩa như "
-"JIS hay ASCII, hoặc có thẻ là Chưa �ịnh Nghĩa. Tên Chưa �ịnh Nghĩa là "
-"UndefinedText, và mã số được đi�n vào bằng 8 byte cả NULL (\"00.H\"). Trình "
-"đ�c Exif mà đ�c thẻ <UserComment> phải có hàm quyết định mã số. Hàm này "
-"không cần thiết trong trình đ�c Exif không dùng thẻ <UserComment>. Khi vùng "
-"<UserComment> được dành riêng, khuyên dùng mã số kiểu ASCII, và phần ngư�i "
-"dùng ghi chú mà theo sau được đi�n vào bằng ký tự trắng [20.H]."
+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. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]."
+msgstr "Thẻ này cho phép ngư�i dùng Exif ghi từ khóa hay ghi chú v� ảnh, thêm vào thông tin trong <ImageDescription> (mô tả ảnh), và không có hạn chế mã ký tự của thẻ <ImageDescription>. Mã ký tự dùng trong thẻ <UserComment> (Ngư�i dùng Ghi chú) được nhận diện dựa vào một mã số (ID) trong vùng 8-byte cố định tại đầu vùng dữ liệu thẻ. Phần vùng không dùng được đệm bằng NULL (vô giá trị: 00.h). Mã số được gán bằng cách đăng ký. Phương pháp chỉ rõ và tham chiếu đến mỗi mã ký tự được đưa ra trong đặc tả. Giá trị của CountN được tính dựa vào 8 byte trong vùng mã ký tự và số các byte trong phần ngư�i dùng ghi chú. Vì TYPE (kiểu) không phải là ASCII, không cần chấm dứt bằng NULL (vô giá trị). Mã số cho vùng <UserComment> có thẻ là mã �ã �ịnh Nghĩa như JIS hay ASCII, hoặc có thẻ là Chưa �ịnh Nghĩa. Tên Chưa �ịnh Nghĩa là UndefinedText, và mã số được đi�n vào bằng 8 byte cả NULL (\"00.H\"). Trình đ�c Exif mà đ�c thẻ <UserComment> phải có hàm quyết định mã số. Hàm này không cần thiết trong trình đ�c Exif không dùng thẻ <UserComment>. Khi vùng <UserComment> được dành riêng, khuyên dùng mã số kiểu ASCII, và phần ngư�i dùng ghi chú mà theo sau được đi�n vào bằng ký tự trắng [20.H]."
 
 #: libexif/exif-tag.c:619
 msgid "Sub-second Time"
@@ -3769,21 +3223,16 @@ msgid "Sub-second Time (Original)"
 msgstr "Th�i gian dưới giây (gốc)"
 
 #: libexif/exif-tag.c:625
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
-msgstr ""
-"Thẻ dùng để ghi lưu phần giây cho thẻ <DateTimeOriginal> (Ngày Gi� Gốc)."
+msgid "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr "Thẻ dùng để ghi lưu phần giây cho thẻ <DateTimeOriginal> (Ngày Gi� Gốc)."
 
 #: libexif/exif-tag.c:629
 msgid "Sub-second Time (Digitized)"
 msgstr "Th�i gian dưới giây (đã số hóa)"
 
 #: libexif/exif-tag.c:630
-msgid ""
-"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
-msgstr ""
-"Thẻ dùng để ghi lưu phần giây cho thẻ <DateTimeDigitized> (Ngày Gi� đã Số "
-"hoá)."
+msgid "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr "Thẻ dùng để ghi lưu phần giây cho thẻ <DateTimeDigitized> (Ngày Gi� đã Số hóa)."
 
 #: libexif/exif-tag.c:634
 msgid "XP Title"
@@ -3791,36 +3240,31 @@ msgstr "Tá»±a XP"
 
 #: libexif/exif-tag.c:635
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
-msgstr "Một chuỗi ký tự đưa ra tựa đ� của ảnh, mã hoá theo UTF-16LE."
+msgstr "Một chuỗi ký tự đưa ra tựa đ� của ảnh, mã hóa theo UTF-16LE."
 
 #: libexif/exif-tag.c:639
 msgid "XP Comment"
 msgstr "Ghi chú XP"
 
 #: libexif/exif-tag.c:640
-msgid ""
-"A character string containing a comment about the image, encoded in UTF-16LE."
-msgstr "Một chuỗi ký tự chứa ghi chú v� ảnh, mã hoá theo UTF-16LE."
+msgid "A character string containing a comment about the image, encoded in UTF-16LE."
+msgstr "Một chuỗi ký tự chứa ghi chú v� ảnh, mã hóa theo UTF-16LE."
 
 #: libexif/exif-tag.c:644
 msgid "XP Author"
 msgstr "Tác giả XP"
 
 #: libexif/exif-tag.c:645
-msgid ""
-"A character string containing the name of the image creator, encoded in "
-"UTF-16LE."
-msgstr "Một chuỗi ký tự chứa tên của ngư�i tạo ảnh, mã hoá theo UTF-16LE."
+msgid "A character string containing the name of the image creator, encoded in UTF-16LE."
+msgstr "Một chuỗi ký tự chứa tên của ngư�i tạo ảnh, mã hóa theo UTF-16LE."
 
 #: libexif/exif-tag.c:649
 msgid "XP Keywords"
-msgstr "Từ khoá XP"
+msgstr "Từ khóa XP"
 
 #: libexif/exif-tag.c:650
-msgid ""
-"A character string containing key words describing the image, encoded in "
-"UTF-16LE."
-msgstr "Một chuỗi ký tự chứa từ khoá diễn tả ảnh, mã hoá theo UTF-16LE."
+msgid "A character string containing key words describing the image, encoded in UTF-16LE."
+msgstr "Một chuỗi ký tự chứa từ khóa diễn tả ảnh, mã hóa theo UTF-16LE."
 
 #: libexif/exif-tag.c:654
 msgid "XP Subject"
@@ -3828,7 +3272,7 @@ msgstr "Chủ đ� XP"
 
 #: libexif/exif-tag.c:655
 msgid "A character string giving the image subject, encoded in UTF-16LE."
-msgstr "Một chuỗi ký tự đưa ra chủ đ� của ảnh, mã hoá theo UTF-16LE."
+msgstr "Một chuỗi ký tự đưa ra chủ đ� của ảnh, mã hóa theo UTF-16LE."
 
 #: libexif/exif-tag.c:659
 msgid "The FlashPix format version supported by a FPXR file."
@@ -3839,387 +3283,212 @@ msgid "Color Space"
 msgstr "Mi�n màu"
 
 #: libexif/exif-tag.c:662
-msgid ""
-"The color space information tag is always recorded as the color space "
-"specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can "
-"be treated as sRGB when it is converted to FlashPix."
-msgstr ""
-"Thẻ thông tin mi�n màu luôn luôn được ghi lưu như là bộ ghi rõ mi�n màu. "
-"Bình thư�ng, <sRGB (=1)> được dùng để xác định mi�n màu dựa vào đi�u kiện "
-"màn hình và môi trư�ng máy tính. Dùng mi�n màu khác với sRGB thì Chưa định "
-"chuẩn (=FFFF.H) được đặt. Dữ liệu ảnh được ghi lưu dạng Chưa định chuẩn có "
-"thể được xử lý dạng sRGB khi được chuyển đổi sang FlashPix."
+msgid "The color space information tag is always recorded as the color space specifier. Normally sRGB (=1) 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 (=FFFF.H) is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix."
+msgstr "Thẻ thông tin mi�n màu luôn luôn được ghi lưu như là bộ ghi rõ mi�n màu. Bình thư�ng, <sRGB (=1)> được dùng để xác định mi�n màu dựa vào đi�u kiện màn hình và môi trư�ng máy tính. Dùng mi�n màu khác với sRGB thì Chưa định chuẩn (=FFFF.H) được đặt. Dữ liệu ảnh được ghi lưu dạng Chưa định chuẩn có thể được xử lý dạng sRGB khi được chuyển đổi sang FlashPix."
 
 #: libexif/exif-tag.c:670
 msgid "Pixel X Dimension"
 msgstr "�iểm ảnh chi�u X"
 
 #: libexif/exif-tag.c:671
-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, "
-"whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file."
-msgstr ""
-"Thông tin đặc trưng cho dữ liệu đã nén. Khi ghi lưu tập tin đã nén, độ rộng "
-"hợp lệ của ảnh có nghĩa phải được ghi lưu trong thẻ này, bất chấp có dữ liệu "
-"đệm hay dấu hiệu sở khởi lại. Không nên có thẻ này trong tập tin không đã "
-"nén."
+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, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file."
+msgstr "Thông tin đặc trưng cho dữ liệu đã nén. Khi ghi lưu tập tin đã nén, độ rộng hợp lệ của ảnh có nghĩa phải được ghi lưu trong thẻ này, bất chấp có dữ liệu đệm hay dấu hiệu sở khởi lại. Không nên có thẻ này trong tập tin không đã nén."
 
 #: libexif/exif-tag.c:677
 msgid "Pixel Y Dimension"
 msgstr "�iểm ảnh chi�u Y"
 
 #: libexif/exif-tag.c:678
-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, "
-"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."
-msgstr ""
-"Thông tin đặc trưng cho dữ liệu đã nén. Khi ghi lưu tập tin đã nén, độ cao "
-"hợp lệ của ảnh có nghĩa phải được ghi lưu trong thẻ này, bất chấp có dữ liệu "
-"đệm hay dấu hiệu sở khởi lại. Không nên có thẻ này trong tập tin không nén. "
-"Vì không cần đệm dữ liệu v� hướng d�c, số các dòng được ghi lưu trong thẻ độ "
-"cao ảnh hợp lệ này thực sự cùng một số với số được ghi lưu trong SOF."
+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, 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."
+msgstr "Thông tin đặc trưng cho dữ liệu đã nén. Khi ghi lưu tập tin đã nén, độ cao hợp lệ của ảnh có nghĩa phải được ghi lưu trong thẻ này, bất chấp có dữ liệu đệm hay dấu hiệu sở khởi lại. Không nên có thẻ này trong tập tin không nén. Vì không cần đệm dữ liệu v� hướng d�c, số các dòng được ghi lưu trong thẻ độ cao ảnh hợp lệ này thực sự cùng một số với số được ghi lưu trong SOF."
 
 #: libexif/exif-tag.c:688
 msgid "Related Sound File"
 msgstr "Tập tin âm thanh liên quan"
 
 #: libexif/exif-tag.c:689
-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. Stipulations on audio and file naming "
-"conventions are defined in the specification. 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. The mapping of Exif image files and audio files is "
-"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
-"one file as in [2] or [3], the above format is used to record just one audio "
-"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file \"DSC00001."
-"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
-"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
-"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
-"\", is indicated. By combining multiple relational information, a variety of "
-"playback possibilities can be supported. The method of using relational "
-"information is left to the implementation on the playback side. Since this "
-"information is an ASCII character string, it is terminated by NULL. When "
-"this tag is used to map audio files, the relation of the audio file to image "
-"data must also be indicated on the audio file end."
-msgstr ""
-"Thẻ này dùng để ghi lưu tên tập tin âm thanh tương ứng với dữ liệu ảnh. "
-"Thông tin tương ứng duy nhất được ghi lưu vào đây là tên và phần mở rộng của "
-"tập tin âm thanh Exif (một chuỗi ASCII gồm 8 ký tự cộng dấu chấm cộng 3 ký "
-"tự: \"kkkkkkkk.kkk\"). Với đi�u kiện là tên chuyển đổi âm thanh và tập tin "
-"phải được định nghĩa trong đặc tả kỹ thuật. Khi dùng thẻ này, tập tin âm "
-"thanh phải được thu với định dạng âm thanh Exif có thể hiểu được. Bộ ghi "
-"cũng được phép lưu dữ liệu như âm thanh ở trong APP2, dạng dữ liệu luồng "
-"phần mở rộng FlashPix. Việc ánh xạ tập tin kiểu ảnh và âm thanh Exif được "
-"thực hiện bằng một của ba cách, [1], [2] và [3]. Nếu nhi�u tập tin được ánh "
-"xạ tới cùng một tập tin như trong [2] hay [3], định dạng trên được dùng để "
-"ghi lưu chỉ một tên tập tin âm thanh. Nếu nhi�u tập tin âm thanh, tập tin "
-"ghi đầu tiên được sử dụng. Trong trư�ng hợp [3], lấy thí dụ, đối với tập tin "
-"ảnh Exif \"DSC00001.JPG\", chỉ coi \"SND00001.WAV\" như là tập tin âm thanh "
-"Exif tương ứng. Khi có ba tập tin âm thanh Exif, \"SND00001.WAV\", "
-"\"SND00002.WAV\" và \"SND00003.WAV\", có ngụ ý rằng tập tin ảnh Exif "
-"(\"DSC00001.JPG\") cho cả ba tập tin đó. Bằng cách hợp nhất nhi�u thông tin "
-"tương ứng khác nhau, cũng có thể hỗ trợ nhi�u khả năng phát lại khác nhau. "
-"Phương pháp sử dụng thông tin có quan hệ thì nh� sự thực hiện bên chức năng "
-"phát lại. Vì thông tin này nằm trong một chuỗi ký tự ASCII, nó được NULL "
-"chấm dứt. Khi thẻ này được dùng để ánh xạ tập tin kiểu âm thanh, quan hệ "
-"giữa tập tin âm thanh và dữ liệu ảnh cũng phải được chỉ ra ở cuối tập tin âm "
-"thanh."
+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. Stipulations on audio and file naming conventions are defined in the specification. 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. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end."
+msgstr "Thẻ này dùng để ghi lưu tên tập tin âm thanh tương ứng với dữ liệu ảnh. Thông tin tương ứng duy nhất được ghi lưu vào đây là tên và phần mở rộng của tập tin âm thanh Exif (một chuỗi ASCII gồm 8 ký tự cộng dấu chấm cộng 3 ký tự: \"kkkkkkkk.kkk\"). Với đi�u kiện là tên chuyển đổi âm thanh và tập tin phải được định nghĩa trong đặc tả kỹ thuật. Khi dùng thẻ này, tập tin âm thanh phải được thu với định dạng âm thanh Exif có thể hiểu được. Bộ ghi cũng được phép lưu dữ liệu như âm thanh ở trong APP2, dạng dữ liệu luồng phần mở rộng FlashPix. Việc ánh xạ tập tin kiểu ảnh và âm thanh Exif được thực hiện bằng một của ba cách, [1], [2] và [3]. Nếu nhi�u tập tin được ánh xạ tới cùng một tập tin như trong [2] hay [3], định dạng trên được dùng để ghi lưu chỉ một tên tập tin âm thanh. Nếu nhi�u tập tin âm thanh, tập tin ghi đầu tiên được sử dụng. Trong trư�ng hợp [3], lấy thí dụ, đối với tập tin ảnh Exif \"DSC00001.JPG\", chỉ coi \"SND00001.WAV\" như là tập tin âm thanh Exif tương ứng. Khi có ba tập tin âm thanh Exif, \"SND00001.WAV\", \"SND00002.WAV\" và \"SND00003.WAV\", cho biết rằng tập tin ảnh Exif (\"DSC00001.JPG\") cho cả ba tập tin đó. Bằng cách hợp nhất nhi�u thông tin tương ứng khác nhau, cũng có thể hỗ trợ nhi�u khả năng phát lại khác nhau. Phương pháp sử dụng thông tin có quan hệ thì nh� sự thực hiện bên chức năng phát lại. Vì thông tin này nằm trong một chuỗi ký tự ASCII, nó được NULL chấm dứt. Khi thẻ này được dùng để ánh xạ tập tin kiểu âm thanh, quan hệ giữa tập tin âm thanh và dữ liệu ảnh cũng phải được chỉ ra ở cuối tập tin âm thanh."
 
 #: libexif/exif-tag.c:719
 msgid "Interoperability IFD Pointer"
 msgstr "Con tr� IFD khả năng thao tác với nhau"
 
 #: libexif/exif-tag.c:720
-msgid ""
-"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."
-msgstr ""
-"IFD khả năng thao tác với nhau được tạo từ nhi�u thẻ lưu thông tin để bảo "
-"đảm khả năng thao tác với nhau, và được chỉ bởi thẻ đằng sau, trong IFD "
-"Exif. Cấu trúc thao tác với nhau của IFD thao tác với nhau là cùng một cấu "
-"trúc với IFD đã định nghĩa TIFF, nhưng không chứa dữ liệu ảnh thư�ng được so "
-"sánh với IFD TIFF chuẩn."
+msgid "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."
+msgstr "IFD khả năng thao tác với nhau được tạo từ nhi�u thẻ lưu thông tin để bảo đảm khả năng thao tác với nhau, và được chỉ bởi thẻ đằng sau, trong IFD Exif. Cấu trúc thao tác với nhau của IFD thao tác với nhau là cùng một cấu trúc với IFD đã định nghĩa TIFF, nhưng không chứa dữ liệu ảnh thư�ng được so sánh với IFD TIFF chuẩn."
 
 #: libexif/exif-tag.c:729
 msgid "Flash Energy"
 msgstr "Năng lượng đèn nháy"
 
 #: libexif/exif-tag.c:730
-msgid ""
-"Indicates the strobe energy at the time the image is captured, as measured "
-"in Beam Candle Power Seconds (BCPS)."
-msgstr ""
-"Ngụ ý năng lượng của đèn nháy vào lúc chụp ảnh, theo BCPS (giây năng lượng "
-"cây nến tia)"
+msgid "Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS)."
+msgstr "Cho biết năng lượng của đèn nháy vào lúc chụp ảnh, theo BCPS (giây năng lượng cây nến tia)"
 
 #: libexif/exif-tag.c:734
 msgid "Spatial Frequency Response"
 msgstr "�áp ứng tần số không gian"
 
 #: libexif/exif-tag.c:735
-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 ""
-"Thẻ này ghi lưu bảng tần số không gian và các giá trị SFR của máy ảnh hay "
-"thiết bị nhập, v� hướng độ rộng ảnh, độ cao ảnh và hướng chéo, như được ghi "
-"rõ trong ISO 12233."
+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 "Thẻ này ghi lưu bảng tần số không gian và các giá trị SFR của máy ảnh hay thiết bị nhập, v� hướng độ rộng ảnh, độ cao ảnh và hướng chéo, như được ghi rõ trong ISO 12233."
 
 #: libexif/exif-tag.c:741
 msgid "Focal Plane X-Resolution"
 msgstr "Phân giải X phẳng tiêu"
 
 #: libexif/exif-tag.c:742
-msgid ""
-"Indicates the number of pixels in the image width (X) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Ngụ ý số điểm ảnh v� hướng độ rộng ảnh (X) trên mỗi <đơn vị độ phân giải "
-"phằng tiêu> trên phẳng tiêu của máy ảnh."
+msgid "Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Cho biết số điểm ảnh v� hướng độ rộng ảnh (X) trên mỗi <đơn vị độ phân giải phằng tiêu> trên phẳng tiêu của máy ảnh."
 
 #: libexif/exif-tag.c:746
 msgid "Focal Plane Y-Resolution"
 msgstr "Phân giải Y phẳng tiêu"
 
 #: libexif/exif-tag.c:747
-msgid ""
-"Indicates the number of pixels in the image height (V) direction per "
-"<FocalPlaneResolutionUnit> on the camera focal plane."
-msgstr ""
-"Ngụ ý số điểm ảnh v� hướng độ cao ảnh (Y) trên mỗi <đơn vị độ phân giải "
-"phằng tiêu> trên phẳng tiêu của máy ảnh."
+msgid "Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr "Cho biết số điểm ảnh v� hướng độ cao ảnh (Y) trên mỗi <đơn vị độ phân giải phằng tiêu> trên phẳng tiêu của máy ảnh."
 
 #: libexif/exif-tag.c:751
 msgid "Focal Plane Resolution Unit"
 msgstr "�ơn vị độ phân giải phẳng tiêu"
 
 #: libexif/exif-tag.c:752
-msgid ""
-"Indicates the unit for measuring <FocalPlaneXResolution> and "
-"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
-msgstr ""
-"Ngụ ý đơn vị để đo <độ phân giải X phẳng tiêu> và <độ phân giải Y phẳng "
-"tiêu>. Giá trị này bằng <đơn vị độ phân giải>."
+msgid "Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr "Cho biết đơn vị để đo <độ phân giải X phẳng tiêu> và <độ phân giải Y phẳng tiêu>. Giá trị này bằng <đơn vị độ phân giải>."
 
 #: libexif/exif-tag.c:757
 msgid "Subject Location"
 msgstr "Vị trí chủ thể"
 
 #: libexif/exif-tag.c:758
-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 "
-"left edge, prior to rotation processing as per the <Rotation> tag. The first "
-"value indicates the X column number and the second indicates the Y row "
-"number."
-msgstr ""
-"Ngụ ý vị trí của chủ thể chính trong cảnh. Giá trị của thẻ này thể hiện điểm "
-"tại tâm của chủ thể chính, tương ứng với cạnh bên trái, trước khi xử lý độ "
-"xoay tùy theo thẻ <độ xoay>. Giá trị thứ nhất ngụ ý số hiệu cột X, còn giá "
-"trị thứ hai ngụ ý số hiệu hàng Y."
+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 left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and the second indicates the Y row number."
+msgstr "Cho biết vị trí của chủ thể chính trong cảnh. Giá trị của thẻ này thể hiện điểm tại tâm của chủ thể chính, tương ứng với cạnh bên trái, trước khi xử lý độ xoay tùy theo thẻ <độ xoay>. Giá trị thứ nhất cho biết số hiệu cột X, còn giá trị thứ hai cho biết số hiệu hàng Y."
 
 #: libexif/exif-tag.c:765
 msgid "Exposure Index"
 msgstr "Chỉ số phơi sáng"
 
 #: libexif/exif-tag.c:766
-msgid ""
-"Indicates the exposure index selected on the camera or input device at the "
-"time the image is captured."
-msgstr ""
-"Ngụ ý chỉ số phơi sáng đã ch�n trên máy ảnh hay thiết bị nhập vào lúc chụp "
-"ảnh."
+msgid "Indicates the exposure index selected on the camera or input device at the time the image is captured."
+msgstr "Cho biết chỉ số phơi sáng đã ch�n trên máy ảnh hay thiết bị nhập vào lúc chụp ảnh."
 
 #: libexif/exif-tag.c:769
 msgid "Sensing Method"
-msgstr "Phương pháp nhạy"
+msgstr "Phương thức cảm biến"
 
 #: libexif/exif-tag.c:770
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr "Ngụ ý kiểu máy nhạy ảnh trên máy ảnh hay thiết bị nhập."
+msgstr "Chỉ ra kiểu cảm biến ảnh trên máy ảnh hay thiết bị nhập."
 
 #: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr "Nguồn tập tin"
 
 #: libexif/exif-tag.c:774
-msgid ""
-"Indicates the image source. If a DSC recorded the image, the tag value of "
-"this tag always be set to 3, indicating that the image was recorded on a DSC."
-msgstr ""
-"Ngụ ý nguồn ảnh. Nếu DSC đã ghi lưu ảnh đó, giá trị thẻ của thẻ này phải "
-"luôn được đặt thành 3, ngụ ý là ảnh được ghi lưu trên DSC."
+msgid "Indicates the image source. If a DSC recorded the image, the tag value of this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr "Cho biết nguồn ảnh. Nếu DSC đã ghi lưu ảnh đó, giá trị thẻ của thẻ này phải luôn được đặt thành 3, cho biết là ảnh được ghi lưu trên DSC."
 
 #: libexif/exif-tag.c:778
 msgid "Scene Type"
 msgstr "Kiểu cảnh"
 
 #: libexif/exif-tag.c:779
-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 ""
-"Ngụ ý kiểu cảnh. Nếu DSC đã ghi lưu ảnh đó, giá trị thẻ của thẻ này phải "
-"luôn được đặt là 1, ngụ ý là ảnh đã được chụp ảnh một cách trực tiếp."
+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 "Cho biết kiểu cảnh. Nếu DSC đã ghi lưu ảnh đó, giá trị thẻ của thẻ này phải luôn được đặt là 1, cho biết là ảnh đã được chụp ảnh một cách trực tiếp."
 
 #: libexif/exif-tag.c:789
 msgid "Custom Rendered"
 msgstr "�ã vẽ tự ch�n"
 
 #: libexif/exif-tag.c:790
-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 ""
-"Thẻ này ngụ ý dữ liệu ảnh đã được xử lý một cách đặc biệt, v.d. được vẽ "
-"thích hợp với kết xuất. Khi việc xử lý đặc biệt đã được thực hiện, ng� bộ "
-"đ�c tắt hoặc tối thiểu hoá việc xử lý thêm nào."
+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 "Thẻ này cho biết dữ liệu ảnh đã được xử lý một cách đặc biệt, v.d. được vẽ thích hợp với kết xuất. Khi việc xử lý đặc biệt đã được thực hiện, ng� bộ đ�c tắt hoặc tối thiểu hóa việc xử lý thêm nào."
 
 #: libexif/exif-tag.c:796
-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 ""
-"Thẻ này ngụ ý chế độ phơi sáng được đắt vào lúc chụp ảnh. Trong chế độ tự "
-"động định vị ảnh giữa ngoặc, máy ảnh chụp một dãy khung của cùng một cảnh "
-"tại một số cấp phơi sáng khác nhau."
+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 "Thẻ này cho biết chế độ phơi sáng được đắt vào lúc chụp ảnh. Trong chế độ tự động định vị ảnh giữa ngoặc, máy ảnh chụp một dãy khung của cùng một cảnh tại một số cấp phơi sáng khác nhau."
 
 #: libexif/exif-tag.c:801
 msgid "This tag indicates the white balance mode set when the image was shot."
-msgstr "Thẻ này ngụ ý chế độ cán cân trắng được đặt vào lúc chụp ảnh."
+msgstr "Thẻ này cho biết chế độ cân bằng trắng được đặt vào lúc chụp ảnh."
 
 #: libexif/exif-tag.c:805
 msgid "Digital Zoom Ratio"
 msgstr "Tỷ lệ phóng to số"
 
 #: libexif/exif-tag.c:806
-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 ""
-"Thẻ này ngụ ý tỷ lệ phóng to số vào lúc chụp ảnh. Nếu tử số của giá trị đã "
-"ghi lưu là 0, khả năng phóng to số đã không dùng."
+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 "Thẻ này cho biết tỷ lệ phóng to số vào lúc chụp ảnh. Nếu tử số của giá trị đã ghi lưu là 0, khả năng phóng to số đã không dùng."
 
 #: libexif/exif-tag.c:811
 msgid "Focal Length in 35mm Film"
 msgstr "Tiêu cự trên phim 35mm"
 
 #: libexif/exif-tag.c:812
-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 ""
-"Thẻ này ngụ ý tiêu dự tương đương, giả sử máy ảnh phim 35 mm, theo milimét. "
-"Giá trị 0 có nghĩa là không biết tiêu cự. Ghi chú rằng thẻ này khác với thẻ "
-"FocalLength (tiêu cự)."
+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 "Thẻ này cho biết tiêu cự tương đương với máy ảnh phim 35 mm, tính theo milimét. Giá trị 0 có nghĩa là không biết tiêu cự. Ghi chú rằng thẻ này khác với thẻ FocalLength (Chi�u dài lấy nét)."
 
 #: libexif/exif-tag.c:818
 msgid "Scene Capture Type"
-msgstr "Kiểu bắt cảnh"
+msgstr "Kiểu chụp quang cảnh"
 
 #: libexif/exif-tag.c:819
-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 "
-"scene type <SceneType> tag."
-msgstr ""
-"Thẻ này ngụ ý kiểu cảnh đã chụp. Cũng có thể sử dụng nó để ghi lưu chế độ "
-"chụp ảnh. Ghi chú rằng nó khác với thẻ <SceneType> (kiểu cảnh)."
+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 scene type <SceneType> tag."
+msgstr "Thẻ này cho biết kiểu cảnh đã chụp. Cũng có thể sử dụng nó để ghi lưu chế độ chụp ảnh. Ghi chú rằng nó khác với thẻ <SceneType> (kiểu cảnh)."
 
 #: libexif/exif-tag.c:824
 msgid "Gain Control"
-msgstr "�i�u khiển Lấn chiếm"
+msgstr "�i�u khiển khuếch đại"
 
 #: libexif/exif-tag.c:825
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr "Thẻ này ngụ ý độ đi�u chỉnh lấn chiếm ảnh toàn bộ."
+msgstr "Thẻ này cho biết độ đi�u chỉnh khuếch đại ảnh toàn bộ."
 
 #: libexif/exif-tag.c:829
-msgid ""
-"This tag indicates the direction of contrast processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Thẻ này ngụ ý hướng xử lý độ tương phản được áp dụng bởi máy ảnh vào lúc "
-"chụp ảnh."
+msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."
+msgstr "Thẻ này cho biết hướng xử lý độ tương phản được áp dụng bởi máy ảnh vào lúc chụp ảnh."
 
 #: libexif/exif-tag.c:833
-msgid ""
-"This tag indicates the direction of saturation processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Thẻ này ngụ ý hướng xử lý độ bão hoà được áp dụng bởi máy ảnh vào lúc chụp "
-"ảnh."
+msgid "This tag indicates the direction of saturation processing applied by the camera when the image was shot."
+msgstr "Thẻ này cho biết hướng xử lý độ bão hòa được áp dụng bởi máy ảnh vào lúc chụp ảnh."
 
 #: libexif/exif-tag.c:837
-msgid ""
-"This tag indicates the direction of sharpness processing applied by the "
-"camera when the image was shot."
-msgstr ""
-"Thẻ này ngụ ý hướng xử lý độ sắc được áp dụng bởi máy ảnh vào lúc chụp ảnh."
+msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot."
+msgstr "Thẻ này cho biết hướng xử lý độ sắc được áp dụng bởi máy ảnh vào lúc chụp ảnh."
 
 #: libexif/exif-tag.c:841
 msgid "Device Setting Description"
-msgstr "Mô tả thiết lập thiết bị"
+msgstr "Mô tả cài đặt thiết bị"
 
 #: libexif/exif-tag.c:842
-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 ""
-"Thẻ này ngụ ý thông tin v� những đi�u kiện chụp ảnh của một mô hình máy ảnh "
-"nào đó. Thẻ này dùng chỉ để ngụ ý những đi�u kiện chụp ảnh trong bộ đ�c."
+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 "Thẻ này cho biết thông tin v� những đi�u kiện chụp ảnh của một mô hình máy ảnh nào đó. Thẻ này dùng chỉ để cho biết những đi�u kiện chụp ảnh trong bộ đ�c."
 
 #: libexif/exif-tag.c:848
 msgid "Subject Distance Range"
-msgstr "Phạm vị khoảng cách chủ thể"
+msgstr "Vùng khoảng cách chủ thể"
 
 #: libexif/exif-tag.c:849
 msgid "This tag indicates the distance to the subject."
-msgstr "Thẻ này ngụ ý khoảng cách tới chủ thể."
+msgstr "Thẻ này cho biết khoảng cách tới chủ thể."
 
 #: libexif/exif-tag.c:851
 msgid "Image Unique ID"
 msgstr "ID ảnh duy nhất"
 
 #: libexif/exif-tag.c:852
-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 ""
-"Thẻ này ngụ ý dấu nhận diện được gán một cách duy nhất cho mỗi ảnh. Nó được "
-"ghi lưu dạng chuỗi  ASCII tương tương với cách ghi hệ thập lục phân và độ "
-"dài cố định 12 -bit."
+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 "Thẻ này cho biết dấu nhận diện được gán một cách duy nhất cho mỗi ảnh. Nó được ghi lưu dạng chuỗi  ASCII tương tương với cách ghi hệ thập lục phân và độ dài cố định 12-bit."
 
 #: libexif/exif-tag.c:857
 msgid "Gamma"
-msgstr "Gamma (γ)"
+msgstr "Gamma"
 
 #: libexif/exif-tag.c:858
 msgid "Indicates the value of coefficient gamma."
-msgstr "Ngụ ý giá trị của gamma hệ số."
+msgstr "Cho biết giá trị của gamma hệ số."
 
 #: libexif/exif-tag.c:860
 msgid "PRINT Image Matching"
@@ -4234,16 +3503,8 @@ msgid "Padding"
 msgstr "�ệm"
 
 #: libexif/exif-tag.c:864
-msgid ""
-"This tag reserves space that can be reclaimed later when additional metadata "
-"are added. New metadata can be written in place by replacing this tag with a "
-"smaller data element and using the reclaimed space to store the new or "
-"expanded metadata tags."
-msgstr ""
-"Thẻ này dành riêng sức chứa có thể gán lại v� sau khi thêm siêu dữ liệu. "
-"Siêu dữ liệu mới có thể được ghi lại tại chỗ bằng cách thay thế thẻ này bằng "
-"một phần tử dữ liệu nh� hơn và sử dụng sức chứa gán lại để giữ các thẻ siêu "
-"dữ liệu mới hay mở rộng."
+msgid "This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags."
+msgstr "Thẻ này dành riêng sức chứa có thể gán lại v� sau khi thêm siêu dữ liệu. Siêu dữ liệu mới có thể được ghi lại tại chỗ bằng cách thay thế thẻ này bằng một phần tử dữ liệu nh� hơn và sử dụng sức chứa gán lại để giữ các thẻ siêu dữ liệu mới hay mở rộng."
 
 #: libexif/fuji/mnote-fuji-entry.c:62
 msgid "Softest"
@@ -4255,11 +3516,11 @@ msgstr "Cứng nhất"
 
 #: libexif/fuji/mnote-fuji-entry.c:67 libexif/fuji/mnote-fuji-entry.c:96
 msgid "Medium soft"
-msgstr "Vừa m�m"
+msgstr "M�m vừa"
 
 #: libexif/fuji/mnote-fuji-entry.c:68 libexif/fuji/mnote-fuji-entry.c:94
 msgid "Medium hard"
-msgstr "Vừa cứng"
+msgstr "Cứng vừa"
 
 #: libexif/fuji/mnote-fuji-entry.c:69 libexif/fuji/mnote-fuji-entry.c:90
 #: libexif/fuji/mnote-fuji-entry.c:98 libexif/fuji/mnote-fuji-entry.c:182
@@ -4272,11 +3533,11 @@ msgstr "Nóng sáng"
 
 #: libexif/fuji/mnote-fuji-entry.c:85
 msgid "Medium high"
-msgstr "Vừa cao"
+msgstr "Cao vừa"
 
 #: libexif/fuji/mnote-fuji-entry.c:87
 msgid "Medium low"
-msgstr "Vừa thấp"
+msgstr "Thấp vừa"
 
 #: libexif/fuji/mnote-fuji-entry.c:88 libexif/fuji/mnote-fuji-entry.c:97
 msgid "Original"
@@ -4301,7 +3562,7 @@ msgstr "Hoàng hôn"
 
 #: libexif/fuji/mnote-fuji-entry.c:128 libexif/pentax/mnote-pentax-entry.c:181
 msgid "Museum"
-msgstr "Nhà bảo tàng"
+msgstr "Bảo tàng"
 
 #: libexif/fuji/mnote-fuji-entry.c:129
 msgid "Party"
@@ -4321,7 +3582,7 @@ msgstr "NP và đèn nháy"
 
 #: libexif/fuji/mnote-fuji-entry.c:137
 msgid "Aperture priority AE"
-msgstr "Ưu tiên Khẩu độ AE"
+msgstr "Ưu tiên khẩu độ AE"
 
 #: libexif/fuji/mnote-fuji-entry.c:138
 msgid "Shutter priority AE"
@@ -4349,7 +3610,7 @@ msgstr "Cành báo m�"
 
 #: libexif/fuji/mnote-fuji-entry.c:155
 msgid "Focus good"
-msgstr "Tiêu điểm rõ"
+msgstr "Lấy nét rõ"
 
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
@@ -4373,7 +3634,7 @@ msgstr "F0/Chuẩn"
 
 #: libexif/fuji/mnote-fuji-entry.c:168
 msgid "F1/Studio portrait"
-msgstr "F1/Chân dung xưởng phim"
+msgstr "F1/Chân dung trong xưởng phim"
 
 #: libexif/fuji/mnote-fuji-entry.c:169
 msgid "F1a/Professional portrait"
@@ -4444,11 +3705,11 @@ msgstr "Sự bù độ mạnh mở đèn nháy"
 
 #: libexif/fuji/mnote-fuji-tag.c:46
 msgid "Focusing Mode"
-msgstr "Chế độ tiêu điểm"
+msgstr "Chế độ lấy nét"
 
 #: libexif/fuji/mnote-fuji-tag.c:47
 msgid "Focus Point"
-msgstr "�iểm tiêu điểm"
+msgstr "�iểm lấy nét"
 
 #: libexif/fuji/mnote-fuji-tag.c:48
 msgid "Slow Synchro Mode"
@@ -4476,7 +3737,7 @@ msgstr "Kiểm tra m�"
 
 #: libexif/fuji/mnote-fuji-tag.c:54
 msgid "Auto Focus Check"
-msgstr "Kiểm tra tự động tiêu điểm"
+msgstr "Kiểm tra tự động lấy nét"
 
 #: libexif/fuji/mnote-fuji-tag.c:55
 msgid "Auto Exposure Check"
@@ -4569,7 +3830,7 @@ msgstr "VGA chuẩn"
 
 #: libexif/olympus/mnote-olympus-entry.c:108
 msgid "VGA fine"
-msgstr "VGA chính xác"
+msgstr "VGA đẹp"
 
 #: libexif/olympus/mnote-olympus-entry.c:109
 msgid "SXGA basic"
@@ -4581,7 +3842,7 @@ msgstr "SXGA chuẩn"
 
 #: libexif/olympus/mnote-olympus-entry.c:111
 msgid "SXGA fine"
-msgstr "SXGA chính xác"
+msgstr "SXGA đẹp"
 
 #: libexif/olympus/mnote-olympus-entry.c:112
 msgid "2 Mpixel basic"
@@ -4593,7 +3854,7 @@ msgstr "2 MP chuẩn"
 
 #: libexif/olympus/mnote-olympus-entry.c:114
 msgid "2 Mpixel fine"
-msgstr "2 MP chính xác"
+msgstr "2 MP đẹp"
 
 #: libexif/olympus/mnote-olympus-entry.c:117
 msgid "Color"
@@ -4641,7 +3902,7 @@ msgstr "�ịnh sẵn"
 
 #: libexif/olympus/mnote-olympus-entry.c:137
 msgid "Incandescence"
-msgstr "Nóng sáng"
+msgstr "�èn dây tóc"
 
 #: libexif/olympus/mnote-olympus-entry.c:138
 msgid "Fluorescence"
@@ -4685,7 +3946,7 @@ msgstr "Chuẩn, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:153
 msgid "Normal, super high"
-msgstr "Chuẩn, siêu cao"
+msgstr "Chuẩn, cực cao"
 
 #: libexif/olympus/mnote-olympus-entry.c:154
 msgid "Normal, standard"
@@ -4693,63 +3954,63 @@ msgstr "Chuẩn, tiêu chuẩn"
 
 #: libexif/olympus/mnote-olympus-entry.c:155
 msgid "Fine, SQ"
-msgstr "Chính xác, SQ"
+msgstr "�ẹp, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:156
 msgid "Fine, HQ"
-msgstr "Chính xác, HQ"
+msgstr "�ẹp, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:157
 msgid "Fine, SHQ"
-msgstr "Chính xác.SHQ"
+msgstr "�ẹp, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:158
 msgid "Fine, RAW"
-msgstr "Chính xác, RAW"
+msgstr "�ẹp, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:159
 msgid "Fine, SQ1"
-msgstr "Chính xác, SQ1"
+msgstr "�ẹp, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:160
 msgid "Fine, SQ2"
-msgstr "Chính xác, SQ2"
+msgstr "�ẹp, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:161
 msgid "Fine, super high"
-msgstr "Chính xác, siêu cao"
+msgstr "�ẹp, cực cao"
 
 #: libexif/olympus/mnote-olympus-entry.c:162
 msgid "Super fine, SQ"
-msgstr "Siêu chính xác, SQ"
+msgstr "Cực đẹp, SQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:163
 msgid "Super fine, HQ"
-msgstr "Siêu chính xác, HQ"
+msgstr "Cực đẹp, HQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:164
 msgid "Super fine, SHQ"
-msgstr "Siêu chính xác, SHQ"
+msgstr "Cực đẹp, SHQ"
 
 #: libexif/olympus/mnote-olympus-entry.c:165
 msgid "Super fine, RAW"
-msgstr "Siêu chính xác, RAW"
+msgstr "Cực đẹp, RAW"
 
 #: libexif/olympus/mnote-olympus-entry.c:166
 msgid "Super fine, SQ1"
-msgstr "Siêu chính xác, SQ1"
+msgstr "Cực đẹp, SQ1"
 
 #: libexif/olympus/mnote-olympus-entry.c:167
 msgid "Super fine, SQ2"
-msgstr "Siêu chính xác, SQ2"
+msgstr "Cực đẹp, SQ2"
 
 #: libexif/olympus/mnote-olympus-entry.c:168
 msgid "Super fine, super high"
-msgstr "Siêu chính xác, siêu cao"
+msgstr "Cực đẹp, cực cao"
 
 #: libexif/olympus/mnote-olympus-entry.c:169
 msgid "Super fine, high"
-msgstr "Siêu chính xác, cao"
+msgstr "Cực đẹp, cao"
 
 #: libexif/olympus/mnote-olympus-entry.c:172
 #: libexif/olympus/mnote-olympus-entry.c:177
@@ -4777,7 +4038,7 @@ msgstr "�an nhau"
 
 #: libexif/olympus/mnote-olympus-entry.c:225
 msgid "Progressive"
-msgstr "Tiến lên"
+msgstr "Diễn tiến"
 
 #: libexif/olympus/mnote-olympus-entry.c:231
 #: libexif/pentax/mnote-pentax-entry.c:85
@@ -4787,11 +4048,11 @@ msgstr "Tốt nhất"
 
 #: libexif/olympus/mnote-olympus-entry.c:232
 msgid "Adjust exposure"
-msgstr "Chỉnh phơi nắng"
+msgstr "Chỉnh phơi sáng"
 
 #: libexif/olympus/mnote-olympus-entry.c:235
 msgid "Spot focus"
-msgstr "Tiêu �iểm"
+msgstr "�iểm lấy nét"
 
 #: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Normal focus"
@@ -4862,7 +4123,7 @@ msgstr "Sửa đ� %f, Sửa xanh %f"
 
 #: libexif/olympus/mnote-olympus-entry.c:388
 msgid "No manual focus selection"
-msgstr "Chưa tự ch�n tiêu điểm"
+msgstr "Chưa tự ch�n lấy nét"
 
 #: libexif/olympus/mnote-olympus-entry.c:391
 #, c-format
@@ -4963,7 +4224,7 @@ msgstr "Bấm đơn"
 #: libexif/olympus/mnote-olympus-entry.c:797
 #: libexif/olympus/mnote-olympus-entry.c:807
 msgid "Infinite"
-msgstr "Vô hạn"
+msgstr "Vô cực"
 
 #: libexif/olympus/mnote-olympus-entry.c:815
 #, c-format
@@ -4973,7 +4234,7 @@ msgstr "%i byte dữ liệu không rõ: "
 #: libexif/olympus/mnote-olympus-tag.c:38
 #: libexif/olympus/mnote-olympus-tag.c:53
 msgid "ISO Setting"
-msgstr "Thiết lập ISO"
+msgstr "Cài đặt ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:39
 msgid "Color Mode (?)"
@@ -4985,15 +4246,15 @@ msgstr "Làm Sắc Ảnh"
 
 #: libexif/olympus/mnote-olympus-tag.c:44
 msgid "Flash Setting"
-msgstr "Thiết lập �èn nháy"
+msgstr "Cài đặt �èn nháy"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
 msgid "White Balance Fine Adjustment"
-msgstr "Chỉnh đúng Cán cân trắng"
+msgstr "Chỉnh cân bằng trắng"
 
 #: libexif/olympus/mnote-olympus-tag.c:47
 msgid "White Balance RB"
-msgstr "RB cán cân trắng"
+msgstr "RB cân bằng trắng"
 
 #: libexif/olympus/mnote-olympus-tag.c:49
 msgid "ISO Selection"
@@ -5009,19 +4270,19 @@ msgstr "Vị trí tương đối của thư mục xem trước ảnh (IFD) trong
 
 #: libexif/olympus/mnote-olympus-tag.c:51
 msgid "Exposurediff ?"
-msgstr "Khác biệt phơi nắng ?"
+msgstr "Khác biệt phơi sáng?"
 
 #: libexif/olympus/mnote-olympus-tag.c:54
 msgid "Image Boundary"
-msgstr "Ranh giới Ảnh"
+msgstr "�ư�ng biên Ảnh"
 
 #: libexif/olympus/mnote-olympus-tag.c:56
 msgid "Flash Exposure Bracket Value"
-msgstr "Giá trị Ngoặc Phơi nắng �èn nháy"
+msgstr "Giá trị �èn nháy chụp bủa vây"
 
 #: libexif/olympus/mnote-olympus-tag.c:57
 msgid "Exposure Bracket Value"
-msgstr "Giá trị Ngoặc Phơi nắng"
+msgstr "Giá trị phơi sáng chụp bủa vây"
 
 #: libexif/olympus/mnote-olympus-tag.c:58
 #: libexif/olympus/mnote-olympus-tag.c:96
@@ -5034,7 +4295,7 @@ msgstr "Bù Sắc Màu"
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
-msgstr "Bộ tiếp hợp"
+msgstr "Bộ nguồn AC"
 
 #: libexif/olympus/mnote-olympus-tag.c:62
 msgid "Lens"
@@ -5052,19 +4313,19 @@ msgstr "Dùng đèn nháy"
 
 #: libexif/olympus/mnote-olympus-tag.c:66
 msgid "AF Focus Position"
-msgstr "Vị trí Tiêu điểm AF"
+msgstr "Vị trí lấy nét AF"
 
 #: libexif/olympus/mnote-olympus-tag.c:67
 msgid "Bracketing"
-msgstr "�ặt giữa ngoặc"
+msgstr "Bủa vây"
 
 #: libexif/olympus/mnote-olympus-tag.c:69
 msgid "Lens F Stops"
-msgstr "Cấp tiêu �ng kính"
+msgstr "Các độ mở �ng kính"
 
 #: libexif/olympus/mnote-olympus-tag.c:70
 msgid "Contrast Curve"
-msgstr "Cong tương phản"
+msgstr "�ư�ng cong tương phản"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
 #: libexif/olympus/mnote-olympus-tag.c:95
@@ -5088,7 +4349,7 @@ msgstr "Giảm nhiễu"
 
 #: libexif/olympus/mnote-olympus-tag.c:79
 msgid "Sensor Pixel Size"
-msgstr "Cỡ điểm ảnh máy nhạy"
+msgstr "Cỡ điểm ảnh cảm biến"
 
 #: libexif/olympus/mnote-olympus-tag.c:82
 msgid "Image Data Size"
@@ -5104,7 +4365,7 @@ msgstr "Tổng số ảnh đã chụp"
 
 #: libexif/olympus/mnote-olympus-tag.c:86
 msgid "Optimize Image"
-msgstr "Tối đa hoá ảnh"
+msgstr "Tối đa hóa ảnh"
 
 #: libexif/olympus/mnote-olympus-tag.c:88
 msgid "Vari Program"
@@ -5125,7 +4386,7 @@ msgstr "�ộ nhạy CCD"
 
 #: libexif/olympus/mnote-olympus-tag.c:99
 msgid "Focus"
-msgstr "Tiêu điểm"
+msgstr "Lấy nét"
 
 #: libexif/olympus/mnote-olympus-tag.c:102
 msgid "Converter"
@@ -5161,7 +4422,7 @@ msgstr "Mã số Máy ảnh"
 
 #: libexif/olympus/mnote-olympus-tag.c:116
 msgid "Precapture Frames"
-msgstr "Khung Bắt Sẵn"
+msgstr "Khung chụp Sẵn"
 
 #: libexif/olympus/mnote-olympus-tag.c:117
 msgid "White Board"
@@ -5169,16 +4430,16 @@ msgstr "Bảng Trắng"
 
 #: libexif/olympus/mnote-olympus-tag.c:118
 msgid "One Touch White Balance"
-msgstr "Cán cân trắng s� một"
+msgstr "Cân bằng trắng một lần"
 
 #: libexif/olympus/mnote-olympus-tag.c:119
 msgid "White Balance Bracket"
-msgstr "Ngoặc cán cân trắng"
+msgstr "Cân bằng trắng hàng loạt"
 
 #: libexif/olympus/mnote-olympus-tag.c:120
 #: libexif/pentax/mnote-pentax-tag.c:123
 msgid "White Balance Bias"
-msgstr "Khuynh hướng cán cân trắng"
+msgstr "�ộ lệnh cân bằng trắng"
 
 #: libexif/olympus/mnote-olympus-tag.c:121
 msgid "Data Dump"
@@ -5190,43 +4451,43 @@ msgstr "Giá trị ISO"
 
 #: libexif/olympus/mnote-olympus-tag.c:125
 msgid "Aperture Value"
-msgstr "Giá trị Khẩu độ"
+msgstr "Giá trị khẩu độ"
 
 #: libexif/olympus/mnote-olympus-tag.c:126
 msgid "Brightness Value"
-msgstr "Giá trị độ Sáng"
+msgstr "Giá trị độ sáng"
 
 #: libexif/olympus/mnote-olympus-tag.c:128
 msgid "Flash Device"
-msgstr "Thiết bị �èn nháy"
+msgstr "Thiết bị đèn nháy"
 
 #: libexif/olympus/mnote-olympus-tag.c:130
 msgid "Sensor Temperature"
-msgstr "Nhiệt độ Máy nhạy"
+msgstr "Nhiệt độ cảm biến"
 
 #: libexif/olympus/mnote-olympus-tag.c:131
 msgid "Lens Temperature"
-msgstr "Nhiệt độ �ng kính"
+msgstr "Nhiệt độ ống kính"
 
 #: libexif/olympus/mnote-olympus-tag.c:132
 msgid "Light Condition"
-msgstr "�i�u kiện �nh sáng"
+msgstr "�i�u kiện ánh sáng"
 
 #: libexif/olympus/mnote-olympus-tag.c:136
 msgid "Zoom Step Count"
-msgstr "�ếm bước Phóng to"
+msgstr "�ếm bước phóng to"
 
 #: libexif/olympus/mnote-olympus-tag.c:137
 msgid "Focus Step Count"
-msgstr "�ếm bước Tiêu cự"
+msgstr "�ếm bước tiêu cự"
 
 #: libexif/olympus/mnote-olympus-tag.c:138
 msgid "Sharpness Setting"
-msgstr "Thiết lập độ Sắc"
+msgstr "Cài đặt độ Sắc"
 
 #: libexif/olympus/mnote-olympus-tag.c:139
 msgid "Flash Charge Level"
-msgstr "Cấp nạp điện �èn nháy"
+msgstr "Mức độ nạp điện đèn nháy"
 
 #: libexif/olympus/mnote-olympus-tag.c:140
 msgid "Color Matrix"
@@ -5234,21 +4495,21 @@ msgstr "Ma trận Màu"
 
 #: libexif/olympus/mnote-olympus-tag.c:141
 msgid "Black Level"
-msgstr "Cấp �en"
+msgstr "Mức �en"
 
 #: libexif/olympus/mnote-olympus-tag.c:142
 msgid "White Balance Setting"
-msgstr "Thiết lập Cán cân Trắng"
+msgstr "Cài đặt cân bằng trắng"
 
 #: libexif/olympus/mnote-olympus-tag.c:143
 #: libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
-msgstr "Cán cân ��"
+msgstr "Cân bằng ��"
 
 #: libexif/olympus/mnote-olympus-tag.c:144
 #: libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
-msgstr "Cán cân Xanh"
+msgstr "Cân bằng Xanh lơ"
 
 #: libexif/olympus/mnote-olympus-tag.c:145
 msgid "Color Matrix Number"
@@ -5256,7 +4517,7 @@ msgstr "Số Ma trận Màu"
 
 #: libexif/olympus/mnote-olympus-tag.c:147
 msgid "Flash Exposure Comp"
-msgstr "Bù Phơi nắng �èn nháy"
+msgstr "Bù phơi sáng �èn nháy"
 
 #: libexif/olympus/mnote-olympus-tag.c:148
 msgid "Internal Flash Table"
@@ -5280,7 +4541,7 @@ msgstr "Chế độ �èn nháy bên Ngoài"
 
 #: libexif/olympus/mnote-olympus-tag.c:153
 msgid "Contrast Setting"
-msgstr "Thiết lập độ Tương phản"
+msgstr "Cài đặt độ Tương phản"
 
 #: libexif/olympus/mnote-olympus-tag.c:154
 msgid "Sharpness Factor"
@@ -5336,7 +4597,7 @@ msgstr "Ngoại vi giá trị ánh sáng"
 
 #: libexif/olympus/mnote-olympus-tag.c:170
 msgid "Sequential Shot"
-msgstr "Chụp tuần tự"
+msgstr "Chụp liên tiếp"
 
 #: libexif/olympus/mnote-olympus-tag.c:171
 msgid "Wide Range"
@@ -5364,7 +4625,7 @@ msgstr "Giảm rung rinh"
 
 #: libexif/olympus/mnote-olympus-tag.c:179
 msgid "Optical Zoom"
-msgstr "Thu/phóng quang"
+msgstr "Thu/phóng quang h�c"
 
 #: libexif/olympus/mnote-olympus-tag.c:181
 msgid "Light Source Special"
@@ -5380,7 +4641,7 @@ msgstr "Ch�n cảnh"
 
 #: libexif/olympus/mnote-olympus-tag.c:186
 msgid "Sequence Shot Interval"
-msgstr "Khoảng chụp dãy"
+msgstr "Khoảng chụp liên tục"
 
 #: libexif/olympus/mnote-olympus-tag.c:189
 msgid "Epson Image Width"
@@ -5392,12 +4653,12 @@ msgstr "B� cao ảnh Epson"
 
 #: libexif/olympus/mnote-olympus-tag.c:191
 msgid "Epson Software Version"
-msgstr "Phiên bản Phần m�m Epson"
+msgstr "Phiên bản phần m�m Epson"
 
 #: libexif/pentax/mnote-pentax-entry.c:80
 #: libexif/pentax/mnote-pentax-entry.c:134
 msgid "Multi-exposure"
-msgstr "�a phơi nắng"
+msgstr "�a phơi sáng"
 
 #: libexif/pentax/mnote-pentax-entry.c:83
 #: libexif/pentax/mnote-pentax-entry.c:137
@@ -5431,23 +4692,23 @@ msgstr "2816×2212 hay 2816×2112"
 
 #: libexif/pentax/mnote-pentax-entry.c:171
 msgid "Surf & snow"
-msgstr "Sóng nhào và Tuyết"
+msgstr "Sóng bạc đầu & tuyết"
 
 #: libexif/pentax/mnote-pentax-entry.c:172
 msgid "Sunset or candlelight"
-msgstr "Hoàng hôn hay �nh sáng đèn nến"
+msgstr "Hoàng hôn hay ánh sáng nến"
 
 #: libexif/pentax/mnote-pentax-entry.c:173
 msgid "Autumn"
-msgstr "Mùa Thu"
+msgstr "Mùa thu"
 
 #: libexif/pentax/mnote-pentax-entry.c:178
 msgid "Self portrait"
-msgstr "Bức tự hoạ"
+msgstr "Bức tự h�a"
 
 #: libexif/pentax/mnote-pentax-entry.c:179
 msgid "Illustrations"
-msgstr "Ảnh minh hoạ"
+msgstr "Ảnh minh h�a"
 
 #: libexif/pentax/mnote-pentax-entry.c:180
 msgid "Digital filter"
@@ -5463,20 +4724,20 @@ msgstr "Chế độ Lục"
 
 #: libexif/pentax/mnote-pentax-entry.c:184
 msgid "Light pet"
-msgstr "Con cưng sáng"
+msgstr "Thú cưng sáng"
 
 #: libexif/pentax/mnote-pentax-entry.c:185
 msgid "Dark pet"
-msgstr "Con cưng tối"
+msgstr "Thú cưng tối"
 
 #: libexif/pentax/mnote-pentax-entry.c:186
 msgid "Medium pet"
-msgstr "Con cưng vừa"
+msgstr "Thú cưng vừa"
 
 #: libexif/pentax/mnote-pentax-entry.c:188
 #: libexif/pentax/mnote-pentax-entry.c:296
 msgid "Candlelight"
-msgstr "�nh sáng đèn nến"
+msgstr "�nh sáng nến"
 
 #: libexif/pentax/mnote-pentax-entry.c:189
 msgid "Natural skin tone"
@@ -5508,7 +4769,7 @@ msgstr "Tự động, hoạt động, giảm mắt đ�"
 
 #: libexif/pentax/mnote-pentax-entry.c:201
 msgid "On, wireless"
-msgstr "Bật, vô tuyến"
+msgstr "Bật, không dây (wireless)"
 
 #: libexif/pentax/mnote-pentax-entry.c:202
 msgid "On, soft"
@@ -5592,7 +4853,7 @@ msgstr "3008×2008 hay 3040×2024"
 
 #: libexif/pentax/mnote-pentax-entry.c:293
 msgid "Digital filter?"
-msgstr "L�c số ?"
+msgstr "L�c số?"
 
 #: libexif/pentax/mnote-pentax-entry.c:374
 #: libexif/pentax/mnote-pentax-entry.c:383
@@ -5619,7 +4880,7 @@ msgstr "Màu sắc"
 
 #: libexif/pentax/mnote-pentax-tag.c:59
 msgid "PrintIM Settings"
-msgstr "Thiết lập PrintIM"
+msgstr "Cài đặt PrintIM"
 
 #: libexif/pentax/mnote-pentax-tag.c:60 libexif/pentax/mnote-pentax-tag.c:131
 msgid "Time Zone"
@@ -5675,7 +4936,7 @@ msgstr "Tự động đặt giữa ngoặc"
 
 #: libexif/pentax/mnote-pentax-tag.c:85
 msgid "White Balance Mode"
-msgstr "Chế độ cán cân trắng"
+msgstr "Chế độ cân bằng trắng"
 
 #: libexif/pentax/mnote-pentax-tag.c:93
 msgid "World Time Location"
@@ -5715,7 +4976,7 @@ msgstr "Chế độ ảnh (2)"
 
 #: libexif/pentax/mnote-pentax-tag.c:103
 msgid "Image Area Offset"
-msgstr "Hiệu vùng ảnh"
+msgstr "Vị trí tương đối vùng ảnh"
 
 #: libexif/pentax/mnote-pentax-tag.c:104
 msgid "Raw Image Size"
@@ -5723,11 +4984,11 @@ msgstr "Cỡ ảnh thô"
 
 #: libexif/pentax/mnote-pentax-tag.c:105
 msgid "Autofocus Points Used"
-msgstr "�iểm tự động tiêu cự được dùng"
+msgstr "Lấy nén các điểm được dùng"
 
 #: libexif/pentax/mnote-pentax-tag.c:107
 msgid "Camera Temperature"
-msgstr "Nhiệt độ Máy nhạy"
+msgstr "Nhiệt độ cảm biến"
 
 #: libexif/pentax/mnote-pentax-tag.c:110
 msgid "Image Tone"
@@ -5735,11 +4996,11 @@ msgstr "Sắc màu ảnh"
 
 #: libexif/pentax/mnote-pentax-tag.c:111
 msgid "Shake Reduction Info"
-msgstr "Thông tin giảm run"
+msgstr "Thông tin giảm rung"
 
 #: libexif/pentax/mnote-pentax-tag.c:112
 msgid "Black Point"
-msgstr "�iểm �en"
+msgstr "�iểm đen"
 
 #: libexif/pentax/mnote-pentax-tag.c:114
 msgid "AE Info"
@@ -5747,19 +5008,19 @@ msgstr "Thông tin AE"
 
 #: libexif/pentax/mnote-pentax-tag.c:115
 msgid "Lens Info"
-msgstr "Thông tin �ng kính"
+msgstr "Thông tin ống kính"
 
 #: libexif/pentax/mnote-pentax-tag.c:116
 msgid "Flash Info"
-msgstr "Thông tin �èn nháy"
+msgstr "Thông tin đèn nháy"
 
 #: libexif/pentax/mnote-pentax-tag.c:117
 msgid "Camera Info"
-msgstr "Thông tin Máy ảnh"
+msgstr "Thông tin máy ảnh"
 
 #: libexif/pentax/mnote-pentax-tag.c:118
 msgid "Battery Info"
-msgstr "Thông tin Pin"
+msgstr "Thông tin pin"
 
 #: libexif/pentax/mnote-pentax-tag.c:119
 msgid "Hometown City Code"
@@ -5795,15 +5056,17 @@ msgstr "Tăng cư�ng"
 
 #: libexif/pentax/mnote-pentax-tag.c:136
 msgid "Finer"
-msgstr "Chính xác hơn"
+msgstr "�ẹp hơn"
 
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
+#~ msgid "FNumber"
+#~ msgstr "Số-F"
+
 #~ msgid "Tag UserComment does not comply with standard but contains data."
-#~ msgstr ""
-#~ "Thẻ \"Ngư�i dùng ghi chú\" không tuân theo tiêu chuẩn, còn chứa dữ liệu."
+#~ msgstr "Thẻ \"Ngư�i dùng ghi chú\" không tuân theo tiêu chuẩn, còn chứa dữ liệu."
 
 #~ msgid "%.02lf EV"
 #~ msgstr "%.02lf EV"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
deleted file mode 100644
index 97a6f97..0000000
--- a/po/zh_CN.gmo
+++ /dev/null
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 08be241..1d8d242 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"POT-Creation-Date: 2018-08-26 12:22+0200\n"
 "PO-Revision-Date: 2011-05-18 08:44+0000\n"
 "Last-Translator: Lyricz <flyhigher@gmail.com>\n"
 "Language-Team: Chinese (China) <zh_CN@li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,7 +40,7 @@ msgid "Invalid number of components (%i, expected %i or %i)."
 msgstr "无效的组件数（%i，期望%i或者%i）。"
 
 #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:815
 #: libexif/olympus/mnote-olympus-entry.c:199
 #: libexif/olympus/mnote-olympus-tag.c:108
 #: libexif/pentax/mnote-pentax-entry.c:174
@@ -51,14 +51,14 @@ msgstr "�"
 
 #: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
 #: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
-#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:693
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/exif-entry.c:764 libexif/fuji/mnote-fuji-entry.c:64
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/olympus/mnote-olympus-entry.c:198
 #: libexif/olympus/mnote-olympus-entry.c:206
 #: libexif/olympus/mnote-olympus-entry.c:216
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:593
 #: libexif/pentax/mnote-pentax-entry.c:105
 #: libexif/pentax/mnote-pentax-entry.c:110
 #: libexif/pentax/mnote-pentax-entry.c:115
@@ -87,15 +87,15 @@ msgstr "精细"
 #: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
 #: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
 #: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:586 libexif/canon/mnote-canon-entry.c:686
 #: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
 #: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
 #: libexif/fuji/mnote-fuji-entry.c:142
 #: libexif/olympus/mnote-olympus-entry.c:181
 #: libexif/olympus/mnote-olympus-entry.c:189
 #: libexif/olympus/mnote-olympus-entry.c:254
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:537
+#: libexif/olympus/mnote-olympus-entry.c:554
 #: libexif/pentax/mnote-pentax-entry.c:195
 #: libexif/pentax/mnote-pentax-entry.c:260
 msgid "Off"
@@ -127,8 +127,8 @@ msgstr "自动"
 #: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
 #: libexif/fuji/mnote-fuji-entry.c:143
 #: libexif/olympus/mnote-olympus-entry.c:182
-#: libexif/olympus/mnote-olympus-entry.c:539
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:540
+#: libexif/olympus/mnote-olympus-entry.c:557
 #: libexif/pentax/mnote-pentax-entry.c:198
 #: libexif/pentax/mnote-pentax-entry.c:261
 msgid "On"
@@ -148,8 +148,7 @@ msgstr "慢速�步"
 msgid "Auto, red-eye reduction"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:89
-#: libexif/pentax/mnote-pentax-entry.c:200
+#: libexif/canon/mnote-canon-entry.c:89 libexif/pentax/mnote-pentax-entry.c:200
 msgid "On, red-eye reduction"
 msgstr ""
 
@@ -271,9 +270,8 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
-#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
-#: libexif/fuji/mnote-fuji-entry.c:112
-#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:763
+#: libexif/fuji/mnote-fuji-entry.c:112 libexif/olympus/mnote-olympus-entry.c:93
 #: libexif/olympus/mnote-olympus-entry.c:203
 #: libexif/pentax/mnote-pentax-entry.c:79
 #: libexif/pentax/mnote-pentax-entry.c:102
@@ -285,7 +283,7 @@ msgid "Manual"
 msgstr "手动"
 
 #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:774
 #: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
 #: libexif/pentax/mnote-pentax-entry.c:301
 msgid "Landscape"
@@ -314,7 +312,7 @@ msgid "Sepia"
 msgstr "棕�色"
 
 #: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
-#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/exif-entry.c:690 libexif/exif-entry.c:772
 #: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
 #: libexif/pentax/mnote-pentax-entry.c:291
 #: libexif/pentax/mnote-pentax-entry.c:294
@@ -341,8 +339,7 @@ msgstr "鲜艳"
 msgid "Neutral"
 msgstr "中性"
 
-#: libexif/canon/mnote-canon-entry.c:135
-#: libexif/pentax/mnote-pentax-entry.c:93
+#: libexif/canon/mnote-canon-entry.c:135 libexif/pentax/mnote-pentax-entry.c:93
 msgid "Flash off"
 msgstr "闪光�关闭"
 
@@ -424,7 +421,7 @@ msgstr "ISO 3200"
 #: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
 #: libexif/olympus/mnote-olympus-entry.c:192
 #: libexif/olympus/mnote-olympus-entry.c:229
-#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/olympus/mnote-olympus-entry.c:458
 #: libexif/pentax/mnote-pentax-entry.c:242
 msgid "None"
 msgstr "æ— "
@@ -437,8 +434,8 @@ msgstr "2x"
 msgid "4x"
 msgstr "4x"
 
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
-#: libexif/exif-entry.c:752
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:721
+#: libexif/exif-entry.c:751
 msgid "Other"
 msgstr "其它"
 
@@ -488,11 +485,11 @@ msgstr "800"
 msgid "Default"
 msgstr "默认"
 
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:717
 msgid "Spot"
 msgstr "点"
 
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:715
 msgid "Average"
 msgstr "平�"
 
@@ -500,11 +497,11 @@ msgstr "平�"
 msgid "Evaluative"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:720
 msgid "Partial"
 msgstr "局部"
 
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:716
 msgid "Center-weighted average"
 msgstr ""
 
@@ -516,7 +513,7 @@ msgstr ""
 msgid "Very close"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:816
 msgid "Close"
 msgstr "关闭"
 
@@ -630,7 +627,7 @@ msgstr "佳能 EF 80-200mm f/2.8L"
 
 #: libexif/canon/mnote-canon-entry.c:213
 msgid "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
-msgstr ""
+msgstr "图丽 AT-X280AF PRO 28-80mm F2.8 Aspherical"
 
 #: libexif/canon/mnote-canon-entry.c:214
 msgid "Cosina 100mm f/3.5 Macro AF"
@@ -653,9 +650,8 @@ msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 msgstr "佳能 EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
 
 #: libexif/canon/mnote-canon-entry.c:219
-#, fuzzy
 msgid "Canon EF 35-80mm f/4-5.6"
-msgstr "佳能 EF 75-300mm f/4-5.6"
+msgstr "佳能 EF 35-80mm f/4-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:220
 msgid "Canon EF 75-300mm f/4-5.6"
@@ -674,9 +670,8 @@ msgid "Canon EF-S 18-55mm f/3.5-5.6"
 msgstr "佳能 EF-S 18-55mm f/3.5-5.6"
 
 #: libexif/canon/mnote-canon-entry.c:224
-#, fuzzy
 msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
-msgstr "佳能 EF-S 18-55mm f/3.5-5.6"
+msgstr "佳能 EF-S 18-55mm f/3.5-5.6 IS II"
 
 #: libexif/canon/mnote-canon-entry.c:225
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
@@ -927,9 +922,8 @@ msgid "Canon EF 70-200mm f/4L IS USM"
 msgstr "佳能 EF 70-200mm f/4L IS USM"
 
 #: libexif/canon/mnote-canon-entry.c:287
-#, fuzzy
 msgid "Canon EF 70-200mm f/2.8L IS II USM"
-msgstr "佳能 EF 70-200mm f/2.8L IS USM"
+msgstr "佳能 EF 70-200mm f/2.8L IS II USM"
 
 #: libexif/canon/mnote-canon-entry.c:289
 msgid "TTL"
@@ -1030,32 +1024,32 @@ msgid "Sunny"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/exif-entry.c:738 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:139
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
-#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:100
 #: libexif/pentax/mnote-pentax-entry.c:249
 msgid "Tungsten"
 msgstr "钨�"
 
 #: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
-#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/exif-entry.c:734 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
 msgstr "�光�"
 
 #: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:778 libexif/exif-tag.c:586
 #: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
 msgid "Flash"
 msgstr "闪光�"
 
 #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
-#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/exif-entry.c:739 libexif/pentax/mnote-pentax-entry.c:99
 #: libexif/pentax/mnote-pentax-entry.c:247
 msgid "Shade"
 msgstr "阴影"
@@ -1077,7 +1071,7 @@ msgid "PC set 3"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
-#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/exif-entry.c:740 libexif/fuji/mnote-fuji-entry.c:76
 #: libexif/pentax/mnote-pentax-entry.c:251
 msgid "Daylight fluorescent"
 msgstr "日光色�光�"
@@ -1090,7 +1084,7 @@ msgstr "自定义 1"
 msgid "Custom 2"
 msgstr "自定义 2"
 
-#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:691
 #: libexif/pentax/mnote-pentax-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:132
 #: libexif/pentax/mnote-pentax-entry.c:169
@@ -1155,22 +1149,22 @@ msgid "Rotated by software"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/olympus/mnote-olympus-entry.c:613
 msgid "Left to right"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:385
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/olympus/mnote-olympus-entry.c:616
 msgid "Right to left"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:386
-#: libexif/olympus/mnote-olympus-entry.c:618
+#: libexif/olympus/mnote-olympus-entry.c:619
 msgid "Bottom to top"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:387
-#: libexif/olympus/mnote-olympus-entry.c:621
+#: libexif/olympus/mnote-olympus-entry.c:622
 msgid "Top to bottom"
 msgstr ""
 
@@ -1180,7 +1174,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
 #: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
-#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/exif-entry.c:690 libexif/fuji/mnote-fuji-entry.c:84
 #: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
 #: libexif/olympus/mnote-olympus-entry.c:230
 msgid "Standard"
@@ -1198,9 +1192,8 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
-#: libexif/fuji/mnote-fuji-entry.c:74
-#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:733
+#: libexif/fuji/mnote-fuji-entry.c:74 libexif/olympus/mnote-olympus-entry.c:136
 #: libexif/pentax/mnote-pentax-entry.c:98
 #: libexif/pentax/mnote-pentax-entry.c:246
 msgid "Daylight"
@@ -1255,37 +1248,44 @@ msgstr ""
 msgid ", "
 msgstr ", "
 
-#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#: libexif/canon/mnote-canon-entry.c:589 libexif/canon/mnote-canon-entry.c:689
 #, c-format
 msgid "%i (ms)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:624
+#: libexif/canon/mnote-canon-entry.c:634
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: libexif/canon/mnote-canon-entry.c:648
+#: libexif/canon/mnote-canon-entry.c:660
 #, c-format
 msgid "%.2f EV"
 msgstr "%.2f EV"
 
-#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#: libexif/canon/mnote-canon-entry.c:670 libexif/exif-entry.c:1088
 #, c-format
 msgid "1/%i"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:670
+#: libexif/canon/mnote-canon-entry.c:682
 #, c-format
 msgid "%u mm"
 msgstr "%u mm"
 
+#: libexif/canon/mnote-canon-entry.c:817 libexif/fuji/mnote-fuji-entry.c:303
+#: libexif/pentax/mnote-pentax-entry.c:401
+#: libexif/pentax/mnote-pentax-entry.c:497
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i 字节未知数�"
+
 #: libexif/canon/mnote-canon-tag.c:35
 msgid "Settings (First Part)"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
-#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+#: libexif/exif-tag.c:590 libexif/pentax/mnote-pentax-tag.c:88
 msgid "Focal Length"
 msgstr "焦�"
 
@@ -1293,8 +1293,7 @@ msgstr "焦�"
 msgid "Settings (Second Part)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/canon/mnote-canon-tag.c:38 libexif/olympus/mnote-olympus-entry.c:602
 #: libexif/pentax/mnote-pentax-entry.c:177
 msgid "Panorama"
 msgstr ""
@@ -1349,8 +1348,8 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:45
-#: libexif/olympus/mnote-olympus-tag.c:127
-#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+#: libexif/olympus/mnote-olympus-tag.c:127 libexif/pentax/mnote-pentax-tag.c:38
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Flash Mode"
 msgstr "闪光模�"
 
@@ -1361,9 +1360,8 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
 #: libexif/olympus/mnote-olympus-tag.c:43
 #: libexif/olympus/mnote-olympus-tag.c:134
-#: libexif/olympus/mnote-olympus-tag.c:173
-#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
-#: libexif/pentax/mnote-pentax-tag.c:130
+#: libexif/olympus/mnote-olympus-tag.c:173 libexif/pentax/mnote-pentax-tag.c:37
+#: libexif/pentax/mnote-pentax-tag.c:74 libexif/pentax/mnote-pentax-tag.c:130
 msgid "Focus Mode"
 msgstr "对焦模�"
 
@@ -1382,25 +1380,24 @@ msgstr ""
 #: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
 #: libexif/olympus/mnote-olympus-tag.c:101
 #: libexif/olympus/mnote-olympus-tag.c:110
-#: libexif/olympus/mnote-olympus-tag.c:180
-#: libexif/pentax/mnote-pentax-tag.c:89
+#: libexif/olympus/mnote-olympus-tag.c:180 libexif/pentax/mnote-pentax-tag.c:89
 msgid "Digital Zoom"
 msgstr "数��焦"
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:838
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 #: libexif/pentax/mnote-pentax-tag.c:91
 msgid "Contrast"
 msgstr "对比度"
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:842
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 #: libexif/pentax/mnote-pentax-tag.c:90
 msgid "Saturation"
 msgstr "饱和度"
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:846
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 #: libexif/pentax/mnote-pentax-tag.c:92
 msgid "Sharpness"
@@ -1410,7 +1407,7 @@ msgstr "�度"
 msgid "ISO"
 msgstr "ISO"
 
-#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:580
 #: libexif/pentax/mnote-pentax-tag.c:82
 msgid "Metering Mode"
 msgstr "测�模�"
@@ -1423,7 +1420,7 @@ msgstr ""
 msgid "AF Point"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:805
 msgid "Exposure Mode"
 msgstr "�光模�"
 
@@ -1530,7 +1527,7 @@ msgid "Exposure Compensation"
 msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
-#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:810 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/olympus/mnote-olympus-tag.c:41
 #: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
 #: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
@@ -1570,11 +1567,12 @@ msgstr ""
 msgid "Focus Distance Lower"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:111
-msgid "FNumber"
+#: libexif/canon/mnote-canon-tag.c:111 libexif/exif-tag.c:476
+#: libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:473
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
 msgstr ""
@@ -1623,45 +1621,45 @@ msgstr "摩托罗拉"
 msgid "Intel"
 msgstr "英特尔"
 
-#: libexif/exif-data.c:780
+#: libexif/exif-data.c:786
 msgid "Size of data too small to allow for EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:841
+#: libexif/exif-data.c:851
 msgid "EXIF marker not found."
 msgstr ""
 
-#: libexif/exif-data.c:868
+#: libexif/exif-data.c:878
 msgid "EXIF header not found."
 msgstr ""
 
-#: libexif/exif-data.c:893
+#: libexif/exif-data.c:903
 msgid "Unknown encoding."
 msgstr ""
 
-#: libexif/exif-data.c:1178
+#: libexif/exif-data.c:1188
 msgid "Ignore unknown tags"
 msgstr ""
 
-#: libexif/exif-data.c:1179
+#: libexif/exif-data.c:1189
 msgid "Ignore unknown tags when loading EXIF data."
 msgstr ""
 
-#: libexif/exif-data.c:1180
+#: libexif/exif-data.c:1190
 msgid "Follow specification"
 msgstr ""
 
-#: libexif/exif-data.c:1181
+#: libexif/exif-data.c:1191
 msgid ""
 "Add, correct and remove entries to get EXIF data that follows the "
 "specification."
 msgstr ""
 
-#: libexif/exif-data.c:1183
+#: libexif/exif-data.c:1193
 msgid "Do not change maker note"
 msgstr ""
 
-#: libexif/exif-data.c:1184
+#: libexif/exif-data.c:1194
 msgid ""
 "When loading and resaving Exif data, save the maker note unmodified. Be "
 "aware that the maker note can get corrupted."
@@ -1706,195 +1704,193 @@ msgid ""
 "fixed."
 msgstr ""
 
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:461
 #, c-format
 msgid "%i bytes undefined data"
 msgstr ""
 
-#: libexif/exif-entry.c:585
+#: libexif/exif-entry.c:584
 #, c-format
 msgid "%i bytes unsupported data type"
 msgstr ""
 
-#: libexif/exif-entry.c:642
+#: libexif/exif-entry.c:641
 #, c-format
 msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
 msgstr "标记'%s'包�无效格�的数�（'%s，期望'%s'）。"
 
-#: libexif/exif-entry.c:655
+#: libexif/exif-entry.c:654
 #, c-format
 msgid ""
 "The tag '%s' contains an invalid number of components (%i, expected %i)."
 msgstr "标记'%s'包�无效数�的组件（%i，期望%i）。"
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Chunky format"
 msgstr ""
 
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:668
 msgid "Planar format"
 msgstr ""
 
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
-#: test/nls/test-codeset.c:54
+#: libexif/exif-entry.c:670 libexif/exif-entry.c:762 test/nls/test-codeset.c:54
 msgid "Not defined"
 msgstr "未定义"
 
-#: libexif/exif-entry.c:671
+#: libexif/exif-entry.c:670
 msgid "One-chip color area sensor"
 msgstr "�芯片色彩区域传感器"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Two-chip color area sensor"
 msgstr "�芯片色彩区域传感器"
 
-#: libexif/exif-entry.c:672
+#: libexif/exif-entry.c:671
 msgid "Three-chip color area sensor"
 msgstr "三芯片色彩区域传感器"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Color sequential area sensor"
 msgstr "颜色连续区域传感器"
 
-#: libexif/exif-entry.c:673
+#: libexif/exif-entry.c:672
 msgid "Trilinear sensor"
 msgstr "三线性传感器"
 
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:673
 msgid "Color sequential linear sensor"
 msgstr "颜色连续线性传感器"
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:233
 msgid "Top-left"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:235
 msgid "Top-right"
 msgstr ""
 
-#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:675 libexif/pentax/mnote-pentax-entry.c:241
 msgid "Bottom-right"
 msgstr ""
 
-#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:239
 msgid "Bottom-left"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Left-top"
 msgstr ""
 
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:676
 msgid "Right-top"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Right-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:678
+#: libexif/exif-entry.c:677
 msgid "Left-bottom"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Centered"
 msgstr ""
 
-#: libexif/exif-entry.c:680
+#: libexif/exif-entry.c:679
 msgid "Co-sited"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Reversed mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Normal mono"
 msgstr ""
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "RGB"
 msgstr "RGB"
 
-#: libexif/exif-entry.c:682
+#: libexif/exif-entry.c:681
 msgid "Palette"
 msgstr "色�"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CMYK"
 msgstr "CMYK"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: libexif/exif-entry.c:683
+#: libexif/exif-entry.c:682
 msgid "CieLAB"
 msgstr "CieLAB"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Normal process"
 msgstr "正常过程"
 
-#: libexif/exif-entry.c:685
+#: libexif/exif-entry.c:684
 msgid "Custom process"
 msgstr "自定义过程"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto exposure"
 msgstr "自动�光"
 
-#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:686 libexif/fuji/mnote-fuji-entry.c:139
 msgid "Manual exposure"
 msgstr "手动�光"
 
-#: libexif/exif-entry.c:687
+#: libexif/exif-entry.c:686
 msgid "Auto bracket"
 msgstr ""
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Auto white balance"
 msgstr "自动白平衡"
 
-#: libexif/exif-entry.c:689
+#: libexif/exif-entry.c:688
 msgid "Manual white balance"
 msgstr "手动白平衡"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "Low gain up"
 msgstr "低增益"
 
-#: libexif/exif-entry.c:694
+#: libexif/exif-entry.c:693
 msgid "High gain up"
 msgstr "高增益"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "Low gain down"
 msgstr "低衰�"
 
-#: libexif/exif-entry.c:695
+#: libexif/exif-entry.c:694
 msgid "High gain down"
 msgstr "高衰�"
 
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:696
 msgid "Low saturation"
 msgstr "低饱和度"
 
-#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:696 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
 msgstr "高饱和度"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
-#: libexif/fuji/mnote-fuji-entry.c:63
-#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
+#: libexif/fuji/mnote-fuji-entry.c:63 libexif/olympus/mnote-olympus-entry.c:208
 #: libexif/olympus/mnote-olympus-entry.c:217
 #: libexif/pentax/mnote-pentax-entry.c:106
 #: libexif/pentax/mnote-pentax-entry.c:170
 msgid "Soft"
 msgstr "柔和"
 
-#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698
 #: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
 #: libexif/olympus/mnote-olympus-entry.c:207
 #: libexif/olympus/mnote-olympus-entry.c:215
@@ -1902,178 +1898,178 @@ msgstr "柔和"
 msgid "Hard"
 msgstr "�利"
 
-#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
-#: libexif/olympus/mnote-olympus-entry.c:595
-#: libexif/olympus/mnote-olympus-entry.c:689
-#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/exif-entry.c:714 libexif/exif-entry.c:732 libexif/exif-entry.c:814
+#: libexif/olympus/mnote-olympus-entry.c:596
+#: libexif/olympus/mnote-olympus-entry.c:690
+#: libexif/olympus/mnote-olympus-entry.c:745
 #: libexif/pentax/mnote-pentax-entry.c:256
 msgid "Unknown"
 msgstr "未知"
 
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:715
 msgid "Avg"
 msgstr ""
 
-#: libexif/exif-entry.c:717
+#: libexif/exif-entry.c:716
 msgid "Center-weight"
 msgstr ""
 
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:718
 msgid "Multi spot"
 msgstr ""
 
-#: libexif/exif-entry.c:720
+#: libexif/exif-entry.c:719
 msgid "Pattern"
 msgstr "样�"
 
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:724
 msgid "Uncompressed"
 msgstr "未压缩"
 
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:725
 msgid "LZW compression"
 msgstr "LZW压缩"
 
-#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+#: libexif/exif-entry.c:726 libexif/exif-entry.c:727
 msgid "JPEG compression"
 msgstr "JPEG 压缩"
 
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:728
 msgid "Deflate/ZIP compression"
 msgstr ""
 
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:729
 msgid "PackBits compression"
 msgstr ""
 
-#: libexif/exif-entry.c:736
+#: libexif/exif-entry.c:735
 msgid "Tungsten incandescent light"
 msgstr "碘钨�"
 
-#: libexif/exif-entry.c:738
+#: libexif/exif-entry.c:737
 msgid "Fine weather"
 msgstr "天气良好"
 
-#: libexif/exif-entry.c:739
+#: libexif/exif-entry.c:738
 msgid "Cloudy weather"
 msgstr ""
 
-#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:77
 #: libexif/pentax/mnote-pentax-entry.c:252
 msgid "Day white fluorescent"
 msgstr "日光白色�光�"
 
-#: libexif/exif-entry.c:743
+#: libexif/exif-entry.c:742
 msgid "Cool white fluorescent"
 msgstr "冷白色�光�"
 
-#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:743 libexif/fuji/mnote-fuji-entry.c:78
 #: libexif/pentax/mnote-pentax-entry.c:253
 msgid "White fluorescent"
 msgstr "白色�光�"
 
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:744
 msgid "Standard light A"
 msgstr "标准光 A"
 
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:745
 msgid "Standard light B"
 msgstr "标准光 B"
 
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:746
 msgid "Standard light C"
 msgstr "标准光 C"
 
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:747
 msgid "D55"
 msgstr "D55"
 
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:748
 msgid "D65"
 msgstr "D65"
 
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:749
 msgid "D75"
 msgstr "D75"
 
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:750
 msgid "ISO studio tungsten"
 msgstr "标准工作室钨�"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "Inch"
 msgstr "英寸"
 
-#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+#: libexif/exif-entry.c:754 libexif/exif-entry.c:758
 msgid "in"
 msgstr "属于"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "Centimeter"
 msgstr "厘米"
 
-#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
 msgid "cm"
 msgstr "cm"
 
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:764
 msgid "Normal program"
 msgstr "普通模�"
 
-#: libexif/exif-entry.c:766
+#: libexif/exif-entry.c:765
 msgid "Aperture priority"
 msgstr "光圈优先"
 
-#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:765 libexif/exif-tag.c:559
 msgid "Aperture"
 msgstr "光圈"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter priority"
 msgstr "快门优先"
 
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:766
 msgid "Shutter"
 msgstr "å¿«é—¨"
 
-#: libexif/exif-entry.c:768
+#: libexif/exif-entry.c:767
 msgid "Creative program (biased toward depth of field)"
 msgstr ""
 
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:768
 msgid "Creative"
 msgstr ""
 
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:769
 msgid "Creative program (biased toward fast shutter speed)"
 msgstr ""
 
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:770
 msgid "Action"
 msgstr "动作"
 
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:771
 msgid "Portrait mode (for closeup photos with the background out of focus)"
 msgstr "肖�模�（特写照片，使背景处于焦外）"
 
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:773
 msgid "Landscape mode (for landscape photos with the background in focus)"
 msgstr "风景模�（风景照片，使背景处于焦内）"
 
-#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/exif-entry.c:777 libexif/exif-entry.c:782
 #: libexif/olympus/mnote-olympus-entry.c:100
 msgid "Flash did not fire"
 msgstr "未闪光"
 
-#: libexif/exif-entry.c:778
+#: libexif/exif-entry.c:777
 msgid "No flash"
 msgstr ""
 
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:778
 msgid "Flash fired"
 msgstr ""
 
-#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/exif-entry.c:778 libexif/olympus/mnote-olympus-entry.c:173
 #: libexif/olympus/mnote-olympus-entry.c:178
 #: libexif/olympus/mnote-olympus-entry.c:212
 #: libexif/olympus/mnote-olympus-entry.c:221
@@ -2081,305 +2077,303 @@ msgstr ""
 msgid "Yes"
 msgstr "是"
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Strobe return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:780
+#: libexif/exif-entry.c:779
 msgid "Without strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "Strobe return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:782
+#: libexif/exif-entry.c:781
 msgid "With strobe"
 msgstr ""
 
-#: libexif/exif-entry.c:784
+#: libexif/exif-entry.c:783
 msgid "Flash fired, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:786
 msgid "Flash fired, compulsory flash mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:788
 msgid "Flash did not fire, compulsory flash mode"
 msgstr ""
 
-#: libexif/exif-entry.c:790
+#: libexif/exif-entry.c:789
 msgid "Flash did not fire, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode"
 msgstr ""
 
-#: libexif/exif-entry.c:792
+#: libexif/exif-entry.c:791
 msgid "Flash fired, auto mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:794
+#: libexif/exif-entry.c:793
 msgid "Flash fired, auto mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:794
 msgid "No flash function"
 msgstr ""
 
-#: libexif/exif-entry.c:796
+#: libexif/exif-entry.c:795
 msgid "Flash fired, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:796
 msgid "Flash fired, red-eye reduction mode, return light not detected"
 msgstr ""
 
-#: libexif/exif-entry.c:799
+#: libexif/exif-entry.c:798
 msgid "Flash fired, red-eye reduction mode, return light detected"
 msgstr ""
 
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:800
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:802
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:805
+#: libexif/exif-entry.c:804
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected"
 msgstr ""
 
-#: libexif/exif-entry.c:807
+#: libexif/exif-entry.c:806
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
 msgstr "闪光�未闪光，自动模�，红眼消除模�。"
 
-#: libexif/exif-entry.c:808
+#: libexif/exif-entry.c:807
 msgid "Flash fired, auto mode, red-eye reduction mode"
 msgstr "闪光�闪光，自动模�，红眼消除模�"
 
-#: libexif/exif-entry.c:809
+#: libexif/exif-entry.c:808
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:811
+#: libexif/exif-entry.c:810
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
 msgstr ""
 
-#: libexif/exif-entry.c:815
+#: libexif/exif-entry.c:814
 msgid "?"
 msgstr ""
 
-#: libexif/exif-entry.c:817
+#: libexif/exif-entry.c:816
 msgid "Close view"
 msgstr "近景"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant view"
 msgstr "远景"
 
-#: libexif/exif-entry.c:818
+#: libexif/exif-entry.c:817
 msgid "Distant"
 msgstr ""
 
-#: libexif/exif-entry.c:821
+#: libexif/exif-entry.c:820
 msgid "sRGB"
 msgstr "sRGB"
 
-#: libexif/exif-entry.c:822
+#: libexif/exif-entry.c:821
 msgid "Adobe RGB"
 msgstr ""
 
-#: libexif/exif-entry.c:823
+#: libexif/exif-entry.c:822
 msgid "Uncalibrated"
 msgstr "未校准的"
 
-#: libexif/exif-entry.c:878
+#: libexif/exif-entry.c:877
 #, c-format
 msgid "Invalid size of entry (%i, expected %li x %i)."
 msgstr "无效的入�尺寸（%i，期望%li x %i）。"
 
-#: libexif/exif-entry.c:911
+#: libexif/exif-entry.c:910
 msgid "Unsupported UNICODE string"
 msgstr "�支�的UNICODE字符串"
 
-#: libexif/exif-entry.c:919
+#: libexif/exif-entry.c:918
 msgid "Unsupported JIS string"
 msgstr "�支�的JIS字符串"
 
-#: libexif/exif-entry.c:935
+#: libexif/exif-entry.c:934
 msgid "Tag UserComment contains data but is against specification."
 msgstr ""
 
-#: libexif/exif-entry.c:939
+#: libexif/exif-entry.c:938
 #, c-format
 msgid "Byte at position %i: 0x%02x"
 msgstr ""
 
-#: libexif/exif-entry.c:947
+#: libexif/exif-entry.c:946
 msgid "Unknown Exif Version"
 msgstr "未知的Exif版本"
 
-#: libexif/exif-entry.c:951
+#: libexif/exif-entry.c:950
 #, c-format
 msgid "Exif Version %d.%d"
 msgstr "Exif版本%d.%d"
 
-#: libexif/exif-entry.c:962
+#: libexif/exif-entry.c:961
 msgid "FlashPix Version 1.0"
 msgstr "FlashPix版本 1.0"
 
-#: libexif/exif-entry.c:964
+#: libexif/exif-entry.c:963
 msgid "FlashPix Version 1.01"
 msgstr "FlashPix版本 1.01"
 
-#: libexif/exif-entry.c:966
+#: libexif/exif-entry.c:965
 msgid "Unknown FlashPix Version"
 msgstr "未知的FlashPix版本"
 
-#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
-#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
-#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+#: libexif/exif-entry.c:978 libexif/exif-entry.c:997 libexif/exif-entry.c:1662
+#: libexif/exif-entry.c:1667 libexif/exif-entry.c:1671
+#: libexif/exif-entry.c:1676 libexif/exif-entry.c:1677
 msgid "[None]"
 msgstr "[æ— ]"
 
-#: libexif/exif-entry.c:981
+#: libexif/exif-entry.c:980
 msgid "(Photographer)"
 msgstr "（摄影师）"
 
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:999
 msgid "(Editor)"
 msgstr ""
 
-#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
-#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#: libexif/exif-entry.c:1023 libexif/exif-entry.c:1102
+#: libexif/exif-entry.c:1119 libexif/exif-entry.c:1162
 #, c-format
 msgid "%.02f EV"
 msgstr ""
 
-#: libexif/exif-entry.c:1025
+#: libexif/exif-entry.c:1024
 #, c-format
 msgid " (f/%.01f)"
 msgstr ""
 
-#: libexif/exif-entry.c:1059
+#: libexif/exif-entry.c:1057
 #, c-format
 msgid " (35 equivalent: %d mm)"
 msgstr ""
 
-#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+#: libexif/exif-entry.c:1091
 msgid " sec."
 msgstr ""
 
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1105
 #, c-format
 msgid " (1/%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1109
+#: libexif/exif-entry.c:1107
 #, c-format
 msgid " (%d sec.)"
 msgstr ""
 
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1120
 #, c-format
 msgid " (%.02f cd/m^2)"
 msgstr ""
 
-#: libexif/exif-entry.c:1132
+#: libexif/exif-entry.c:1129
 msgid "DSC"
 msgstr ""
 
-#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
-#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
-#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
-#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
-#: libexif/pentax/mnote-pentax-entry.c:350
-#: libexif/pentax/mnote-pentax-entry.c:359
+#: libexif/exif-entry.c:1131 libexif/exif-entry.c:1171
+#: libexif/exif-entry.c:1255 libexif/exif-entry.c:1306
+#: libexif/exif-entry.c:1315 libexif/exif-entry.c:1351
+#: libexif/fuji/mnote-fuji-entry.c:237 libexif/fuji/mnote-fuji-entry.c:246
 #, c-format
 msgid "Internal error (unknown value %i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1142
+#: libexif/exif-entry.c:1139
 msgid "-"
 msgstr ""
 
-#: libexif/exif-entry.c:1143
+#: libexif/exif-entry.c:1140
 msgid "Y"
 msgstr ""
 
-#: libexif/exif-entry.c:1144
+#: libexif/exif-entry.c:1141
 msgid "Cb"
 msgstr ""
 
-#: libexif/exif-entry.c:1145
+#: libexif/exif-entry.c:1142
 msgid "Cr"
 msgstr ""
 
-#: libexif/exif-entry.c:1146
+#: libexif/exif-entry.c:1143
 msgid "R"
 msgstr ""
 
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1144
 msgid "G"
 msgstr ""
 
-#: libexif/exif-entry.c:1148
+#: libexif/exif-entry.c:1145
 msgid "B"
 msgstr ""
 
-#: libexif/exif-entry.c:1149
+#: libexif/exif-entry.c:1146
 msgid "Reserved"
 msgstr ""
 
-#: libexif/exif-entry.c:1172
+#: libexif/exif-entry.c:1169
 msgid "Directly photographed"
 msgstr ""
 
-#: libexif/exif-entry.c:1185
+#: libexif/exif-entry.c:1182
 msgid "YCbCr4:2:2"
 msgstr ""
 
-#: libexif/exif-entry.c:1187
+#: libexif/exif-entry.c:1184
 msgid "YCbCr4:2:0"
 msgstr ""
 
-#: libexif/exif-entry.c:1204
+#: libexif/exif-entry.c:1201
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1213
+#: libexif/exif-entry.c:1210
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
 msgstr ""
 
-#: libexif/exif-entry.c:1219
+#: libexif/exif-entry.c:1216
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
 msgstr ""
 
-#: libexif/exif-entry.c:1257
+#: libexif/exif-entry.c:1251
 msgid "Sea level"
 msgstr ""
 
-#: libexif/exif-entry.c:1259
+#: libexif/exif-entry.c:1253
 msgid "Sea level reference"
 msgstr ""
 
-#: libexif/exif-entry.c:1367
+#: libexif/exif-entry.c:1361
 #, c-format
 msgid "Unknown value %i"
 msgstr ""
@@ -2465,11 +2459,11 @@ msgstr ""
 msgid "The data provided does not follow the specification."
 msgstr ""
 
-#: libexif/exif-tag.c:62
+#: libexif/exif-tag.c:64
 msgid "GPS Tag Version"
 msgstr ""
 
-#: libexif/exif-tag.c:63
+#: libexif/exif-tag.c:65
 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> "
@@ -2477,11 +2471,11 @@ msgid ""
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: libexif/exif-tag.c:69
+#: libexif/exif-tag.c:71
 msgid "Interoperability Index"
 msgstr ""
 
-#: libexif/exif-tag.c:70
+#: libexif/exif-tag.c:72
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -2489,25 +2483,25 @@ msgid ""
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: libexif/exif-tag.c:76
+#: libexif/exif-tag.c:78
 msgid "North or South Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:77
+#: libexif/exif-tag.c:79
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: libexif/exif-tag.c:81
+#: libexif/exif-tag.c:83
 msgid "Interoperability Version"
 msgstr ""
 
-#: libexif/exif-tag.c:83
+#: libexif/exif-tag.c:85
 msgid "Latitude"
 msgstr ""
 
-#: libexif/exif-tag.c:84
+#: libexif/exif-tag.c:86
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2516,21 +2510,21 @@ msgid ""
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:91
+#: libexif/exif-tag.c:93
 msgid "East or West Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:92
+#: libexif/exif-tag.c:94
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: libexif/exif-tag.c:95
+#: libexif/exif-tag.c:97
 msgid "Longitude"
 msgstr ""
 
-#: libexif/exif-tag.c:96
+#: libexif/exif-tag.c:98
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -2539,44 +2533,44 @@ msgid ""
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:103
+#: libexif/exif-tag.c:105
 msgid "Altitude Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:104
+#: libexif/exif-tag.c:106
 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 "
 "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 "
+"an absolute value in the GPSAltitude tag. The reference unit is meters. Note "
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: libexif/exif-tag.c:110
+#: libexif/exif-tag.c:112
 msgid "Altitude"
 msgstr ""
 
-#: libexif/exif-tag.c:111
+#: libexif/exif-tag.c:113
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: libexif/exif-tag.c:114
+#: libexif/exif-tag.c:116
 msgid "GPS Time (Atomic Clock)"
 msgstr ""
 
-#: libexif/exif-tag.c:115
+#: libexif/exif-tag.c:117
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
 "expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr ""
 
-#: libexif/exif-tag.c:118
+#: libexif/exif-tag.c:120
 msgid "GPS Satellites"
 msgstr ""
 
-#: libexif/exif-tag.c:119
+#: libexif/exif-tag.c:121
 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, "
@@ -2585,101 +2579,101 @@ msgid ""
 "the tag shall be set to NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:125
+#: libexif/exif-tag.c:127
 msgid "GPS Receiver Status"
 msgstr ""
 
-#: libexif/exif-tag.c:126
+#: libexif/exif-tag.c:128
 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 ""
 
-#: libexif/exif-tag.c:129
+#: libexif/exif-tag.c:131
 msgid "GPS Measurement Mode"
 msgstr ""
 
-#: libexif/exif-tag.c:130
+#: libexif/exif-tag.c:132
 msgid ""
 "Indicates the GPS measurement mode. '2' means two-dimensional measurement "
 "and '3' means three-dimensional measurement is in progress."
 msgstr ""
 
-#: libexif/exif-tag.c:133
+#: libexif/exif-tag.c:135
 msgid "Measurement Precision"
 msgstr ""
 
-#: libexif/exif-tag.c:134
+#: libexif/exif-tag.c:136
 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 ""
 
-#: libexif/exif-tag.c:137
+#: libexif/exif-tag.c:139
 msgid "Speed Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:138
+#: libexif/exif-tag.c:140
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K', "
 "'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: libexif/exif-tag.c:141
+#: libexif/exif-tag.c:143
 msgid "Speed of GPS Receiver"
 msgstr ""
 
-#: libexif/exif-tag.c:142
+#: libexif/exif-tag.c:144
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: libexif/exif-tag.c:143
+#: libexif/exif-tag.c:145
 msgid "Reference for direction of movement"
 msgstr ""
 
-#: libexif/exif-tag.c:144
+#: libexif/exif-tag.c:146
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:147
+#: libexif/exif-tag.c:149
 msgid "Direction of Movement"
 msgstr ""
 
-#: libexif/exif-tag.c:148
+#: libexif/exif-tag.c:150
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:150
+#: libexif/exif-tag.c:152
 msgid "GPS Image Direction Reference"
 msgstr ""
 
-#: libexif/exif-tag.c:151
+#: libexif/exif-tag.c:153
 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 ""
 
-#: libexif/exif-tag.c:153
+#: libexif/exif-tag.c:155
 msgid "GPS Image Direction"
 msgstr ""
 
-#: libexif/exif-tag.c:154
+#: libexif/exif-tag.c:156
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:156
+#: libexif/exif-tag.c:158
 msgid "Geodetic Survey Data Used"
 msgstr ""
 
-#: libexif/exif-tag.c:157
+#: libexif/exif-tag.c:159
 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'. "
@@ -2687,22 +2681,22 @@ msgid ""
 "recorded."
 msgstr ""
 
-#: libexif/exif-tag.c:161
+#: libexif/exif-tag.c:163
 msgid "Reference For Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:162
+#: libexif/exif-tag.c:164
 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 ""
 
-#: libexif/exif-tag.c:165
+#: libexif/exif-tag.c:167
 msgid "Latitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:166
+#: libexif/exif-tag.c:168
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2712,21 +2706,21 @@ msgid ""
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:173
+#: libexif/exif-tag.c:175
 msgid "Reference for Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:174
+#: libexif/exif-tag.c:176
 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 ""
 
-#: libexif/exif-tag.c:177
+#: libexif/exif-tag.c:179
 msgid "Longitude of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:178
+#: libexif/exif-tag.c:180
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -2736,49 +2730,49 @@ msgid ""
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: libexif/exif-tag.c:186
+#: libexif/exif-tag.c:188
 msgid "Reference for Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:187
+#: libexif/exif-tag.c:189
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. 'T' denotes true direction and 'M' is magnetic direction."
 msgstr ""
 
-#: libexif/exif-tag.c:190
+#: libexif/exif-tag.c:192
 msgid "Bearing of Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:191
+#: libexif/exif-tag.c:193
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: libexif/exif-tag.c:193
+#: libexif/exif-tag.c:195
 msgid "Reference for Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:194
+#: libexif/exif-tag.c:196
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
 "'K', 'M' and 'N' represent kilometers, miles and nautical miles."
 msgstr ""
 
-#: libexif/exif-tag.c:197
+#: libexif/exif-tag.c:199
 msgid "Distance to Destination"
 msgstr ""
 
-#: libexif/exif-tag.c:198
+#: libexif/exif-tag.c:200
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: libexif/exif-tag.c:199
+#: libexif/exif-tag.c:201
 msgid "Name of GPS Processing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:200
+#: libexif/exif-tag.c:202
 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 "
@@ -2786,70 +2780,80 @@ msgid ""
 "termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:205
+#: libexif/exif-tag.c:207
 msgid "Name of GPS Area"
 msgstr ""
 
-#: libexif/exif-tag.c:206
+#: libexif/exif-tag.c:208
 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. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
-#: libexif/exif-tag.c:210
+#: libexif/exif-tag.c:212
 msgid "GPS Date"
 msgstr ""
 
-#: libexif/exif-tag.c:211
+#: libexif/exif-tag.c:213
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 
-#: libexif/exif-tag.c:215
+#: libexif/exif-tag.c:217
 msgid "GPS Differential Correction"
 msgstr ""
 
-#: libexif/exif-tag.c:216
+#: libexif/exif-tag.c:218
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
 #: libexif/exif-tag.c:220
+msgid "GPS Horizontal Positioning Error"
+msgstr ""
+
+#: libexif/exif-tag.c:221
+msgid ""
+"Indicates the horizontal positioning errors in meters. This is expressed as "
+"one RATIONAL value."
+msgstr ""
+
+#: libexif/exif-tag.c:225
 msgid "New Subfile Type"
 msgstr ""
 
-#: libexif/exif-tag.c:220
+#: libexif/exif-tag.c:222
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: libexif/exif-tag.c:222
+#: libexif/exif-tag.c:225
 msgid "Image Width"
 msgstr ""
 
-#: libexif/exif-tag.c:223
+#: libexif/exif-tag.c:226
 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 ""
 
-#: libexif/exif-tag.c:227
+#: libexif/exif-tag.c:230
 msgid "Image Length"
 msgstr ""
 
-#: libexif/exif-tag.c:228
+#: libexif/exif-tag.c:231
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:231
+#: libexif/exif-tag.c:234
 msgid "Bits per Sample"
 msgstr ""
 
-#: libexif/exif-tag.c:232
+#: libexif/exif-tag.c:235
 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 "
@@ -2857,40 +2861,40 @@ msgid ""
 "this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:237
+#: libexif/exif-tag.c:240
 msgid "Compression"
 msgstr ""
 
-#: libexif/exif-tag.c:238
+#: libexif/exif-tag.c:241
 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 ""
 
-#: libexif/exif-tag.c:244
+#: libexif/exif-tag.c:247
 msgid "Photometric Interpretation"
 msgstr ""
 
-#: libexif/exif-tag.c:245
+#: libexif/exif-tag.c:248
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: libexif/exif-tag.c:249
+#: libexif/exif-tag.c:252
 msgid "Fill Order"
 msgstr ""
 
-#: libexif/exif-tag.c:251
+#: libexif/exif-tag.c:254
 msgid "Document Name"
 msgstr ""
 
-#: libexif/exif-tag.c:253
+#: libexif/exif-tag.c:257
 msgid "Image Description"
 msgstr ""
 
-#: libexif/exif-tag.c:254
+#: libexif/exif-tag.c:258
 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 "
@@ -2898,33 +2902,33 @@ msgid ""
 "is to be used."
 msgstr ""
 
-#: libexif/exif-tag.c:260
+#: libexif/exif-tag.c:264
 msgid "Manufacturer"
 msgstr ""
 
-#: libexif/exif-tag.c:261
+#: libexif/exif-tag.c:265
 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 ""
 
-#: libexif/exif-tag.c:267
+#: libexif/exif-tag.c:271
 msgid "Model"
 msgstr ""
 
-#: libexif/exif-tag.c:268
+#: libexif/exif-tag.c:272
 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 ""
 
-#: libexif/exif-tag.c:273
+#: libexif/exif-tag.c:277
 msgid "Strip Offsets"
 msgstr ""
 
-#: libexif/exif-tag.c:274
+#: libexif/exif-tag.c:278
 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 "
@@ -2932,30 +2936,30 @@ msgid ""
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:280
+#: libexif/exif-tag.c:284
 msgid "Orientation"
 msgstr ""
 
-#: libexif/exif-tag.c:281
+#: libexif/exif-tag.c:285
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr ""
 
-#: libexif/exif-tag.c:284
+#: libexif/exif-tag.c:288
 msgid "Samples per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:285
+#: libexif/exif-tag.c:289
 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 ""
 
-#: libexif/exif-tag.c:290
+#: libexif/exif-tag.c:294
 msgid "Rows per Strip"
 msgstr ""
 
-#: libexif/exif-tag.c:291
+#: libexif/exif-tag.c:295
 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 "
@@ -2963,74 +2967,74 @@ msgid ""
 "<StripByteCounts>."
 msgstr ""
 
-#: libexif/exif-tag.c:297
+#: libexif/exif-tag.c:301
 msgid "Strip Byte Count"
 msgstr ""
 
-#: libexif/exif-tag.c:298
+#: libexif/exif-tag.c:302
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: libexif/exif-tag.c:301
+#: libexif/exif-tag.c:305
 msgid "X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:302
+#: libexif/exif-tag.c:306
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:306
+#: libexif/exif-tag.c:310
 msgid "Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:307
+#: libexif/exif-tag.c:311
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: libexif/exif-tag.c:311
+#: libexif/exif-tag.c:315
 msgid "Planar Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:312
+#: libexif/exif-tag.c:316
 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 ""
 
-#: libexif/exif-tag.c:317
+#: libexif/exif-tag.c:321
 msgid "Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:318
+#: libexif/exif-tag.c:322
 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 ""
 
-#: libexif/exif-tag.c:323
+#: libexif/exif-tag.c:327
 msgid "Transfer Function"
 msgstr ""
 
-#: libexif/exif-tag.c:324
+#: libexif/exif-tag.c:328
 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 ""
 
-#: libexif/exif-tag.c:328
+#: libexif/exif-tag.c:332
 msgid "Software"
 msgstr ""
 
-#: libexif/exif-tag.c:329
+#: libexif/exif-tag.c:333
 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 "
@@ -3038,21 +3042,21 @@ msgid ""
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:336
+#: libexif/exif-tag.c:340
 msgid "Date and Time"
 msgstr ""
 
-#: libexif/exif-tag.c:337
+#: libexif/exif-tag.c:341
 msgid ""
 "The date and time of image creation. In this standard (EXIF-2.1) it is the "
 "date and time the file was changed."
 msgstr ""
 
-#: libexif/exif-tag.c:340
+#: libexif/exif-tag.c:344
 msgid "Artist"
 msgstr ""
 
-#: libexif/exif-tag.c:341
+#: libexif/exif-tag.c:345
 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 "
@@ -3060,51 +3064,51 @@ msgid ""
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+#: libexif/exif-tag.c:351 libexif/pentax/mnote-pentax-tag.c:113
 msgid "White Point"
 msgstr ""
 
-#: libexif/exif-tag.c:348
+#: libexif/exif-tag.c:352
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the color space information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:353
+#: libexif/exif-tag.c:357
 msgid "Primary Chromaticities"
 msgstr ""
 
-#: libexif/exif-tag.c:354
+#: libexif/exif-tag.c:358
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: libexif/exif-tag.c:359
+#: libexif/exif-tag.c:363
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: libexif/exif-tag.c:362
+#: libexif/exif-tag.c:366
 msgid "Transfer Range"
 msgstr ""
 
-#: libexif/exif-tag.c:366
+#: libexif/exif-tag.c:371
 msgid "JPEG Interchange Format"
 msgstr ""
 
-#: libexif/exif-tag.c:367
+#: libexif/exif-tag.c:372
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: libexif/exif-tag.c:372
+#: libexif/exif-tag.c:377
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: libexif/exif-tag.c:373
+#: libexif/exif-tag.c:378
 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 "
@@ -3113,11 +3117,11 @@ msgid ""
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: libexif/exif-tag.c:382
+#: libexif/exif-tag.c:387
 msgid "YCbCr Coefficients"
 msgstr ""
 
-#: libexif/exif-tag.c:383
+#: libexif/exif-tag.c:388
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in \"Color Space "
@@ -3126,21 +3130,21 @@ msgid ""
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: libexif/exif-tag.c:392
+#: libexif/exif-tag.c:397
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: libexif/exif-tag.c:393
+#: libexif/exif-tag.c:398
 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 ""
 
-#: libexif/exif-tag.c:398
+#: libexif/exif-tag.c:403
 msgid "YCbCr Positioning"
 msgstr ""
 
-#: libexif/exif-tag.c:399
+#: libexif/exif-tag.c:404
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -3155,11 +3159,11 @@ msgid ""
 "both centered and co-sited positioning."
 msgstr ""
 
-#: libexif/exif-tag.c:414
+#: libexif/exif-tag.c:419
 msgid "Reference Black/White"
 msgstr ""
 
-#: libexif/exif-tag.c:415
+#: libexif/exif-tag.c:420
 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 "
@@ -3168,34 +3172,34 @@ msgid ""
 "Interoperability these conditions."
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XML Packet"
 msgstr ""
 
-#: libexif/exif-tag.c:423
+#: libexif/exif-tag.c:428
 msgid "XMP Metadata"
 msgstr ""
 
-#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+#: libexif/exif-tag.c:444 libexif/exif-tag.c:794
 msgid "CFA Pattern"
 msgstr ""
 
-#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+#: libexif/exif-tag.c:445 libexif/exif-tag.c:795
 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 ""
 
-#: libexif/exif-tag.c:443
+#: libexif/exif-tag.c:449
 msgid "Battery Level"
 msgstr ""
 
-#: libexif/exif-tag.c:444
+#: libexif/exif-tag.c:451
 msgid "Copyright"
 msgstr ""
 
-#: libexif/exif-tag.c:445
+#: libexif/exif-tag.c:452
 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 "
@@ -3214,122 +3218,118 @@ msgid ""
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: libexif/exif-tag.c:467
+#: libexif/exif-tag.c:474
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
-msgid "F-Number"
-msgstr ""
-
-#: libexif/exif-tag.c:470
+#: libexif/exif-tag.c:477
 msgid "The F number."
 msgstr ""
 
-#: libexif/exif-tag.c:475
+#: libexif/exif-tag.c:482
 msgid "Image Resources Block"
 msgstr ""
 
-#: libexif/exif-tag.c:477
+#: libexif/exif-tag.c:485
 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 ""
 
-#: libexif/exif-tag.c:485
+#: libexif/exif-tag.c:493
 msgid "Exposure Program"
 msgstr ""
 
-#: libexif/exif-tag.c:486
+#: libexif/exif-tag.c:494
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: libexif/exif-tag.c:490
+#: libexif/exif-tag.c:498
 msgid "Spectral Sensitivity"
 msgstr ""
 
-#: libexif/exif-tag.c:491
+#: libexif/exif-tag.c:499
 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 ""
 
-#: libexif/exif-tag.c:496
+#: libexif/exif-tag.c:504
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:497
+#: libexif/exif-tag.c:505
 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 ""
 
-#: libexif/exif-tag.c:503
+#: libexif/exif-tag.c:511
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: libexif/exif-tag.c:504
+#: libexif/exif-tag.c:512
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: libexif/exif-tag.c:507
+#: libexif/exif-tag.c:515
 msgid "Opto-Electronic Conversion Function"
 msgstr ""
 
-#: libexif/exif-tag.c:508
+#: libexif/exif-tag.c:516
 msgid ""
 "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: libexif/exif-tag.c:513
+#: libexif/exif-tag.c:521
 msgid "Time Zone Offset"
 msgstr ""
 
-#: libexif/exif-tag.c:514
+#: libexif/exif-tag.c:522
 msgid "Encodes time zone of camera clock relative to GMT."
 msgstr ""
 
-#: libexif/exif-tag.c:515
+#: libexif/exif-tag.c:524
 msgid "Exif Version"
 msgstr ""
 
-#: libexif/exif-tag.c:516
+#: libexif/exif-tag.c:525
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: libexif/exif-tag.c:520
+#: libexif/exif-tag.c:529
 msgid "Date and Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:521
+#: libexif/exif-tag.c:530
 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 ""
 
-#: libexif/exif-tag.c:526
+#: libexif/exif-tag.c:535
 msgid "Date and Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:527
+#: libexif/exif-tag.c:536
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: libexif/exif-tag.c:530
+#: libexif/exif-tag.c:539
 msgid "Components Configuration"
 msgstr ""
 
-#: libexif/exif-tag.c:531
+#: libexif/exif-tag.c:540
 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 "
@@ -3339,120 +3339,120 @@ msgid ""
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: libexif/exif-tag.c:541
+#: libexif/exif-tag.c:550
 msgid "Compressed Bits per Pixel"
 msgstr ""
 
-#: libexif/exif-tag.c:542
+#: libexif/exif-tag.c:551
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+#: libexif/exif-tag.c:555 libexif/olympus/mnote-olympus-tag.c:123
 msgid "Shutter Speed"
 msgstr ""
 
-#: libexif/exif-tag.c:547
+#: libexif/exif-tag.c:556
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: libexif/exif-tag.c:551
+#: libexif/exif-tag.c:560
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: libexif/exif-tag.c:553
+#: libexif/exif-tag.c:562
 msgid "Brightness"
 msgstr "亮度"
 
-#: libexif/exif-tag.c:554
+#: libexif/exif-tag.c:563
 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 ""
 
-#: libexif/exif-tag.c:558
+#: libexif/exif-tag.c:567
 msgid "Exposure Bias"
 msgstr "�光�差"
 
-#: libexif/exif-tag.c:559
+#: libexif/exif-tag.c:568
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: libexif/exif-tag.c:562
+#: libexif/exif-tag.c:571
 msgid "Maximum Aperture Value"
 msgstr ""
 
-#: libexif/exif-tag.c:563
+#: libexif/exif-tag.c:572
 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 ""
 
-#: libexif/exif-tag.c:568
+#: libexif/exif-tag.c:577
 msgid "Subject Distance"
 msgstr "主体�离"
 
-#: libexif/exif-tag.c:569
+#: libexif/exif-tag.c:578
 msgid "The distance to the subject, given in meters."
 msgstr "被摄主体的�离，��为米。"
 
-#: libexif/exif-tag.c:572
+#: libexif/exif-tag.c:581
 msgid "The metering mode."
 msgstr "测�模�"
 
-#: libexif/exif-tag.c:574
+#: libexif/exif-tag.c:583
 msgid "Light Source"
 msgstr "光�"
 
-#: libexif/exif-tag.c:575
+#: libexif/exif-tag.c:584
 msgid "The kind of light source."
 msgstr ""
 
-#: libexif/exif-tag.c:578
+#: libexif/exif-tag.c:587
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: libexif/exif-tag.c:582
+#: libexif/exif-tag.c:591
 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 ""
 
-#: libexif/exif-tag.c:585
+#: libexif/exif-tag.c:594
 msgid "Subject Area"
 msgstr ""
 
-#: libexif/exif-tag.c:586
+#: libexif/exif-tag.c:595
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: libexif/exif-tag.c:590
+#: libexif/exif-tag.c:599
 msgid "TIFF/EP Standard ID"
 msgstr "TIFF/EP 标准 ID"
 
-#: libexif/exif-tag.c:591
+#: libexif/exif-tag.c:601
 msgid "Maker Note"
 msgstr "制作者备忘"
 
-#: libexif/exif-tag.c:592
+#: libexif/exif-tag.c:602
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: libexif/exif-tag.c:595
+#: libexif/exif-tag.c:605
 msgid "User Comment"
 msgstr "用户备注"
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:606
 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 "
@@ -3474,86 +3474,86 @@ msgid ""
 "H]."
 msgstr ""
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:629
 msgid "Sub-second Time"
 msgstr ""
 
-#: libexif/exif-tag.c:620
+#: libexif/exif-tag.c:630
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:624
+#: libexif/exif-tag.c:634
 msgid "Sub-second Time (Original)"
 msgstr ""
 
-#: libexif/exif-tag.c:625
+#: libexif/exif-tag.c:635
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:629
+#: libexif/exif-tag.c:639
 msgid "Sub-second Time (Digitized)"
 msgstr ""
 
-#: libexif/exif-tag.c:630
+#: libexif/exif-tag.c:640
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:634
+#: libexif/exif-tag.c:644
 msgid "XP Title"
 msgstr ""
 
-#: libexif/exif-tag.c:635
+#: libexif/exif-tag.c:645
 msgid "A character string giving the title of the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:639
+#: libexif/exif-tag.c:649
 msgid "XP Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:640
+#: libexif/exif-tag.c:650
 msgid ""
 "A character string containing a comment about the image, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:644
+#: libexif/exif-tag.c:654
 msgid "XP Author"
 msgstr ""
 
-#: libexif/exif-tag.c:645
+#: libexif/exif-tag.c:655
 msgid ""
 "A character string containing the name of the image creator, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:649
+#: libexif/exif-tag.c:659
 msgid "XP Keywords"
 msgstr ""
 
-#: libexif/exif-tag.c:650
+#: libexif/exif-tag.c:660
 msgid ""
 "A character string containing key words describing the image, encoded in "
 "UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:654
+#: libexif/exif-tag.c:664
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:655
+#: libexif/exif-tag.c:665
 msgid "A character string giving the image subject, encoded in UTF-16LE."
 msgstr ""
 
-#: libexif/exif-tag.c:659
+#: libexif/exif-tag.c:669
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+#: libexif/exif-tag.c:671 libexif/pentax/mnote-pentax-tag.c:102
 msgid "Color Space"
 msgstr "色彩空间"
 
-#: libexif/exif-tag.c:662
+#: libexif/exif-tag.c:672
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3562,11 +3562,11 @@ msgid ""
 "be treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:680
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:671
+#: libexif/exif-tag.c:681
 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, "
@@ -3574,11 +3574,11 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:677
+#: libexif/exif-tag.c:687
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: libexif/exif-tag.c:678
+#: libexif/exif-tag.c:688
 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, "
@@ -3588,11 +3588,11 @@ msgid ""
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:698
 msgid "Related Sound File"
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:699
 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 "
@@ -3617,11 +3617,11 @@ msgid ""
 "data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:729
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:730
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3630,62 +3630,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:739
 msgid "Flash Energy"
 msgstr ""
 
-#: libexif/exif-tag.c:730
+#: libexif/exif-tag.c:740
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:734
+#: libexif/exif-tag.c:744
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:735
+#: libexif/exif-tag.c:745
 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 ""
 
-#: libexif/exif-tag.c:741
+#: libexif/exif-tag.c:751
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:752
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:756
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:747
+#: libexif/exif-tag.c:757
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:761
 msgid "Focal Plane Resolution Unit"
 msgstr "焦平�分辨率��"
 
-#: libexif/exif-tag.c:752
+#: libexif/exif-tag.c:762
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:767
 msgid "Subject Location"
 msgstr ""
 
-#: libexif/exif-tag.c:758
+#: libexif/exif-tag.c:768
 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 "
@@ -3694,176 +3694,176 @@ msgid ""
 "number."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:775
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:766
+#: libexif/exif-tag.c:776
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:769
+#: libexif/exif-tag.c:779
 msgid "Sensing Method"
 msgstr "传感方�"
 
-#: libexif/exif-tag.c:770
+#: libexif/exif-tag.c:780
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:783 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr ""
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:784
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:778
+#: libexif/exif-tag.c:788
 msgid "Scene Type"
 msgstr "场景类型"
 
-#: libexif/exif-tag.c:779
+#: libexif/exif-tag.c:789
 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 ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:799
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:790
+#: libexif/exif-tag.c:800
 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 ""
 
-#: libexif/exif-tag.c:796
+#: libexif/exif-tag.c:806
 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 ""
 
-#: libexif/exif-tag.c:801
+#: libexif/exif-tag.c:811
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:805
+#: libexif/exif-tag.c:815
 msgid "Digital Zoom Ratio"
 msgstr "数��焦�率"
 
-#: libexif/exif-tag.c:806
+#: libexif/exif-tag.c:816
 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 ""
 
-#: libexif/exif-tag.c:811
+#: libexif/exif-tag.c:821
 msgid "Focal Length in 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:812
+#: libexif/exif-tag.c:822
 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 ""
 
-#: libexif/exif-tag.c:818
+#: libexif/exif-tag.c:828
 msgid "Scene Capture Type"
 msgstr "场景�获类型"
 
-#: libexif/exif-tag.c:819
+#: libexif/exif-tag.c:829
 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 "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:824
+#: libexif/exif-tag.c:834
 msgid "Gain Control"
 msgstr "增益控制"
 
-#: libexif/exif-tag.c:825
+#: libexif/exif-tag.c:835
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:829
+#: libexif/exif-tag.c:839
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:833
+#: libexif/exif-tag.c:843
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:837
+#: libexif/exif-tag.c:847
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:841
+#: libexif/exif-tag.c:851
 msgid "Device Setting Description"
 msgstr ""
 
-#: libexif/exif-tag.c:842
+#: libexif/exif-tag.c:852
 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 ""
 
-#: libexif/exif-tag.c:848
+#: libexif/exif-tag.c:858
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:849
+#: libexif/exif-tag.c:859
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:851
+#: libexif/exif-tag.c:861
 msgid "Image Unique ID"
 msgstr "图�唯一 ID"
 
-#: libexif/exif-tag.c:852
+#: libexif/exif-tag.c:862
 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 ""
 
-#: libexif/exif-tag.c:857
+#: libexif/exif-tag.c:867
 msgid "Gamma"
 msgstr "伽玛"
 
-#: libexif/exif-tag.c:858
+#: libexif/exif-tag.c:868
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:860
+#: libexif/exif-tag.c:871
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:861
+#: libexif/exif-tag.c:872
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 
-#: libexif/exif-tag.c:863
+#: libexif/exif-tag.c:875
 msgid "Padding"
 msgstr ""
 
-#: libexif/exif-tag.c:864
+#: libexif/exif-tag.c:876
 msgid ""
 "This tag reserves space that can be reclaimed later when additional metadata "
 "are added. New metadata can be written in place by replacing this tag with a "
@@ -4041,17 +4041,11 @@ msgstr ""
 msgid "Wide2 (400%)"
 msgstr ""
 
-#: libexif/fuji/mnote-fuji-entry.c:263
+#: libexif/fuji/mnote-fuji-entry.c:264
 #, c-format
 msgid "%2.2f mm"
 msgstr "%2.2f mm"
 
-#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:451
-#, c-format
-msgid "%i bytes unknown data"
-msgstr "%i 字节未知数�"
-
 #: libexif/fuji/mnote-fuji-tag.c:36
 msgid "Maker Note Version"
 msgstr ""
@@ -4477,117 +4471,117 @@ msgstr "15 帧/秒"
 msgid "20 frames/sec"
 msgstr "20 帧/秒"
 
-#: libexif/olympus/mnote-olympus-entry.c:381
+#: libexif/olympus/mnote-olympus-entry.c:382
 #, c-format
 msgid "Red Correction %f, blue Correction %f"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:388
+#: libexif/olympus/mnote-olympus-entry.c:389
 msgid "No manual focus selection"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:391
+#: libexif/olympus/mnote-olympus-entry.c:392
 #, c-format
 msgid "%2.2f meters"
 msgstr "%2.2f ç±³"
 
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:418
 msgid "AF position: center"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:419
 msgid "AF position: top"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:420
 msgid "AF position: bottom"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:421
 msgid "AF position: left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:422
 msgid "AF position: right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:423
 msgid "AF position: upper-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:423
+#: libexif/olympus/mnote-olympus-entry.c:424
 msgid "AF position: upper-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:424
+#: libexif/olympus/mnote-olympus-entry.c:425
 msgid "AF position: lower-left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:425
+#: libexif/olympus/mnote-olympus-entry.c:426
 msgid "AF position: lower-right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:426
+#: libexif/olympus/mnote-olympus-entry.c:427
 msgid "AF position: far left"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:427
+#: libexif/olympus/mnote-olympus-entry.c:428
 msgid "AF position: far right"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:428
+#: libexif/olympus/mnote-olympus-entry.c:429
 msgid "Unknown AF position"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:439
-#: libexif/olympus/mnote-olympus-entry.c:509
+#: libexif/olympus/mnote-olympus-entry.c:440
+#: libexif/olympus/mnote-olympus-entry.c:510
 #, c-format
 msgid "Internal error (unknown value %hi)"
 msgstr "内部错误 (未知值 %hi)"
 
-#: libexif/olympus/mnote-olympus-entry.c:447
-#: libexif/olympus/mnote-olympus-entry.c:517
+#: libexif/olympus/mnote-olympus-entry.c:448
+#: libexif/olympus/mnote-olympus-entry.c:518
 #, c-format
 msgid "Unknown value %hi"
 msgstr "未知值 %hi"
 
-#: libexif/olympus/mnote-olympus-entry.c:542
-#: libexif/olympus/mnote-olympus-entry.c:562
+#: libexif/olympus/mnote-olympus-entry.c:543
+#: libexif/olympus/mnote-olympus-entry.c:563
 #, c-format
 msgid "Unknown %hu"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:559
+#: libexif/olympus/mnote-olympus-entry.c:560
 msgid "2 sec."
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:598
+#: libexif/olympus/mnote-olympus-entry.c:599
 msgid "Fast"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:702
+#: libexif/olympus/mnote-olympus-entry.c:703
 msgid "Automatic"
 msgstr "自动"
 
-#: libexif/olympus/mnote-olympus-entry.c:732
+#: libexif/olympus/mnote-olympus-entry.c:733
 #, c-format
 msgid "Manual: %liK"
 msgstr "手动： %liK"
 
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:736
 msgid "Manual: unknown"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:741
+#: libexif/olympus/mnote-olympus-entry.c:742
 msgid "One-touch"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:797
-#: libexif/olympus/mnote-olympus-entry.c:807
+#: libexif/olympus/mnote-olympus-entry.c:808
+#: libexif/olympus/mnote-olympus-entry.c:818
 msgid "Infinite"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:826
 #, c-format
 msgid "%i bytes unknown data: "
 msgstr "%i 字节未知数�： "
@@ -4689,8 +4683,7 @@ msgid "Contrast Curve"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:71
-#: libexif/olympus/mnote-olympus-tag.c:95
-#: libexif/pentax/mnote-pentax-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:95 libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
 msgstr ""
 
@@ -4862,13 +4855,11 @@ msgstr ""
 msgid "White Balance Setting"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:143
-#: libexif/pentax/mnote-pentax-tag.c:87
+#: libexif/olympus/mnote-olympus-tag.c:143 libexif/pentax/mnote-pentax-tag.c:87
 msgid "Red Balance"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-tag.c:144
-#: libexif/pentax/mnote-pentax-tag.c:86
+#: libexif/olympus/mnote-olympus-tag.c:144 libexif/pentax/mnote-pentax-tag.c:86
 msgid "Blue Balance"
 msgstr ""
 
@@ -5216,11 +5207,21 @@ msgstr ""
 msgid "Digital filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:374
-#: libexif/pentax/mnote-pentax-entry.c:383
-#, c-format
-msgid "Internal error (unknown value %i %i)"
-msgstr ""
+#: libexif/pentax/mnote-pentax-entry.c:352
+#: libexif/pentax/mnote-pentax-entry.c:361
+#, fuzzy, c-format
+msgid "Internal error (unknown value %hu)"
+msgstr "内部错误 (未知值 %hi)"
+
+#: libexif/pentax/mnote-pentax-entry.c:376
+#, fuzzy, c-format
+msgid "Internal error (unknown value %hu %hu)"
+msgstr "内部错误 (未知值 %hi)"
+
+#: libexif/pentax/mnote-pentax-entry.c:385
+#, fuzzy, c-format
+msgid "Internal error (unknown value %hi %hi)"
+msgstr "内部错误 (未知值 %hi)"
 
 #: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
 msgid "Capture Mode"
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000..34db097
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,11 @@
+Makefile.in
+Makefile
+test-exif
+test-parse
+*.o
+.deps
+.libs
+test-mem
+test-mnote
+test-tree
+test-value
diff --git a/test/Makefile.am b/test/Makefile.am
index d0a3551..4097a5f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,18 +4,43 @@ SUBDIRS = nls
 #  - Add "small" tests and stuff here.
 #  - Add "big"   tests and stuff to explicitly test for (fixed) bugs
 #    to libexif-testsuite:
-#    * We don't want to force people to download dozens of test images
-#      just for one small library.
+#    * We don't want to force people to download dozens of big test images
+#      just for one small library. The ones included here are carefully chosen
+#      as a basic self-contained regression test set.
 #    * Proper testing is done with the "exif" program in libexif-testsuite.
 #      And this is just the lib - we don't have the program available
 #      here yet.
 
-TESTS = test-mem test-value test-integers test-parse test-tagtable test-sorted
+TESTS = test-mem test-value test-integers test-parse test-tagtable test-sorted \
+	test-fuzzer test-null parse-regression.sh swap-byte-order.sh \
+	extract-parse.sh
 
-TEST_IMAGES = $(top_srcdir)/daniel-andrews-sample.jpg
-export TEST_IMAGES
+if USE_FAILMALLOC
+TESTS += check-failmalloc.sh
+endif
 
 check_PROGRAMS = test-mem test-mnote test-value test-integers test-parse \
-	test-tagtable test-sorted
+	test-tagtable test-sorted test-fuzzer test-extract test-null
 
 LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
+
+EXTRA_DIST = check-vars.sh.in parse-regression.sh swap-byte-order.sh \
+	extract-parse.sh check-failmalloc.sh \
+	testdata/canon_makernote_variant_1.jpg \
+	testdata/canon_makernote_variant_1.jpg.parsed \
+	testdata/fuji_makernote_variant_1.jpg \
+	testdata/fuji_makernote_variant_1.jpg.parsed \
+	testdata/olympus_makernote_variant_2.jpg \
+	testdata/olympus_makernote_variant_2.jpg.parsed \
+	testdata/olympus_makernote_variant_3.jpg \
+	testdata/olympus_makernote_variant_3.jpg.parsed \
+	testdata/olympus_makernote_variant_4.jpg \
+	testdata/olympus_makernote_variant_4.jpg.parsed \
+	testdata/olympus_makernote_variant_5.jpg \
+	testdata/olympus_makernote_variant_5.jpg.parsed \
+	testdata/pentax_makernote_variant_2.jpg \
+	testdata/pentax_makernote_variant_2.jpg.parsed \
+	testdata/pentax_makernote_variant_3.jpg \
+	testdata/pentax_makernote_variant_3.jpg.parsed \
+	testdata/pentax_makernote_variant_4.jpg \
+	testdata/pentax_makernote_variant_4.jpg.parsed
diff --git a/test/Makefile.in b/test/Makefile.in
deleted file mode 100644
index 64b4fd8..0000000
--- a/test/Makefile.in
+++ /dev/null
@@ -1,841 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-TESTS = test-mem$(EXEEXT) test-value$(EXEEXT) test-integers$(EXEEXT) \
-	test-parse$(EXEEXT) test-tagtable$(EXEEXT) \
-	test-sorted$(EXEEXT)
-check_PROGRAMS = test-mem$(EXEEXT) test-mnote$(EXEEXT) \
-	test-value$(EXEEXT) test-integers$(EXEEXT) test-parse$(EXEEXT) \
-	test-tagtable$(EXEEXT) test-sorted$(EXEEXT)
-subdir = test
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-test_integers_SOURCES = test-integers.c
-test_integers_OBJECTS = test-integers.$(OBJEXT)
-test_integers_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
-test_integers_DEPENDENCIES = $(top_builddir)/libexif/libexif.la \
-	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-test_mem_SOURCES = test-mem.c
-test_mem_OBJECTS = test-mem.$(OBJEXT)
-test_mem_LDADD = $(LDADD)
-test_mem_DEPENDENCIES = $(top_builddir)/libexif/libexif.la \
-	$(am__DEPENDENCIES_1)
-test_mnote_SOURCES = test-mnote.c
-test_mnote_OBJECTS = test-mnote.$(OBJEXT)
-test_mnote_LDADD = $(LDADD)
-test_mnote_DEPENDENCIES = $(top_builddir)/libexif/libexif.la \
-	$(am__DEPENDENCIES_1)
-test_parse_SOURCES = test-parse.c
-test_parse_OBJECTS = test-parse.$(OBJEXT)
-test_parse_LDADD = $(LDADD)
-test_parse_DEPENDENCIES = $(top_builddir)/libexif/libexif.la \
-	$(am__DEPENDENCIES_1)
-test_sorted_SOURCES = test-sorted.c
-test_sorted_OBJECTS = test-sorted.$(OBJEXT)
-test_sorted_LDADD = $(LDADD)
-test_sorted_DEPENDENCIES = $(top_builddir)/libexif/libexif.la \
-	$(am__DEPENDENCIES_1)
-test_tagtable_SOURCES = test-tagtable.c
-test_tagtable_OBJECTS = test-tagtable.$(OBJEXT)
-test_tagtable_LDADD = $(LDADD)
-test_tagtable_DEPENDENCIES = $(top_builddir)/libexif/libexif.la \
-	$(am__DEPENDENCIES_1)
-test_value_SOURCES = test-value.c
-test_value_OBJECTS = test-value.$(OBJEXT)
-test_value_LDADD = $(LDADD)
-test_value_DEPENDENCIES = $(top_builddir)/libexif/libexif.la \
-	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = test-integers.c test-mem.c test-mnote.c test-parse.c \
-	test-sorted.c test-tagtable.c test-value.c
-DIST_SOURCES = test-integers.c test-mem.c test-mnote.c test-parse.c \
-	test-sorted.c test-tagtable.c test-value.c
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = nls
-TEST_IMAGES = $(top_srcdir)/daniel-andrews-sample.jpg
-LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu test/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-test-integers$(EXEEXT): $(test_integers_OBJECTS) $(test_integers_DEPENDENCIES) 
-	@rm -f test-integers$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_integers_OBJECTS) $(test_integers_LDADD) $(LIBS)
-test-mem$(EXEEXT): $(test_mem_OBJECTS) $(test_mem_DEPENDENCIES) 
-	@rm -f test-mem$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_mem_OBJECTS) $(test_mem_LDADD) $(LIBS)
-test-mnote$(EXEEXT): $(test_mnote_OBJECTS) $(test_mnote_DEPENDENCIES) 
-	@rm -f test-mnote$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_mnote_OBJECTS) $(test_mnote_LDADD) $(LIBS)
-test-parse$(EXEEXT): $(test_parse_OBJECTS) $(test_parse_DEPENDENCIES) 
-	@rm -f test-parse$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_parse_OBJECTS) $(test_parse_LDADD) $(LIBS)
-test-sorted$(EXEEXT): $(test_sorted_OBJECTS) $(test_sorted_DEPENDENCIES) 
-	@rm -f test-sorted$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_sorted_OBJECTS) $(test_sorted_LDADD) $(LIBS)
-test-tagtable$(EXEEXT): $(test_tagtable_OBJECTS) $(test_tagtable_DEPENDENCIES) 
-	@rm -f test-tagtable$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_tagtable_OBJECTS) $(test_tagtable_LDADD) $(LIBS)
-test-value$(EXEEXT): $(test_value_OBJECTS) $(test_value_DEPENDENCIES) 
-	@rm -f test-value$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_value_OBJECTS) $(test_value_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-integers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mnote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sorted.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-tagtable.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-value.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
-
-export TEST_IMAGES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/test/check-failmalloc.sh b/test/check-failmalloc.sh
new file mode 100755
index 0000000..602ce66
--- /dev/null
+++ b/test/check-failmalloc.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+# Use Failmalloc to test behaviour in the face of out-of-memory conditions.
+# The test runs a binary multiple times while configuring Failmalloc to fail a
+# different malloc() call each time, while looking for abnormal program exits
+# due to segfaults. See https://www.nongnu.org/failmalloc/
+#
+# Ideally, it would ensure that the test binary returns an error code on each
+# failure, but this often doesn't happen. This is a problem that should be
+# rectified, but the API doesn't allow returning an error code in many
+# functions that could encounter a problem. The issue could be solve in more
+# cases with more judicious use of log calls with EXIF_LOG_CODE_NO_MEMORY
+# codes.
+. ./check-vars.sh
+
+VERBOSE=
+if [ "$1" = "-v" ] ; then
+    VERBOSE=1
+fi
+
+if [ x"$FAILMALLOC_PATH" = x ]; then
+    echo libfailmalloc is not available
+    echo SKIPPING
+    exit
+fi
+
+BINARY_PREFIX=./
+if [ -e .libs/lt-test-value ]; then
+    # If libtool is in use, the normal "binary" is actually a shell script which
+    # would be interfered with by libfailmalloc. Instead, use the special lt-
+    # binary which should work properly.
+    BINARY_PREFIX=".libs/lt-"
+fi
+
+# Usage: failmalloc_binary_test #iterations binary <optional arguments>
+# FIXME: auto-determine #iterations by comparing the output of each run
+# with the output of a normal run, and exiting when that happens.
+failmalloc_binary_test () {
+  binary="$BINARY_PREFIX$2"
+  iterations="$1"
+  shift
+  shift
+  echo Checking "$binary" for "$iterations" iterations
+  for n in $(seq "$iterations"); do
+      test "$VERBOSE" = 1 && { echo "$n"; set -x; }
+      FAILMALLOC_INTERVAL="$n" LD_PRELOAD="$FAILMALLOC_PATH" "$binary" "$@" >/dev/null
+      s=$?
+      test "$VERBOSE" = 1 && set +x;
+      if test "$s" -ge 128; then
+          # Such status codes only happen due to termination due to a signal
+          # like SIGSEGV.
+          echo "Abnormal binary exit status $s at malloc #$n on $binary"
+          echo FAILURE
+          exit 1
+      fi
+  done
+}
+
+# The number of iterations is determined empirically to be about twice as
+# high as the maximum number of mallocs performed by the test program in order
+# to avoid lowering code coverage in the case of future code changes that cause
+# more allocations.
+
+failmalloc_binary_test 500 test-value
+failmalloc_binary_test 300 test-mem
+for f in $SRCDIR/testdata/*jpg; do
+    echo "Testing `basename "$f"`"
+    failmalloc_binary_test 500 test-parse "$f"
+    # N.B., test-parse --swap-byte-order doesn't test any new paths
+done
+
+echo PASSED
diff --git a/test/check-vars.sh.in b/test/check-vars.sh.in
new file mode 100644
index 0000000..fa0b4c9
--- /dev/null
+++ b/test/check-vars.sh.in
@@ -0,0 +1,4 @@
+# Specifies autoconf variables for use by the test scripts
+
+SRCDIR=@srcdir@
+FAILMALLOC_PATH=@FAILMALLOC_PATH@
diff --git a/test/extract-parse.sh b/test/extract-parse.sh
new file mode 100755
index 0000000..3bcfe33
--- /dev/null
+++ b/test/extract-parse.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Compares the parsed EXIF data extracted from test images with the parsed EXIF
+# data in the original images. This tests that the tag parsing and writing
+# round-trip produces an EXIF structure with the same meaning as the original.
+srcdir="${srcdir:-.}"
+TMPORIGINAL="$(mktemp)"
+TMPEXTRACTED="$(mktemp)"
+TMPDATA="$(mktemp)"
+trap 'rm -f "${TMPORIGINAL}" "${TMPEXTRACTED}" "${TMPDATA}"' 0
+
+# Remove the file name, which is a harmless difference between the two outputs.
+# Also delete the size of the MakerNote. Since the MakerNote is parsed
+# internally and rewritten, it can sometimes have slightly different padding
+# and therefore slightly different size, which is a semantically meaningless
+# difference.
+# FIXME: Not all MakerNote differences are harmless. For example,
+# olympus_makernote_variant_4.jpg has a huge size difference, probably because
+# of a parsing bug in libexif. This should be investigated. Ideally, this would
+# ignore small differences in size but trigger on larger differences.
+parse_canonicalize () {
+    sed \
+        -e '/^File /d' \
+        -e '/MakerNote (Undefined)$/{N;N;d}'
+}
+
+# Ensure that names are untranslated
+LANG=
+LANGUAGE=
+LC_ALL=C
+export LANG LANGUAGE LC_ALL
+for fn in "${srcdir}"/testdata/*.jpg ; do
+    ./test-parse "${fn}" | parse_canonicalize > "${TMPORIGINAL}"
+    ./test-extract -o "${TMPDATA}" "${fn}"
+    ./test-parse "${TMPDATA}" | parse_canonicalize > "${TMPEXTRACTED}"
+    if ! diff "${TMPORIGINAL}" "${TMPEXTRACTED}"; then
+        echo Error parsing "$fn"
+        exit 1
+    fi
+done
diff --git a/test/nls/.gitignore b/test/nls/.gitignore
new file mode 100644
index 0000000..0f55ee2
--- /dev/null
+++ b/test/nls/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+check-localedir.sh
+print-localedir
diff --git a/test/nls/Makefile.in b/test/nls/Makefile.in
deleted file mode 100644
index 9ad742e..0000000
--- a/test/nls/Makefile.in
+++ /dev/null
@@ -1,649 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-check_PROGRAMS = print-localedir$(EXEEXT)
-subdir = test/nls
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4m/gp-check-shell-environment.m4 \
-	$(top_srcdir)/m4m/gp-config-msg.m4 \
-	$(top_srcdir)/m4m/gp-documentation.m4 \
-	$(top_srcdir)/m4m/gp-gettext-hack.m4 \
-	$(top_srcdir)/m4m/stdint.m4 $(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-print_localedir_SOURCES = print-localedir.c
-print_localedir_OBJECTS = print-localedir.$(OBJEXT)
-print_localedir_LDADD = $(LDADD)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = print-localedir.c
-DIST_SOURCES = print-localedir.c
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_AGE = @LIBEXIF_AGE@
-LIBEXIF_CURRENT = @LIBEXIF_CURRENT@
-LIBEXIF_CURRENT_MIN = @LIBEXIF_CURRENT_MIN@
-LIBEXIF_REVISION = @LIBEXIF_REVISION@
-LIBEXIF_VERSION_INFO = @LIBEXIF_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-nlstestscripts = check-localedir.sh # check-codeset.sh
-codeset_tests = test-codeset-default test-codeset-latin1 test-codeset-utf-8
-TESTS = $(nlstestscripts)
-check_SCRIPTS = $(nlstestscripts)
-
-# test_codeset_default_SOURCES = test-codeset.c
-# test_codeset_default_CPPFLAGS =	\
-# 	$(AM_CPPFLAGS) $(CPPFLAGS)	\
-# 	-DCODESET_DEFAULT
-
-# test_codeset_utf_8_SOURCES = test-codeset.c
-# test_codeset_utf_8_CPPFLAGS =	\
-# 	$(AM_CPPFLAGS) $(CPPFLAGS)	\
-# 	-DCODESET_UTF_8
-
-# test_codeset_latin1_SOURCES = test-codeset.c
-# test_codeset_latin1_CPPFLAGS =	\
-# 	$(AM_CPPFLAGS) $(CPPFLAGS)	\
-# 	-DCODESET_LATIN1
-CLEANFILES = $(check_SCRIPTS)
-
-# test_nls_LDADD = $(top_builddir)/libexif/libexif.la $(INTLLIBS)
-EXTRA_DIST = check-localedir.in check-nls.in test-nls.c test-codeset.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .in .lo .o .obj .sh
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/nls/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu test/nls/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-print-localedir$(EXEEXT): $(print_localedir_OBJECTS) $(print_localedir_DEPENDENCIES) 
-	@rm -f print-localedir$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(print_localedir_OBJECTS) $(print_localedir_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-localedir.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
-
-
-.in.sh: Makefile
-	sed 's|@top_builddir\@|$(top_builddir)|g;s|@localedir\@|$(localedir)|g;s|@PRINT_LOCALEDIR\@|./print-localedir$(EXEEXT)|g;s|@build_alias\@|$(build_alias)|g;s|@host_alias\@|$(host_alias)|g;s|@codeset_tests\@|$(codeset_tests)|g;s|@DESTDIR\@|$(DESTDIR)|g' < $< > $@
-	chmod +x $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/test/nls/check-codeset.in b/test/nls/check-codeset.in
new file mode 100644
index 0000000..162d6e2
--- /dev/null
+++ b/test/nls/check-codeset.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# NLS nuisances. (stolen and adapted from configure)
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  eval $as_var=""
+  unset $as_var
+  export $as_var
+done
+
+if test -d "@localedir@"; then
+    : # use built-in default
+elif test -d "@DESTDIR@@localedir@"; then
+    export LOCALEDIR="@DESTDIR@@localedir@"
+else
+    echo "This test only works after \"make install\". Aborting."
+    exit 0
+fi
+
+# set | grep '^L[AC]'
+
+set -x
+
+errors=0
+for test in @codeset_tests@
+do
+	for locale in `./${test} --list`
+	do
+		echo "Testing locale $locale..."
+		if env "LANG=$locale" "./${test}"; then :; else
+			errors=`expr $errors + 1`
+		fi
+	done
+done
+
+test $errors -eq 0
diff --git a/test/parse-regression.sh b/test/parse-regression.sh
new file mode 100755
index 0000000..b18db59
--- /dev/null
+++ b/test/parse-regression.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Parses test EXIF files and compares the results to that expected
+srcdir="${srcdir:-.}"
+TMPLOG="$(mktemp)"
+trap 'rm -f "${TMPLOG}"' 0
+# Ensure that names are untranslated
+LANG=
+LANGUAGE=
+LC_ALL=C
+export LANG LANGUAGE LC_ALL
+for fn in "${srcdir}"/testdata/*.jpg ; do
+    ./test-parse "${fn}" > "${TMPLOG}"
+    if ! diff "${fn}".parsed "${TMPLOG}"; then
+        echo Error parsing "$fn"
+        exit 1
+    fi
+done
diff --git a/test/swap-byte-order.sh b/test/swap-byte-order.sh
new file mode 100755
index 0000000..59a9d44
--- /dev/null
+++ b/test/swap-byte-order.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Swaps the byte order of test EXIF files and ensures the data don't change.
+srcdir="${srcdir:-.}"
+TMPLOG="$(mktemp)"
+trap 'rm -f "${TMPLOG}"' 0
+# Ensure that names are untranslated
+LANG=
+LANGUAGE=
+LC_ALL=C
+export LANG LANGUAGE LC_ALL
+for fn in "${srcdir}"/testdata/*.jpg ; do
+    ./test-parse --swap-byte-order "${fn}" | sed -e '/^New byte order:/d' > "${TMPLOG}"
+    if ! diff "${fn}".parsed "${TMPLOG}"; then
+        echo Error parsing "$fn"
+        exit 1
+    fi
+done
diff --git a/test/test-extract.c b/test/test-extract.c
new file mode 100644
index 0000000..0c82d73
--- /dev/null
+++ b/test/test-extract.c
@@ -0,0 +1,102 @@
+/** \file test-extract.c
+ * \brief Extract EXIF data from a file and write it to another file.
+ *
+ * Copyright (C) 2019 Dan Fandrich <dan@coneharvesters.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
+ *
+ */
+
+#include "libexif/exif-data.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+static const unsigned char header[4] = {'\xff', '\xd8', '\xff', '\xe1'};
+
+int main(const int argc, const char *argv[])
+{
+  int first = 1;
+  const char *fn = "input.jpg";
+  const char *outfn = "output.exif";
+  ExifData *d;
+  unsigned char *buf;
+  unsigned int len;
+  FILE *f;
+  unsigned char lenbuf[2];
+
+  if (argc > 1 && !strcmp(argv[1], "-o")) {
+      outfn = argv[2];
+      first += 2;
+  }
+  if (argc > first) {
+      fn = argv[first];
+      ++first;
+  }
+  if (argc > first) {
+      fprintf (stderr, "Too many arguments\n");
+      return 1;
+  }
+
+  d = exif_data_new_from_file(fn);
+  if (!d) {
+      fprintf (stderr, "Could not load data from '%s'!\n", fn);
+      return 1;
+  }
+
+  exif_data_save_data(d, &buf, &len);
+  exif_data_unref(d);
+
+  if (!buf) {
+      fprintf (stderr, "Could not extract EXIF data!\n");
+      return 2;
+  }
+
+  f = fopen(outfn, "wb");
+  if (!f) {
+      fprintf (stderr, "Could not open '%s' for writing!\n", outfn);
+      return 1;
+  }
+  /* Write EXIF with headers and length. */
+  if (fwrite(header, 1, sizeof(header), f) != sizeof(header)) {
+      fprintf (stderr, "Could not write to '%s'!\n", outfn);
+      return 3;
+  }
+  /*
+   * FIXME: The buffer from exif_data_save_data() seems to contain extra 0xffd8
+   * 0xffd9 JPEG markers at the end that I wasn't expecting, making the length
+   * seem too long. Should those markers really be included?
+   */
+  exif_set_short(lenbuf, EXIF_BYTE_ORDER_MOTOROLA, len);
+  if (fwrite(lenbuf, 1, 2, f) != 2) {
+      fprintf (stderr, "Could not write to '%s'!\n", outfn);
+      return 3;
+  }
+  if (fwrite(buf, 1, len, f) != len) {
+      fprintf (stderr, "Could not write to '%s'!\n", outfn);
+      return 3;
+  }
+  if (fclose(f) != 0) {
+      fprintf (stderr, "Could not close '%s'!\n", outfn);
+      return 3;
+  }
+  free(buf);
+  fprintf (stderr, "Wrote EXIF data to '%s'\n", outfn);
+
+  return 0;
+}
diff --git a/test/test-fuzzer.c b/test/test-fuzzer.c
new file mode 100644
index 0000000..4aa7cc2
--- /dev/null
+++ b/test/test-fuzzer.c
@@ -0,0 +1,126 @@
+/**file test-fuzzer.c
+ * from test-parse.c and test-mnote.c
+ *
+ * \brief Completely parse all files given on the command line.
+ *
+ * Copyright (C) 2007 Hans Ulrich Niedermann <gp@n-dimensional.de>
+ * Copyright 2002 Lutz Mueller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
+ *
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "libexif/exif-data.h"
+#include "libexif/exif-system.h"
+
+/** Callback function handling an ExifEntry. */
+void content_foreach_func(ExifEntry *entry, void *callback_data);
+void content_foreach_func(ExifEntry *entry, void *UNUSED(callback_data))
+{
+	char buf[2001];
+
+	/* ensure \0 */
+	buf[sizeof(buf)-1] = 0;
+	buf[sizeof(buf)-2] = 0;
+	exif_tag_get_name(entry->tag);
+	exif_format_get_name(entry->format);
+	exif_entry_get_value(entry, buf, sizeof(buf)-1);
+	if (buf[sizeof(buf)-2] != 0) abort();
+}
+
+
+/** Callback function handling an ExifContent (corresponds 1:1 to an IFD). */
+void data_foreach_func(ExifContent *content, void *callback_data);
+void data_foreach_func(ExifContent *content, void *callback_data)
+{
+	printf("  Content %p: ifd=%d\n", content, exif_content_get_ifd(content));
+	exif_content_foreach_entry(content, content_foreach_func, callback_data);
+}
+static int
+test_exif_data (ExifData *d)
+{
+	unsigned int i, c;
+	char v[1024];
+	ExifMnoteData *md;
+
+	fprintf (stdout, "Byte order: %s\n",
+		exif_byte_order_get_name (exif_data_get_byte_order (d)));
+
+	md = exif_data_get_mnote_data (d);
+	if (!md) {
+		fprintf (stderr, "Could not parse maker note!\n");
+		return 1;
+	}
+
+	exif_mnote_data_ref (md);
+	exif_mnote_data_unref (md);
+
+	c = exif_mnote_data_count (md);
+	for (i = 0; i < c; i++) {
+		const char *name = exif_mnote_data_get_name (md, i);
+		if (!name) break;
+		exif_mnote_data_get_name (md, i);
+		exif_mnote_data_get_title (md, i);
+		exif_mnote_data_get_description (md, i);
+		exif_mnote_data_get_value (md, i, v, sizeof (v));
+	}
+
+	return 0;
+}
+
+
+
+/** Run EXIF parsing test on the given file. */
+static void test_parse(const char *filename, void *callback_data)
+{
+	ExifData *d;
+	unsigned int buf_size;
+	unsigned char *buf;
+
+	d = exif_data_new_from_file(filename);
+	exif_data_foreach_content(d, data_foreach_func, callback_data);
+	test_exif_data (d);
+
+	buf = NULL;
+	exif_data_save_data (d, &buf, &buf_size);
+	free (buf);
+
+	exif_data_set_byte_order(d, EXIF_BYTE_ORDER_INTEL);
+
+	buf = NULL;
+	exif_data_save_data (d, &buf, &buf_size);
+	free (buf);
+
+
+	exif_data_unref(d);
+}
+
+
+/** Main program. */
+int main(const int argc, const char *argv[])
+{
+	int i;
+	void *callback_data = NULL;
+
+	for (i=1; i<argc; i++) {
+		test_parse(argv[i], callback_data);
+	}
+	return 0;
+}
diff --git a/test/test-integers.c b/test/test-integers.c
index 6af7534..b725ca5 100644
--- a/test/test-integers.c
+++ b/test/test-integers.c
@@ -21,9 +21,7 @@
 
 
 #include "libexif/_stdint.h"
-#include <stdlib.h>
-#include <stdio.h>
-
+#include <assert.h>
 
 typedef enum {
    EN_A,
@@ -34,31 +32,13 @@ typedef enum {
    EN_F
 } enum_t;
 
-
-#if defined(__GNUC__) && (__GNUC__ >= 4)
-# define CHECK(condition)					     \
-	if (!(condition)) {					     \
-		fprintf(stderr, "%s:%d: check failed: %s\n",	     \
-			__FILE__, __LINE__, #condition);	     \
-		errors++;					     \
-	}
-#else
-# define CHECK(condition)					     \
-	if (!(condition)) {					     \
-		abort();					     \
-	}
-#endif
-
-
 int main()
 {
-  unsigned int errors = 0;
-
   /* libexif assumes unsigned ints are not smaller than 32bit in many places */
-  CHECK(sizeof(unsigned int) >= sizeof(uint32_t));
+  assert(sizeof(unsigned int) >= sizeof(uint32_t));
 
   /* libexif assumes that enums fit into ints */
-  CHECK(sizeof(enum_t) <= sizeof(int));
+  assert(sizeof(enum_t) <= sizeof(int));
   
-  return (errors>0)?1:0;
+  return 0;
 }
diff --git a/test/test-mem.c b/test/test-mem.c
index d4459a9..e94df35 100644
--- a/test/test-mem.c
+++ b/test/test-mem.c
@@ -39,11 +39,25 @@ main ()
 
 	printf ("Creating EXIF data...\n");
 	ed = exif_data_new ();
+	if (!ed) {
+		fprintf(stderr, "Out of memory\n");
+		exit(13);
+	}
+
 	exif_data_set_data_type (ed, EXIF_DATA_TYPE_UNCOMPRESSED_CHUNKY);
 
 	printf ("Fill EXIF data with all necessary entries to follow specs...\n");
 	exif_data_fix (ed);
 
+	/* Add a dummy thumbnail */
+	ed->size = 4;
+	ed->data = calloc(1, ed->size);
+	if (!ed->data) {
+		fprintf(stderr, "Out of memory\n");
+		exif_data_unref (ed);
+		exit(13);
+	}
+
 	exif_data_dump (ed);
 
 	printf ("Saving EXIF data to memory...\n");
@@ -52,6 +66,11 @@ main ()
 
 	printf ("Writing %i byte(s) EXIF data to loader...\n", ebs);
 	loader = exif_loader_new ();
+	if (!loader) {
+		fprintf(stderr, "Out of memory\n");
+		free (eb);
+		exit(13);
+	}
 	size[0] = (unsigned char) ebs;
 	size[1] = (unsigned char) (ebs >> 8);
 	exif_loader_write (loader, size, 2);
@@ -59,6 +78,10 @@ main ()
 	printf ("Wrote %i byte(s).\n", i);
 	free (eb);
 	ed = exif_loader_get_data (loader);
+	if (!ed) {
+		fprintf(stderr, "Out of memory\n");
+		exit(13);
+	}
 	exif_loader_unref (loader);
 	exif_data_dump (ed);
 	exif_data_unref (ed);
diff --git a/test/test-mnote.c b/test/test-mnote.c
index 3864065..81d452c 100644
--- a/test/test-mnote.c
+++ b/test/test-mnote.c
@@ -1,6 +1,6 @@
 /* exif-mnote.c
  *
- * Copyright 2002 Lutz M\uffffller <lutz@users.sourceforge.net>
+ * Copyright 2002 Lutz Mueller <lutz@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,10 +32,10 @@ test_exif_data (ExifData *d)
 	char v[1024], *p;
 	ExifMnoteData *md;
 
-	fprintf (stdout, "Byte order: %s\n",
+	printf("Byte order: %s\n",
 		exif_byte_order_get_name (exif_data_get_byte_order (d)));
 
-	fprintf (stdout, "Parsing maker note...\n");
+	printf("Parsing maker note...\n");
 	md = exif_data_get_mnote_data (d);
 	if (!md) {
 		fprintf (stderr, "Could not parse maker note!\n");
@@ -43,25 +43,25 @@ test_exif_data (ExifData *d)
 		return 1;
 	}
 
-	fprintf (stdout, "Increasing ref-count...\n");
+	printf("Increasing ref-count...\n");
 	exif_mnote_data_ref (md);
 
-	fprintf (stdout, "Decreasing ref-count...\n");
+	printf("Decreasing ref-count...\n");
 	exif_mnote_data_unref (md);
 
-	fprintf (stdout, "Counting entries...\n");
+	printf("Counting entries...\n");
 	c = exif_mnote_data_count (md);
-	fprintf (stdout, "Found %i entries.\n", c);
+	printf("Found %i entries.\n", c);
 	for (i = 0; i < c; i++) {
-		fprintf (stdout, "Dumping entry number %i...\n", i);
-		fprintf (stdout, "  Name: '%s'\n",
+		printf("Dumping entry number %i...\n", i);
+		printf("  Name: '%s'\n",
 				exif_mnote_data_get_name (md, i));
-		fprintf (stdout, "  Title: '%s'\n",
+		printf("  Title: '%s'\n",
 				exif_mnote_data_get_title (md, i));
-		fprintf (stdout, "  Description: '%s'\n",
+		printf("  Description: '%s'\n",
 				exif_mnote_data_get_description (md, i));
 		p = exif_mnote_data_get_value (md, i, v, sizeof (v));
-		if (p) { fprintf (stdout, "  Value: '%s'\n", v); }
+		if (p) { printf("  Value: '%s'\n", v); }
 	}
 
 	return 0;
@@ -80,28 +80,32 @@ main (int argc, char **argv)
 		return 1;
 	}
 
-	fprintf (stdout, "Loading '%s'...\n", argv[1]);
+	printf("Loading '%s'...\n", argv[1]);
 	d = exif_data_new_from_file (argv[1]);
 	if (!d) {
 		fprintf (stderr, "Could not load data from '%s'!\n", argv[1]);
 		return 1;
 	}
-	fprintf (stdout, "Loaded '%s'.\n", argv[1]);
+	printf("Loaded '%s'.\n", argv[1]);
 
-	fprintf (stdout, "######### Test 1 #########\n");
+	printf("######### Test 1 #########\n");
 	r = test_exif_data (d);
 	if (r) return r;
 
 	exif_data_save_data (d, &buf, &buf_size);
 	exif_data_unref (d);
 	d = exif_data_new_from_data (buf, buf_size);
+	if (!d) {
+		fprintf (stderr, "Could not load data from buf!\n");
+		return 1;
+	}
 	free (buf);
 
-	fprintf (stdout, "######### Test 2 #########\n");
+	printf ("######### Test 2 #########\n");
 	r = test_exif_data (d);
 	if (r) return r;
 
-	fprintf (stdout, "Test successful!\n");
+	printf ("Test successful!\n");
 
 	return 1;
 }
diff --git a/test/test-null.c b/test/test-null.c
new file mode 100644
index 0000000..48c02e4
--- /dev/null
+++ b/test/test-null.c
@@ -0,0 +1,351 @@
+/** \file test-null.c
+ * \brief Pass NULL values into libexif APIs and ensure it doesn't crash.
+ *
+ * Copyright (C) 2019 Dan Fandrich <dan@coneharvesters.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
+ *
+ */
+
+#include "libexif/exif-data.h"
+#include "libexif/exif-entry.h"
+#include "libexif/exif-loader.h"
+#include "libexif/exif-mnote-data.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+static void loader_null_test(void)
+{
+	ExifLoader *l;
+	ExifData *d;
+	unsigned char ret;
+	const unsigned char *ccp;
+	unsigned int i;
+
+	l = exif_loader_new_mem(NULL);
+	if (l) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_loader_new_mem");
+		exit(13);
+	}
+
+	exif_loader_ref(NULL);
+
+	exif_loader_unref(NULL);
+
+	exif_loader_write_file(NULL, "test");
+
+	exif_loader_write_file(NULL, NULL);
+
+	ret = exif_loader_write(NULL, (unsigned char *)"x", 1);
+	if (ret) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_loader_write");
+		exit(13);
+	}
+
+	exif_loader_write(NULL, NULL, 123);
+
+	exif_loader_reset(NULL);
+
+	d = exif_loader_get_data(NULL);
+	if (d) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_loader_get_data");
+		exit(13);
+	}
+
+	exif_loader_get_buf(NULL, NULL, NULL);
+
+	exif_loader_log(NULL, NULL);
+
+	l = exif_loader_new();
+	if (!l) {
+		fprintf(stderr, "Out of memory\n");
+		exit(13);
+	}
+
+	exif_loader_write_file(l, NULL);
+
+	exif_loader_write(l, NULL, 0);
+	exif_loader_write(l, NULL, 1);
+
+	exif_loader_get_buf(l, NULL, NULL);
+	exif_loader_get_buf(l, &ccp, NULL);
+	exif_loader_get_buf(l, NULL, &i);
+
+	exif_loader_log(l, NULL);
+
+	exif_loader_unref(l);
+}
+
+static void data_null_test(void)
+{
+	/* exif_data_new_from_file() is untested since it doesn't check path */
+
+	ExifData *d;
+	ExifByteOrder bo;
+	ExifMnoteData *m;
+	ExifDataType dt;
+	unsigned char *buf;
+	unsigned int len;
+
+	d = exif_data_new_mem(NULL);
+	if (d) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_data_new_mem");
+		exit(13);
+	}
+
+	d = exif_data_new_from_data(NULL, 123);
+	if (d) {
+		exif_data_unref(d);
+	}
+
+	bo = exif_data_get_byte_order(NULL);
+	(void) bo;
+
+	exif_data_set_byte_order(NULL, EXIF_BYTE_ORDER_MOTOROLA);
+
+	m = exif_data_get_mnote_data(NULL);
+	if (m) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_data_get_mnote_data");
+		exit(13);
+	}
+
+	exif_data_fix(NULL);
+
+	exif_data_foreach_content(NULL, NULL, NULL);
+
+	exif_data_set_option(NULL, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION);
+
+	exif_data_unset_option(NULL, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION);
+
+	exif_data_set_data_type(NULL, EXIF_DATA_TYPE_UNCOMPRESSED_CHUNKY);
+
+	dt = exif_data_get_data_type(NULL);
+	(void) dt;
+
+	exif_data_load_data(NULL, NULL, 123);
+
+	exif_data_save_data(NULL, NULL, NULL);
+
+	exif_data_log(NULL, NULL);
+
+	exif_data_dump(NULL);
+
+	exif_data_ref(NULL);
+
+	exif_data_unref(NULL);
+
+	d = exif_data_new();
+	if (!d) {
+		fprintf(stderr, "Out of memory\n");
+		exit(13);
+	}
+
+	exif_data_load_data(d, NULL, 123);
+
+	exif_data_save_data(d, NULL, &len);
+	exif_data_save_data(d, &buf, NULL);
+	exif_data_save_data(d, NULL, NULL);
+
+	exif_data_foreach_content(d, NULL, NULL);
+
+	exif_data_log(d, NULL);
+
+	exif_data_unref(d);
+}
+
+static void content_null_test(void)
+{
+	ExifContent *c;
+	ExifIfd i;
+
+	c = exif_content_new_mem(NULL);
+	if (c) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_content_new_mem");
+		exit(13);
+	}
+
+	exif_content_ref(NULL);
+
+	exif_content_unref(NULL);
+
+	exif_content_free(NULL);
+
+	exif_content_get_entry(NULL, EXIF_TAG_COMPRESSION);
+
+	exif_content_fix(NULL);
+
+	exif_content_foreach_entry(NULL, NULL, NULL);
+
+	i = exif_content_get_ifd(NULL);
+	(void) i;
+
+	exif_content_dump(NULL, 0);
+
+	exif_content_add_entry(NULL, NULL);
+
+	exif_content_remove_entry(NULL, NULL);
+
+	exif_content_log(NULL, NULL);
+
+	c = exif_content_new();
+	if (!c) {
+		fprintf(stderr, "Out of memory\n");
+		exit(13);
+	}
+
+	exif_content_add_entry(c, NULL);
+
+	exif_content_remove_entry(c, NULL);
+
+	exif_content_log(c, NULL);
+
+	exif_content_foreach_entry(c, NULL, NULL);
+
+	exif_content_unref(c);
+}
+
+static void entry_null_test(void)
+{
+	ExifEntry *e;
+	const char *v = NULL;
+	char buf[] = {0};
+	ExifData *d;
+
+	e = exif_entry_new_mem(NULL);
+	if (e) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_entry_new_mem");
+		exit(13);
+	}
+
+	exif_entry_ref(NULL);
+
+	exif_entry_unref(NULL);
+
+	exif_entry_free(NULL);
+
+	exif_entry_initialize(NULL, EXIF_TAG_COMPRESSION);
+
+	exif_entry_fix(NULL);
+
+	v = exif_entry_get_value(NULL, NULL, 123);
+	if (v) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_entry_get_value");
+		exit(13);
+	}
+
+	v = exif_entry_get_value(NULL, buf, 1);
+	if (v != buf) {
+		fprintf(stderr, "Unexpected value in %s\n", "exif_entry_get_value");
+		exit(13);
+	}
+
+	exif_entry_dump(NULL, 0);
+
+	/* Creating a plain ExifEntry isn't enough, since some functions require
+	 * that it exists in an IFD.
+	 */
+	d = exif_data_new();
+	if (!d) {
+		fprintf(stderr, "Out of memory\n");
+		exit(13);
+	}
+	/* Create the mandatory EXIF fields so we have something to work with */
+	exif_data_fix(d);
+	e = exif_content_get_entry (d->ifd[EXIF_IFD_0], EXIF_TAG_X_RESOLUTION);
+
+	(void) exif_entry_get_value(e, NULL, 0);
+	(void) exif_entry_get_value(e, NULL, 123);
+
+	exif_data_unref(d);
+}
+
+static void mnote_null_test(void)
+{
+	/* Note that these APIs aren't tested with a real ExifMnoteData pointer
+	 * because it's impossible to create one without real data.
+	 */
+	exif_mnote_data_ref(NULL);
+
+	exif_mnote_data_unref(NULL);
+
+	exif_mnote_data_load(NULL, NULL, 123);
+
+	exif_mnote_data_load(NULL, (const unsigned char *)"x", 1);
+
+	exif_mnote_data_save(NULL, NULL, NULL);
+
+	exif_mnote_data_count(NULL);
+
+	exif_mnote_data_get_id(NULL, 0);
+
+	exif_mnote_data_get_name(NULL, 0);
+
+	exif_mnote_data_get_title(NULL, 0);
+
+	exif_mnote_data_get_description(NULL, 0);
+
+	exif_mnote_data_get_value(NULL, 0, NULL, 123);
+
+	exif_mnote_data_log(NULL, NULL);
+}
+
+static void log_null_test(void)
+{
+	ExifLog *l;
+	static va_list va;
+
+	l = exif_log_new_mem(NULL);
+	if (l) {
+		fprintf(stderr, "Unexpected success in %s\n", "exif_log_new_mem");
+		exit(13);
+	}
+
+	exif_log_ref(NULL);
+
+	exif_log_unref(NULL);
+
+	exif_log_free(NULL);
+
+	exif_log_set_func(NULL, NULL, NULL);
+
+	exif_log(NULL, EXIF_LOG_CODE_CORRUPT_DATA, "XXX", "YYY");
+
+	exif_logv(NULL, EXIF_LOG_CODE_CORRUPT_DATA, "XXX", "YYY", va);
+
+	l = exif_log_new();
+	if (!l) {
+		fprintf(stderr, "Out of memory\n");
+		exit(13);
+	}
+
+	exif_log_set_func(l, NULL, NULL);
+
+	exif_log_unref(l);
+}
+
+int main(void)
+{
+	loader_null_test();
+	data_null_test();
+	content_null_test();
+	entry_null_test();
+	mnote_null_test();
+	log_null_test();
+
+	/* If it gets here, we didn't get a SIGSEGV, so success! */
+	return 0;
+}
diff --git a/test/test-parse.c b/test/test-parse.c
index 83889e6..8bc08d5 100644
--- a/test/test-parse.c
+++ b/test/test-parse.c
@@ -27,54 +27,104 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+static unsigned entry_count;
 
 /** Callback function handling an ExifEntry. */
-void content_foreach_func(ExifEntry *entry, void *callback_data);
-void content_foreach_func(ExifEntry *entry, void *UNUSED(callback_data))
+static void content_foreach_func(ExifEntry *entry, void *UNUSED(callback_data))
 {
   char buf[2000];
   exif_entry_get_value(entry, buf, sizeof(buf));
-  printf("    Entry %p: %s (%s)\n"
+  printf("    Entry %u: %s (%s)\n"
 	 "      Size, Comps: %d, %d\n"
 	 "      Value: %s\n", 
-	 entry,
+	 entry_count,
 	 exif_tag_get_name(entry->tag),
 	 exif_format_get_name(entry->format),
 	 entry->size,
 	 (int)(entry->components),
 	 exif_entry_get_value(entry, buf, sizeof(buf)));
+  ++entry_count;
 }
 
 
 /** Callback function handling an ExifContent (corresponds 1:1 to an IFD). */
-void data_foreach_func(ExifContent *content, void *callback_data);
-void data_foreach_func(ExifContent *content, void *callback_data)
+static void data_foreach_func(ExifContent *content, void *callback_data)
 {
-  printf("  Content %p: ifd=%d\n", content, exif_content_get_ifd(content));
+  static unsigned content_count;
+  entry_count = 0;
+  printf("  Content %u: ifd=%d\n", content_count, exif_content_get_ifd(content));
   exif_content_foreach_entry(content, content_foreach_func, callback_data);
+  ++content_count;
 }
 
+static void dump_makernote(ExifData *d) {
+  ExifMnoteData *mn = exif_data_get_mnote_data(d);
+  if (mn) {
+    char buf[2000];
+    int i;
+    int num = exif_mnote_data_count(mn);
+    printf("  MakerNote\n");
+    for (i=0; i < num; ++i) {
+      if (exif_mnote_data_get_value(mn, i, buf, sizeof(buf))) {
+	const char *name = exif_mnote_data_get_name(mn, i);
+	unsigned int id = exif_mnote_data_get_id(mn, i);
+	if (!name)
+	    name = "(unknown)";
+	printf("    Entry %u: %u, %s\n"
+	       "      Size: %u\n"
+	       "      Value: %s\n", i, id, name, (unsigned)strlen(buf), buf);
+      }
+    }
+  }
+}
 
 /** Run EXIF parsing test on the given file. */
-void test_parse(const char *filename, void *callback_data);
-void test_parse(const char *filename, void *callback_data)
+static void test_parse(const char *filename, void *callback_data, int swap)
 {
   ExifData *d;
-  printf("File %s\n", filename);
+
+  /* Skip over path to display only the file name */
+  const char *fn = strrchr(filename, '/');
+  if (fn)
+    ++fn;
+  else
+    fn = filename;
+  printf("File %s\n", fn);
 
   d = exif_data_new_from_file(filename);
+  if (!d) {
+      fprintf (stderr, "Could not load data from '%s'!\n", filename);
+      return;
+  }
+  printf("Byte order: %s\n",
+          exif_byte_order_get_name(exif_data_get_byte_order(d)));
+
+  if (swap) {
+      ExifByteOrder order = EXIF_BYTE_ORDER_INTEL;
+      if (exif_data_get_byte_order(d) == order) {
+          order = EXIF_BYTE_ORDER_MOTOROLA;
+      }
+      /* This switches the byte order of the entire EXIF data structure,
+       * including the MakerNote */
+      exif_data_set_byte_order(d, order);
+      printf("New byte order: %s\n",
+              exif_byte_order_get_name(exif_data_get_byte_order(d)));
+  }
+
   exif_data_foreach_content(d, data_foreach_func, callback_data);
+
+  dump_makernote(d);
+
   exif_data_unref(d);
 }
 
 
 /** Callback function prototype for string parsing. */
-typedef void (*test_parse_func) (const char *filename, void *callback_data);
+typedef void (*test_parse_func) (const char *filename, void *callback_data, int swap);
 
 
 /** Split string at whitespace and call callback with each substring. */
-void split_ws_string(const char *string, test_parse_func func, void *callback_data);
-void split_ws_string(const char *string, test_parse_func func, void *callback_data)
+static void split_ws_string(const char *string, test_parse_func func, void *callback_data)
 {
   const char *start = string;
   const char *p = start;
@@ -87,7 +137,7 @@ void split_ws_string(const char *string, test_parse_func func, void *callback_da
 	if (str) {
 	  memcpy(str, start, len);
 	  str[len] = '\0';
-	  func(str, callback_data);
+	  func(str, callback_data, 0);
 	  free(str);
 	  start = p+1;
 	}
@@ -108,14 +158,25 @@ int main(const int argc, const char *argv[])
 {
   int i;
   void *callback_data = NULL;
+  int swap = 0;
+  int first = 1;
 
-  const char *envar = getenv("TEST_IMAGES");
-  if (envar) {
-    split_ws_string(envar, test_parse, callback_data);
+  if (argc > 1 && !strcmp(argv[1], "--swap-byte-order")) {
+      swap = 1;
+      ++first;
   }
 
-  for (i=1; i<argc; i++) {
-    test_parse(argv[i], callback_data);
+  if (argc > first) {
+    for (i=first; i<argc; i++) {
+      test_parse(argv[i], callback_data, swap);
+    }
+  } else {
+    /* If no command-line argument is found, get the file names from
+       the environment. */
+    const char *envar = getenv("TEST_IMAGES");
+    if (envar) {
+      split_ws_string(envar, test_parse, callback_data);
+    }
   }
 
   return 0;
diff --git a/test/test-value.c b/test/test-value.c
index 715ce10..860845e 100644
--- a/test/test-value.c
+++ b/test/test-value.c
@@ -1,6 +1,10 @@
 /* test-value.c
  *
- * Copyright 2002 Lutz M\uffffller <lutz@users.sourceforge.net>
+ * Creates all the types of tags supported in exif_entry_initialize() and
+ * ensures that exif_entry_get_value() properly truncates the output of each
+ * one according to the buffer size available.
+ *
+ * Copyright 2002 Lutz Mueller <lutz@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,39 +27,368 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
+/*
+ * List of tags to test, one per default initialized type.
+ * There should be one for every block in exif_entry_initialize() and
+ * exif_entry_get_value().
+ */
+ExifTag trunc_test_tags[] = {
+	EXIF_TAG_PIXEL_X_DIMENSION,
+	EXIF_TAG_SUBJECT_LOCATION,
+	EXIF_TAG_IMAGE_WIDTH,
+	EXIF_TAG_ORIENTATION,
+	EXIF_TAG_SAMPLES_PER_PIXEL,
+	EXIF_TAG_BITS_PER_SAMPLE,
+	EXIF_TAG_X_RESOLUTION,
+	EXIF_TAG_WHITE_POINT,
+	EXIF_TAG_REFERENCE_BLACK_WHITE,
+	EXIF_TAG_DATE_TIME,
+	EXIF_TAG_IMAGE_DESCRIPTION,
+	EXIF_TAG_EXIF_VERSION,
+	EXIF_TAG_FLASH_PIX_VERSION,
+	EXIF_TAG_COPYRIGHT,
+	EXIF_TAG_FILE_SOURCE,
+	EXIF_TAG_COMPONENTS_CONFIGURATION,
+	EXIF_TAG_SCENE_TYPE,
+	EXIF_TAG_YCBCR_SUB_SAMPLING,
+	EXIF_TAG_PLANAR_CONFIGURATION,
+};
+
+/*
+ * These tags produce different outputs depending on the amount of buffer space
+ * available.
+ */
+ExifTag nonuniform_test_tags[] = {
+	EXIF_TAG_RESOLUTION_UNIT,
+	EXIF_TAG_COLOR_SPACE,
+	EXIF_TAG_METERING_MODE,
+};
+
+/*
+ * These tags need a nonzero rational number to be interesting.
+ * They must have space for a rational or srational created automatically by
+ * exif_entry_initialize().
+ */
+ExifTag rational_test_tags[] = {
+	EXIF_TAG_FNUMBER,
+	EXIF_TAG_APERTURE_VALUE,
+	EXIF_TAG_MAX_APERTURE_VALUE,
+	EXIF_TAG_FOCAL_LENGTH,
+	EXIF_TAG_SUBJECT_DISTANCE,
+	EXIF_TAG_EXPOSURE_TIME,
+	EXIF_TAG_SHUTTER_SPEED_VALUE,
+	EXIF_TAG_BRIGHTNESS_VALUE,
+	EXIF_TAG_EXPOSURE_BIAS_VALUE,
+};
+
+/*
+ * Verify that the entry is properly truncated to the buffer length within
+ * exif_entry_get_value().  If uniform is zero, then only check that the
+ * resulting string fits within the buffer and don't check its content.
+ */
+static void check_entry_trunc(ExifEntry *e, int uniform)
+{
+	unsigned int i;
+	char v[1024], full[1024];  /* Large enough to never truncate output */
+
+	printf ("Tag 0x%x\n", (int) e->tag);
+
+	/* Get the full, untruncated string to use as the expected value */
+	exif_entry_get_value (e, full, sizeof(full));
+	printf ("Full: '%s'\n", full);
+
+	for (i = strlen(full); i > 0; i--) {
+		/* Make sure the buffer isn't NUL-terminated to begin with */
+		memset(v, '*', sizeof(v));
+		exif_entry_get_value (e, v, i);
+		/* Truncate the full string by one on each iteration */
+		full[i-1] = '\0';
+		if ((strlen(v) >= i) || (uniform && strcmp(full, v))) {
+			printf("Bad truncation!\n");
+			printf("Length %2i: '%s'\n", i, v);
+			exit(1);
+		}
+	}
+}
 
 int
 main ()
 {
-	ExifData *d;
+	ExifData *data;
 	ExifEntry *e;
-	char v[1024];
-	ExifSRational r = {1., 20.};
-	unsigned int i;
+	ExifMem *mem;
+	unsigned i;
+	static const ExifSRational r = {1., 20.};  /* a nonzero number */
+	static const char user_comment[] = "ASCII\0\0\0A Long User Comment";
+	static const char xp_comment[] = "U\0C\0S\0-\0002\0 \0C\0o\0m\0m\0e\0n\0t\0";
+	static const char interop[] = "R98";
+	static const char subsec[] = "130 ";
+	static const ExifRational gpsh = {12., 1.};
+	static const ExifRational gpsm = {34., 1.};
+	static const ExifRational gpss = {56780., 1000.};
+
+	data = exif_data_new ();
+	if (!data) {
+		fprintf (stderr, "Error running exif_data_new()\n");
+		exit(13);
+	}
+
+	/* Full initialization/truncation tests */
+	for (i=0; i < sizeof(trunc_test_tags)/sizeof(trunc_test_tags[0]); ++i) {
+		e = exif_entry_new ();
+		if (!e) {
+			fprintf (stderr, "Error running exif_entry_new()\n");
+			exit(13);
+		}
+		exif_content_add_entry (data->ifd[EXIF_IFD_0], e);
+		exif_entry_initialize (e, trunc_test_tags[i]);
+		check_entry_trunc(e, 1);
+		exif_content_remove_entry (data->ifd[EXIF_IFD_0], e);
+		exif_entry_unref (e);
+	}
+
+	/* Nonuniform initialization/truncation tests */
+	for (i=0; i < sizeof(nonuniform_test_tags)/sizeof(nonuniform_test_tags[0]);
+		 ++i) {
+		e = exif_entry_new ();
+		if (!e) {
+			fprintf (stderr, "Error running exif_entry_new()\n");
+			exit(13);
+		}
+		exif_content_add_entry (data->ifd[EXIF_IFD_0], e);
+		exif_entry_initialize (e, nonuniform_test_tags[i]);
+		check_entry_trunc(e, 0);
+		exif_content_remove_entry (data->ifd[EXIF_IFD_0], e);
+		exif_entry_unref (e);
+	}
+
+	/* Rational number initialization/truncation tests */
+	for (i=0; i < sizeof(rational_test_tags)/sizeof(rational_test_tags[0]);
+		 ++i) {
+		e = exif_entry_new ();
+		if (!e) {
+			fprintf (stderr, "Error running exif_entry_new()\n");
+			exit(13);
+		}
+		exif_content_add_entry (data->ifd[EXIF_IFD_0], e);
+		exif_entry_initialize (e, rational_test_tags[i]);
+		exif_set_srational (e->data, exif_data_get_byte_order (data), r);
+		/* In case this tag needs an unsigned rational instead,
+		 * fix the type automatically */
+		exif_entry_fix (e);
+		check_entry_trunc(e, 1);
+		exif_content_remove_entry (data->ifd[EXIF_IFD_0], e);
+		exif_entry_unref (e);
+	}
+
+	/* Create a memory allocator to manage the remaining ExifEntry structs */
+	mem = exif_mem_new_default();
+	if (!mem) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+
+	/* EXIF_TAG_SUB_SEC_TIME initialization/truncation tests */
+	e = exif_entry_new_mem (mem);
+	if (!e) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	exif_content_add_entry (data->ifd[EXIF_IFD_0], e);
+	exif_entry_initialize (e, EXIF_TAG_SUB_SEC_TIME);
+	e->size = sizeof(subsec);  /* include NUL */
+	e->components = e->size;
+	/* Allocate memory to use for holding the tag data */
+	e->data = exif_mem_alloc(mem, e->size);
+	if (!e->data) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	memcpy(e->data, subsec, e->size);
+	check_entry_trunc(e, 1);
+	exif_content_remove_entry (data->ifd[EXIF_IFD_0], e);
+	exif_entry_unref (e);
+
+	/* EXIF_TAG_USER_COMMENT initialization/truncation tests */
+	e = exif_entry_new_mem (mem);
+	if (!e) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	exif_content_add_entry (data->ifd[EXIF_IFD_0], e);
+	exif_entry_initialize (e, EXIF_TAG_USER_COMMENT);
+	e->size = sizeof(user_comment) - 1;
+	e->components = e->size;
+	/* Allocate memory to use for holding the tag data */
+	e->data = exif_mem_alloc(mem, e->size);
+	if (!e->data) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	memcpy(e->data, user_comment, e->size);
+	check_entry_trunc(e, 1);
+	exif_content_remove_entry (data->ifd[EXIF_IFD_0], e);
+	exif_entry_unref (e);
 
-	d = exif_data_new ();
-	if (!d) {
-		printf ("Error running exif_data_new()\n");
+	/* EXIF_TAG_XP_COMMENT truncation tests */
+	e = exif_entry_new_mem (mem);
+	if (!e) {
+		fprintf (stderr, "Out of memory\n");
 		exit(13);
 	}
+	exif_content_add_entry (data->ifd[EXIF_IFD_0], e);
+	exif_entry_initialize (e, EXIF_TAG_XP_COMMENT);
+	e->format = EXIF_FORMAT_BYTE;
+	e->size = sizeof(xp_comment) - 1;
+	e->components = e->size;
+	/* Allocate memory to use for holding the tag data */
+	e->data = exif_mem_alloc(mem, e->size);
+	if (!e->data) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	memcpy(e->data, xp_comment, e->size);
+	check_entry_trunc(e, 1);
+	exif_content_remove_entry (data->ifd[EXIF_IFD_0], e);
+	exif_entry_unref (e);
 
-	e = exif_entry_new ();
+	/* EXIF_TAG_INTEROPERABILITY_VERSION truncation tests */
+	e = exif_entry_new_mem (mem);
 	if (!e) {
-		printf ("Error running exif_entry_new()\n");
+		fprintf (stderr, "Out of memory\n");
 		exit(13);
 	}
+	exif_content_add_entry (data->ifd[EXIF_IFD_INTEROPERABILITY], e);
+	exif_entry_initialize (e, EXIF_TAG_INTEROPERABILITY_VERSION);
+	e->format = EXIF_FORMAT_UNDEFINED;  /* The spec says ASCII, but libexif
+					       allows UNDEFINED */
+	e->size = sizeof(interop);  /* include NUL */
+	e->components = e->size;
+	/* Allocate memory to use for holding the tag data */
+	e->data = exif_mem_alloc(mem, e->size);
+	if (!e->data) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	memcpy(e->data, interop, e->size);
+	check_entry_trunc(e, 1);
+	exif_content_remove_entry (data->ifd[EXIF_IFD_INTEROPERABILITY], e);
+	exif_entry_unref (e);
 
-	exif_content_add_entry (d->ifd[EXIF_IFD_0], e);
-	exif_entry_initialize (e, EXIF_TAG_SHUTTER_SPEED_VALUE);
-	exif_set_srational (e->data, exif_data_get_byte_order (d), r);
+	/* EXIF_TAG_GPS_VERSION_ID truncation tests */
+	e = exif_entry_new_mem (mem);
+	if (!e) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	exif_content_add_entry (data->ifd[EXIF_IFD_GPS], e);
+	exif_entry_initialize (e, EXIF_TAG_GPS_VERSION_ID);
+	e->format = EXIF_FORMAT_BYTE;
+	e->size = 4;
+	e->components = e->size;
+	/* Allocate memory to use for holding the tag data */
+	e->data = exif_mem_alloc(mem, e->size);
+	if (!e->data) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	e->data[0] = 2;
+	e->data[1] = 2;
+	e->data[2] = 0;
+	e->data[3] = 0;
+	check_entry_trunc(e, 1);
+	exif_content_remove_entry (data->ifd[EXIF_IFD_GPS], e);
+	exif_entry_unref (e);
 
-	for (i = 30; i > 0; i--) {
-		printf ("Length %2i: '%s'\n", i, 
-			exif_entry_get_value (e, v, i));
+	/* EXIF_TAG_GPS_ALTITUDE_REF truncation tests */
+	e = exif_entry_new_mem (mem);
+	if (!e) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	exif_content_add_entry (data->ifd[EXIF_IFD_GPS], e);
+	exif_entry_initialize (e, EXIF_TAG_GPS_ALTITUDE_REF);
+	e->format = EXIF_FORMAT_BYTE;
+	e->size = 1;
+	e->components = e->size;
+	/* Allocate memory to use for holding the tag data */
+	e->data = exif_mem_alloc(mem, e->size);
+	if (!e->data) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	e->data[0] = 1;
+	check_entry_trunc(e, 1);
+	exif_content_remove_entry (data->ifd[EXIF_IFD_GPS], e);
+	exif_entry_unref (e);
+
+	/* EXIF_TAG_GPS_TIME_STAMP truncation tests */
+	e = exif_entry_new_mem (mem);
+	if (!e) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
 	}
+	exif_content_add_entry (data->ifd[EXIF_IFD_GPS], e);
+	exif_entry_initialize (e, EXIF_TAG_GPS_TIME_STAMP);
+	e->format = EXIF_FORMAT_RATIONAL;
+	e->components = 3;
+	e->size = e->components * exif_format_get_size(EXIF_FORMAT_RATIONAL);
+	/* Allocate memory to use for holding the tag data */
+	e->data = exif_mem_alloc(mem, e->size);
+	if (!e->data) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	exif_set_rational(e->data, exif_data_get_byte_order (data), gpsh);
+	exif_set_rational(e->data+8, exif_data_get_byte_order (data), gpsm);
+	exif_set_rational(e->data+16, exif_data_get_byte_order (data), gpss);
+	check_entry_trunc(e, 1);
+	exif_content_remove_entry (data->ifd[EXIF_IFD_GPS], e);
+	exif_entry_unref (e);
 
+	/* EXIF_TAG_SUBJECT_AREA truncation tests */
+	e = exif_entry_new_mem (mem);
+	if (!e) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	exif_content_add_entry (data->ifd[EXIF_IFD_0], e);
+	exif_entry_initialize (e, EXIF_TAG_SUBJECT_AREA);
+	e->format = EXIF_FORMAT_SHORT;
+	/* This tags is interpreted differently depending on # components */
+	/* Rectangle */
+	e->components = 4;
+	e->size = e->components * exif_format_get_size(EXIF_FORMAT_SHORT);
+	/* Allocate memory to use for holding the tag data */
+	e->data = exif_mem_alloc(mem, e->size);
+	if (!e->data) {
+		fprintf (stderr, "Out of memory\n");
+		exit(13);
+	}
+	exif_set_short(e->data, exif_data_get_byte_order (data), 123);
+	exif_set_short(e->data+2, exif_data_get_byte_order (data), 456);
+	exif_set_short(e->data+4, exif_data_get_byte_order (data), 78);
+	exif_set_short(e->data+6, exif_data_get_byte_order (data), 90);
+	check_entry_trunc(e, 1);
+	/* Circle */
+	e->components = 3;
+	e->size = e->components * exif_format_get_size(EXIF_FORMAT_SHORT);
+	check_entry_trunc(e, 1);
+	/* Centre */
+	e->components = 2;
+	e->size = e->components * exif_format_get_size(EXIF_FORMAT_SHORT);
+	check_entry_trunc(e, 1);
+	/* Invalid */
+	e->components = 1;
+	e->size = e->components * exif_format_get_size(EXIF_FORMAT_SHORT);
+	check_entry_trunc(e, 1);
+	exif_content_remove_entry (data->ifd[EXIF_IFD_0], e);
 	exif_entry_unref (e);
-	exif_data_unref (d);
+
+	exif_mem_unref(mem);
+	exif_data_unref (data);
 
 	return 0;
 }
diff --git a/test/testdata/canon_makernote_variant_1.jpg b/test/testdata/canon_makernote_variant_1.jpg
new file mode 100644
index 0000000..1eb37d0
--- /dev/null
+++ b/test/testdata/canon_makernote_variant_1.jpg
diff --git a/test/testdata/canon_makernote_variant_1.jpg.parsed b/test/testdata/canon_makernote_variant_1.jpg.parsed
new file mode 100644
index 0000000..fd18a1b
--- /dev/null
+++ b/test/testdata/canon_makernote_variant_1.jpg.parsed
@@ -0,0 +1,434 @@
+File canon_makernote_variant_1.jpg
+Byte order: Intel
+  Content 0: ifd=0
+    Entry 0: Make (ASCII)
+      Size, Comps: 6, 6
+      Value: Canon
+    Entry 1: Model (ASCII)
+      Size, Comps: 20, 20
+      Value: Canon PowerShot S70
+    Entry 2: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Right-top
+    Entry 3: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 180
+    Entry 4: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 180
+    Entry 5: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 6: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:10 16:42:32
+    Entry 7: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Centered
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 180
+    Entry 2: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 180
+    Entry 3: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/2.8
+    Entry 2: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.2
+    Entry 3: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:10 16:42:32
+    Entry 4: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:10 16:42:32
+    Entry 5: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 6: CompressedBitsPerPixel (Rational)
+      Size, Comps: 8, 1
+      Value:  5
+    Entry 7: ShutterSpeedValue (SRational)
+      Size, Comps: 8, 1
+      Value: 0.00 EV (1 sec.)
+    Entry 8: ApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 2.97 EV (f/2.8)
+    Entry 9: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: 0.00 EV
+    Entry 10: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 2.97 EV (f/2.8)
+    Entry 11: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 12: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Flash did not fire, compulsory flash mode
+    Entry 13: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 5.8 mm
+    Entry 14: MakerNote (Undefined)
+      Size, Comps: 904, 904
+      Value: 904 bytes undefined data
+    Entry 15: UserComment (Undefined)
+      Size, Comps: 264, 264
+      Value: 
+    Entry 16: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 17: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 18: PixelXDimension (Short)
+      Size, Comps: 2, 1
+      Value: 640
+    Entry 19: PixelYDimension (Short)
+      Size, Comps: 2, 1
+      Value: 480
+    Entry 20: FocalPlaneXResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 2253.521
+    Entry 21: FocalPlaneYResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 2253.521
+    Entry 22: FocalPlaneResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 23: SensingMethod (Short)
+      Size, Comps: 2, 1
+      Value: One-chip color area sensor
+    Entry 24: FileSource (Undefined)
+      Size, Comps: 1, 1
+      Value: DSC
+    Entry 25: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Normal process
+    Entry 26: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Auto exposure
+    Entry 27: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Auto white balance
+    Entry 28: DigitalZoomRatio (Rational)
+      Size, Comps: 8, 1
+      Value: 1.0000
+    Entry 29: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Landscape
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+    Entry 2: RelatedImageWidth (Short)
+      Size, Comps: 2, 1
+      Value: 640
+    Entry 3: RelatedImageLength (Short)
+      Size, Comps: 2, 1
+      Value: 480
+  MakerNote
+    Entry 0: 1, Macro Mode
+      Size: 6
+      Value: Normal
+    Entry 1: 1, Self-timer
+      Size: 3
+      Value: Off
+    Entry 2: 1, Quality
+      Size: 9
+      Value: Superfine
+    Entry 3: 1, Flash Mode
+      Size: 3
+      Value: Off
+    Entry 4: 1, Drive Mode
+      Size: 6
+      Value: Single
+    Entry 5: 1, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 6: 1, Focus Mode
+      Size: 6
+      Value: Single
+    Entry 7: 1, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 8: 1, Record Mode
+      Size: 4
+      Value: JPEG
+    Entry 9: 1, Image Size
+      Size: 5
+      Value: Small
+    Entry 10: 1, Easy Shooting Mode
+      Size: 9
+      Value: Landscape
+    Entry 11: 1, Digital Zoom
+      Size: 4
+      Value: None
+    Entry 12: 1, Contrast
+      Size: 6
+      Value: Normal
+    Entry 13: 1, Saturation
+      Size: 6
+      Value: Normal
+    Entry 14: 1, Sharpness
+      Size: 6
+      Value: Normal
+    Entry 15: 1, ISO
+      Size: 4
+      Value: Auto
+    Entry 16: 1, Metering Mode
+      Size: 10
+      Value: Evaluative
+    Entry 17: 1, Focus Range
+      Size: 4
+      Value: Auto
+    Entry 18: 1, AF Point
+      Size: 23
+      Value: Auto AF point selection
+    Entry 19: 1, Exposure Mode
+      Size: 13
+      Value: Easy shooting
+    Entry 20: 1, (unknown)
+      Size: 6
+      Value: 0x7fff
+    Entry 21: 1, Lens Type
+      Size: 6
+      Value: 0xffff
+    Entry 22: 1, Long Focal Length of Lens
+      Size: 3
+      Value: 662
+    Entry 23: 1, Short Focal Length of Lens
+      Size: 3
+      Value: 186
+    Entry 24: 1, Focal Units per mm
+      Size: 2
+      Value: 32
+    Entry 25: 1, Maximal Aperture
+      Size: 4
+      Value: 2.89
+    Entry 26: 1, Minimal Aperture
+      Size: 4
+      Value: 8.00
+    Entry 27: 1, Flash Activity
+      Size: 6
+      Value: 0xffff
+    Entry 28: 1, Flash Details
+      Size: 0
+      Value: 
+    Entry 29: 1, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 30: 1, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 31: 1, Focus Mode
+      Size: 6
+      Value: Single
+    Entry 32: 1, AE Setting
+      Size: 9
+      Value: Normal AE
+    Entry 33: 1, Image Stabilization
+      Size: 6
+      Value: 0xffff
+    Entry 34: 1, Display Aperture
+      Size: 4
+      Value: 0.00
+    Entry 35: 1, Zoom Source Width
+      Size: 4
+      Value: 3072
+    Entry 36: 1, Zoom Target Width
+      Size: 4
+      Value: 3072
+    Entry 37: 1, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 38: 1, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 39: 1, Photo Effect
+      Size: 3
+      Value: Off
+    Entry 40: 1, Manual Flash Output
+      Size: 3
+      Value: Off
+    Entry 41: 1, Color Tone
+      Size: 6
+      Value: 0x7fff
+    Entry 42: 1, (unknown)
+      Size: 6
+      Value: 0x7fff
+    Entry 43: 1, (unknown)
+      Size: 6
+      Value: 0x0001
+    Entry 44: 1, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 45: 2, Focal Type
+      Size: 4
+      Value: Zoom
+    Entry 46: 2, Focal Length
+      Size: 3
+      Value: 186
+    Entry 47: 2, Focal Plane X Size
+      Size: 7
+      Value: 7.39 mm
+    Entry 48: 2, Focal Plane Y Size
+      Size: 7
+      Value: 5.54 mm
+    Entry 49: 3, (unknown)
+      Size: 8
+      Value: 0 0 0 0 
+    Entry 50: 4, Auto ISO
+      Size: 5
+      Value: 1.000
+    Entry 51: 4, Shot ISO
+      Size: 2
+      Value: 50
+    Entry 52: 4, Measured EV
+      Size: 8
+      Value: -9.94 EV
+    Entry 53: 4, Target Aperture
+      Size: 4
+      Value: 2.80
+    Entry 54: 4, Target Exposure Time
+      Size: 1
+      Value: 1
+    Entry 55: 4, Exposure Compensation
+      Size: 7
+      Value: 0.00 EV
+    Entry 56: 4, White Balance
+      Size: 4
+      Value: Auto
+    Entry 57: 4, Slow Shutter
+      Size: 3
+      Value: Off
+    Entry 58: 4, Sequence Number
+      Size: 1
+      Value: 0
+    Entry 59: 4, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 60: 4, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 61: 4, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 62: 4, Flash Guide Number
+      Size: 4
+      Value: 0.00
+    Entry 63: 4, AF Point
+      Size: 6
+      Value: 0x0000
+    Entry 64: 4, Flash Exposure Compensation
+      Size: 7
+      Value: 0.00 EV
+    Entry 65: 4, AE Bracketing
+      Size: 3
+      Value: Off
+    Entry 66: 4, AE Bracket Value
+      Size: 7
+      Value: 0.00 EV
+    Entry 67: 4, (unknown)
+      Size: 6
+      Value: 0x0001
+    Entry 68: 4, Focus Distance Upper
+      Size: 7
+      Value: 6553 mm
+    Entry 69: 4, Focus Distance Lower
+      Size: 4
+      Value: 0 mm
+    Entry 70: 4, F-Number
+      Size: 4
+      Value: 2.89
+    Entry 71: 4, Exposure Time
+      Size: 1
+      Value: 1
+    Entry 72: 4, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 73: 4, Bulb Duration
+      Size: 6
+      Value: 0x0000
+    Entry 74: 4, (unknown)
+      Size: 6
+      Value: 0xffd0
+    Entry 75: 4, Camera Type
+      Size: 7
+      Value: Compact
+    Entry 76: 4, Auto Rotate
+      Size: 12
+      Value: Rotate 90 CW
+    Entry 77: 4, ND Filter
+      Size: 3
+      Value: Off
+    Entry 78: 4, Self-timer
+      Size: 3
+      Value: Off
+    Entry 79: 4, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 80: 4, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 81: 4, (unknown)
+      Size: 6
+      Value: 0x0000
+    Entry 82: 4, Manual Flash Output
+      Size: 3
+      Value: Off
+    Entry 83: 0, (unknown)
+      Size: 12
+      Value: 0 0 0 0 0 0 
+    Entry 84: 0, (unknown)
+      Size: 8
+      Value: 0 0 0 0 
+    Entry 85: 18, (unknown)
+      Size: 101
+      Value: 9 9 640 480 3072 230 553 41 64982 0 554 64982 0 554 64982 0 554 65492 65492 65492 0 0 0 44 44 44 0 0 
+    Entry 86: 19, (unknown)
+      Size: 8
+      Value: 0 0 0 0 
+    Entry 87: 6, ImageType
+      Size: 22
+      Value: IMG:PowerShot S70 JPEG
+    Entry 88: 7, FirmwareVersion
+      Size: 21
+      Value: Firmware Version 1.01
+    Entry 89: 8, ImageNumber
+      Size: 8
+      Value: 123-4567
+    Entry 90: 9, OwnerName
+      Size: 0
+      Value: 
+    Entry 91: 16, (unknown)
+      Size: 9
+      Value: 20447232 
+    Entry 92: 0, (unknown)
+      Size: 15
+      Value: 10 2 2 640 480 
+    Entry 93: 24, (unknown)
+      Size: 22
+      Value: 256 bytes unknown data
+    Entry 94: 25, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 95: 13, (unknown)
+      Size: 118
+      Value: 72 9 512 512 512 512 512 512 512 512 512 65 0 0 65125 2 0 10 65504 65488 0 43 161 0 48 992 1024 0 0 0 0 0 0 0 192 351 
diff --git a/test/testdata/fuji_makernote_variant_1.jpg b/test/testdata/fuji_makernote_variant_1.jpg
new file mode 100644
index 0000000..75e0371
--- /dev/null
+++ b/test/testdata/fuji_makernote_variant_1.jpg
diff --git a/test/testdata/fuji_makernote_variant_1.jpg.parsed b/test/testdata/fuji_makernote_variant_1.jpg.parsed
new file mode 100644
index 0000000..d0990f1
--- /dev/null
+++ b/test/testdata/fuji_makernote_variant_1.jpg.parsed
@@ -0,0 +1,257 @@
+File fuji_makernote_variant_1.jpg
+Byte order: Intel
+  Content 0: ifd=0
+    Entry 0: Make (ASCII)
+      Size, Comps: 9, 9
+      Value: FUJIFILM
+    Entry 1: Model (ASCII)
+      Size, Comps: 14, 14
+      Value: FinePix Z33WP
+    Entry 2: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 3: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 4: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 5: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 6: Software (ASCII)
+      Size, Comps: 37, 37
+      Value: Digital Camera FinePix Z33WP Ver1.01
+    Entry 7: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:03:25 03:27:25
+    Entry 8: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Co-sited
+    Entry 9: Copyright (ASCII)
+      Size, Comps: 5, 5
+      Value: [None] (Photographer) - [None] (Editor)
+    Entry 10: PrintImageMatching (Undefined)
+      Size, Comps: 28, 28
+      Value: 28 bytes undefined data
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 2: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 3: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 4: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 5: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Co-sited
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1/60 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/3.7
+    Entry 2: ExposureProgram (Short)
+      Size, Comps: 2, 1
+      Value: Normal program
+    Entry 3: ISOSpeedRatings (Short)
+      Size, Comps: 2, 1
+      Value: 400
+    Entry 4: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.2
+    Entry 5: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:03:25 03:27:25
+    Entry 6: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:03:25 03:27:25
+    Entry 7: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 8: CompressedBitsPerPixel (Rational)
+      Size, Comps: 8, 1
+      Value: 3.0
+    Entry 9: ShutterSpeedValue (SRational)
+      Size, Comps: 8, 1
+      Value: 6.00 EV (1/64 sec.)
+    Entry 10: ApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 3.80 EV (f/3.7)
+    Entry 11: BrightnessValue (SRational)
+      Size, Comps: 8, 1
+      Value: 2.70 EV (22.26 cd/m^2)
+    Entry 12: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: 0.00 EV
+    Entry 13: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 3.80 EV (f/3.7)
+    Entry 14: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 15: LightSource (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+    Entry 16: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Flash fired, compulsory flash mode, red-eye reduction mode
+    Entry 17: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 6.3 mm
+    Entry 18: MakerNote (Undefined)
+      Size, Comps: 2954, 2954
+      Value: 2954 bytes undefined data
+    Entry 19: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 20: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 21: PixelXDimension (Long)
+      Size, Comps: 4, 1
+      Value: 640
+    Entry 22: PixelYDimension (Long)
+      Size, Comps: 4, 1
+      Value: 480
+    Entry 23: FocalPlaneXResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 1075
+    Entry 24: FocalPlaneYResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 1075
+    Entry 25: FocalPlaneResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Centimeter
+    Entry 26: SensingMethod (Short)
+      Size, Comps: 2, 1
+      Value: One-chip color area sensor
+    Entry 27: FileSource (Undefined)
+      Size, Comps: 1, 1
+      Value: DSC
+    Entry 28: SceneType (Undefined)
+      Size, Comps: 1, 1
+      Value: Directly photographed
+    Entry 29: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Normal process
+    Entry 30: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Auto exposure
+    Entry 31: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Auto white balance
+    Entry 32: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Standard
+    Entry 33: Sharpness (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 34: SubjectDistanceRange (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+  MakerNote
+    Entry 0: 0, Version
+      Size: 4
+      Value: 0130
+    Entry 1: 16, SerialNumber
+      Size: 30
+      Value: 111111111120090123ABC11T111111
+    Entry 2: 4096, Quality
+      Size: 7
+      Value: NORMAL 
+    Entry 3: 4097, Sharpness
+      Size: 6
+      Value: Normal
+    Entry 4: 4098, WhiteBalance
+      Size: 4
+      Value: Auto
+    Entry 5: 4099, ChromaticitySaturation
+      Size: 8
+      Value: Standard
+    Entry 6: 4112, FlashMode
+      Size: 17
+      Value: Red-eye reduction
+    Entry 7: 4113, FlashStrength
+      Size: 6
+      Value: 0.0000
+    Entry 8: 4128, MacroMode
+      Size: 3
+      Value: Off
+    Entry 9: 4129, FocusingMode
+      Size: 4
+      Value: Auto
+    Entry 10: 4130, (unknown)
+      Size: 1
+      Value: 1
+    Entry 11: 4131, FocusPoint
+      Size: 8
+      Value: 320, 240
+    Entry 12: 4144, SlowSynchro
+      Size: 3
+      Value: Off
+    Entry 13: 4145, PictureMode
+      Size: 4
+      Value: Auto
+    Entry 14: 4146, (unknown)
+      Size: 1
+      Value: 1
+    Entry 15: 4352, ContinuousTaking
+      Size: 3
+      Value: Off
+    Entry 16: 4353, ContinuousSequence
+      Size: 1
+      Value: 0
+    Entry 17: 4608, (unknown)
+      Size: 1
+      Value: 0
+    Entry 18: 4624, FinePixColor
+      Size: 10
+      Value: F-Standard
+    Entry 19: 4864, BlurCheck
+      Size: 7
+      Value: No blur
+    Entry 20: 4865, AutoFocusCheck
+      Size: 12
+      Value: Out of focus
+    Entry 21: 4866, AutoExposureCheck
+      Size: 7
+      Value: AE good
+    Entry 22: 5128, (unknown)
+      Size: 20
+      Value: 4 bytes unknown data
+    Entry 23: 5129, (unknown)
+      Size: 20
+      Value: 4 bytes unknown data
+    Entry 24: 5130, (unknown)
+      Size: 1
+      Value: 5
+    Entry 25: 16392, (unknown)
+      Size: 1
+      Value: 0
+    Entry 26: 16640, (unknown)
+      Size: 1
+      Value: 0
+    Entry 27: 16896, (unknown)
+      Size: 1
+      Value: 0
+    Entry 28: 61456, (unknown)
+      Size: 23
+      Value: 2540 bytes unknown data
diff --git a/test/testdata/olympus_makernote_variant_2.jpg b/test/testdata/olympus_makernote_variant_2.jpg
new file mode 100644
index 0000000..461d613
--- /dev/null
+++ b/test/testdata/olympus_makernote_variant_2.jpg
diff --git a/test/testdata/olympus_makernote_variant_2.jpg.parsed b/test/testdata/olympus_makernote_variant_2.jpg.parsed
new file mode 100644
index 0000000..f717533
--- /dev/null
+++ b/test/testdata/olympus_makernote_variant_2.jpg.parsed
@@ -0,0 +1,272 @@
+File olympus_makernote_variant_2.jpg
+Byte order: Intel
+  Content 0: ifd=0
+    Entry 0: ImageDescription (ASCII)
+      Size, Comps: 11, 11
+      Value:           
+    Entry 1: Make (ASCII)
+      Size, Comps: 6, 6
+      Value: NIKON
+    Entry 2: Model (ASCII)
+      Size, Comps: 13, 13
+      Value: COOLPIX S570
+    Entry 3: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 4: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 300
+    Entry 5: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 300
+    Entry 6: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 7: Software (ASCII)
+      Size, Comps: 17, 17
+      Value: COOLPIX S570V1.0
+    Entry 8: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:12:28 04:28:56
+    Entry 9: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Co-sited
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 300
+    Entry 2: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 300
+    Entry 3: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1/25 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/2.7
+    Entry 2: ExposureProgram (Short)
+      Size, Comps: 2, 1
+      Value: Normal program
+    Entry 3: ISOSpeedRatings (Short)
+      Size, Comps: 2, 1
+      Value: 80
+    Entry 4: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.2
+    Entry 5: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:12:28 04:28:56
+    Entry 6: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:12:28 04:28:56
+    Entry 7: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 8: CompressedBitsPerPixel (Rational)
+      Size, Comps: 8, 1
+      Value:  2
+    Entry 9: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: -2.00 EV
+    Entry 10: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 2.90 EV (f/2.7)
+    Entry 11: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 12: LightSource (Short)
+      Size, Comps: 2, 1
+      Value: Cool white fluorescent
+    Entry 13: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Flash fired, auto mode
+    Entry 14: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 5.0 mm
+    Entry 15: MakerNote (Undefined)
+      Size, Comps: 1932, 1932
+      Value: 1932 bytes undefined data
+    Entry 16: UserComment (Undefined)
+      Size, Comps: 16, 16
+      Value:        
+    Entry 17: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 18: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 19: PixelXDimension (Long)
+      Size, Comps: 4, 1
+      Value: 640
+    Entry 20: PixelYDimension (Long)
+      Size, Comps: 4, 1
+      Value: 480
+    Entry 21: FileSource (Undefined)
+      Size, Comps: 1, 1
+      Value: DSC
+    Entry 22: SceneType (Undefined)
+      Size, Comps: 1, 1
+      Value: Directly photographed
+    Entry 23: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Normal process
+    Entry 24: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Auto exposure
+    Entry 25: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Manual white balance
+    Entry 26: DigitalZoomRatio (Rational)
+      Size, Comps: 8, 1
+      Value: 0.00
+    Entry 27: FocalLengthIn35mmFilm (Short)
+      Size, Comps: 2, 1
+      Value: 28
+    Entry 28: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Portrait
+    Entry 29: GainControl (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 30: Contrast (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 31: Saturation (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 32: Sharpness (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 33: SubjectDistanceRange (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+  MakerNote
+    Entry 0: 1, Firmware
+      Size: 4
+      Value: 0200
+    Entry 1: 2, ISO
+      Size: 6
+      Value: ISO 80
+    Entry 2: 3, ColorMode1
+      Size: 6
+      Value: COLOR 
+    Entry 3: 4, Quality
+      Size: 6
+      Value: NORMAL
+    Entry 4: 5, WhiteBalance
+      Size: 12
+      Value: FLUORESCENT 
+    Entry 5: 6, Sharpening
+      Size: 6
+      Value: AUTO  
+    Entry 6: 7, FocusMode
+      Size: 6
+      Value: AF-C  
+    Entry 7: 8, FlashSetting
+      Size: 7
+      Value: NORMAL 
+    Entry 8: 10, (unknown)
+      Size: 5
+      Value: 7.791
+    Entry 9: 11, WhiteBalanceFine
+      Size: 1
+      Value: 0
+    Entry 10: 15, ISOSelection
+      Size: 6
+      Value: MANUAL
+    Entry 11: 16, (unknown)
+      Size: 24
+      Value: 1 bytes unknown data: 00
+    Entry 12: 17, PreviewImage
+      Size: 4
+      Value: 1816
+    Entry 13: 26, (unknown)
+      Size: 40
+      Value:                                         
+    Entry 14: 33, (unknown)
+      Size: 236
+      Value: 106 bytes unknown data: 00024001f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+    Entry 15: 38, (unknown)
+      Size: 46
+      Value: Invalid number of components (18, expected 1).
+    Entry 16: 45, (unknown)
+      Size: 45
+      Value: Invalid number of components (2, expected 1).
+    Entry 17: 46, (unknown)
+      Size: 1
+      Value: 1
+    Entry 18: 47, (unknown)
+      Size: 1
+      Value: 0
+    Entry 19: 48, (unknown)
+      Size: 1
+      Value: 0
+    Entry 20: 128, ImageAdjustment
+      Size: 13
+      Value: NORMAL       
+    Entry 21: 133, ManualFocusDistance
+      Size: 25
+      Value: No manual focus selection
+    Entry 22: 134, DigitalZoom
+      Size: 5
+      Value: 1.000
+    Entry 23: 136, AFFocusPosition
+      Size: 19
+      Value: AF position: center
+    Entry 24: 143, (unknown)
+      Size: 15
+      Value:                
+    Entry 25: 145, (unknown)
+      Size: 1984
+      Value: 980 bytes unknown data: 000000011100000000000000000000000000000000000002bc006700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000400000500000600000700000800000900000a00000b00000c00000d00000e00000f00001000001100001200001300001400001500001600001700001800001900001a00001b00001c00001d00001e00001f00002000002100002200002300002400002500002600002700002800002900002a00002b00002c00002d00002e00002f00003000003100003200003300003400003500003600003700003800003900003a00003b00003c00003d00003e00003f00004000004100004200004300004400004500004600004700004800004900004a00004b00004c00004d00004e00004f00005000005100005200005300005400005500005600005700005800005900005a00005b00005c00005d00005e00005f00006000006100006200006300006400006500006600006700006800006900006a00006b00006c00006d00006e00006f00007000007100007200007300007400007500007600007700007800007900007a00007b00007c00007d00007e00007f00008000008100008200008300008400008500008600008700008800008900008a00008b00008c00008d00008e00008f00009000009100009200009300009400009500009600009700009800009900009a00009b00009c00009d00009e00009f0000a00000a10000a20000a30000a40000a50000a60000a70000a80000a90000aa0000ab0000ac0000ad0000ae0000af0000b00000b10000b20000b30000b40000b50000b60000b70000b80000b90000ba0000bb0000bc0000bd0000be0000bf0000c00000c10000c20000c30000c40000c50000c60000c70000c80000c90000ca0000cb0000cc0000cd0000ce0000cf0000d00000d10000d20000d30000d40000d50000d60000d70000d80000d90000da0000db0000dc0000dd0000de0000df0000e00000e10000e20000e30000e40000e50000e60000e70000e80000e90000ea0000eb0000ec0000ed0000ee0000ef0000f00000f10000f20000f30000f40000f50000f60000f70000f80000f90000fa0000fb0000fc0000fd0000fe0000ff0000
+    Entry 26: 148, Saturation
+      Size: 1
+      Value: 0
+    Entry 27: 149, NoiseReduction,
+      Size: 4
+      Value: OFF 
+    Entry 28: 155, (unknown)
+      Size: 26
+      Value: 2 bytes unknown data: 0000
+    Entry 29: 156, (unknown)
+      Size: 20
+      Value:                     
+    Entry 30: 157, (unknown)
+      Size: 1
+      Value: 0
+    Entry 31: 158, (unknown)
+      Size: 46
+      Value: Invalid number of components (10, expected 1).
+    Entry 32: 159, (unknown)
+      Size: 1
+      Value: 0
+    Entry 33: 172, (unknown)
+      Size: 11
+      Value: VR-OFF     
+    Entry 34: 178, (unknown)
+      Size: 8
+      Value: NORMAL  
+    Entry 35: 181, (unknown)
+      Size: 4
+      Value: 4113
+    Entry 36: 61440, (unknown)
+      Size: 30
+      Value: 4 bytes unknown data: 00000000
+    Entry 37: 61441, (unknown)
+      Size: 1
+      Value: 0
diff --git a/test/testdata/olympus_makernote_variant_3.jpg b/test/testdata/olympus_makernote_variant_3.jpg
new file mode 100644
index 0000000..42498e2
--- /dev/null
+++ b/test/testdata/olympus_makernote_variant_3.jpg
diff --git a/test/testdata/olympus_makernote_variant_3.jpg.parsed b/test/testdata/olympus_makernote_variant_3.jpg.parsed
new file mode 100644
index 0000000..946678a
--- /dev/null
+++ b/test/testdata/olympus_makernote_variant_3.jpg.parsed
@@ -0,0 +1,191 @@
+File olympus_makernote_variant_3.jpg
+Byte order: Intel
+  Content 0: ifd=0
+    Entry 0: ImageDescription (ASCII)
+      Size, Comps: 32, 32
+      Value: OLYMPUS DIGITAL CAMERA         
+    Entry 1: Make (ASCII)
+      Size, Comps: 24, 24
+      Value: OLYMPUS CORPORATION    
+    Entry 2: Model (ASCII)
+      Size, Comps: 17, 17
+      Value: u30D,S410D,u410D
+    Entry 3: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 4: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 5: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 6: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 7: Software (ASCII)
+      Size, Comps: 32, 32
+      Value: Version 1.0                    
+    Entry 8: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:11 15:54:48
+    Entry 9: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Co-sited
+    Entry 10: PrintImageMatching (Undefined)
+      Size, Comps: 244, 244
+      Value: 244 bytes undefined data
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 2: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 3: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1/2 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/5.2
+    Entry 2: ExposureProgram (Short)
+      Size, Comps: 2, 1
+      Value: Creative program (biased toward depth of field)
+    Entry 3: ISOSpeedRatings (Short)
+      Size, Comps: 2, 1
+      Value: 64
+    Entry 4: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.21
+    Entry 5: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:11 15:54:48
+    Entry 6: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:11 15:54:48
+    Entry 7: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 8: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: 0.00 EV
+    Entry 9: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 3.26 EV (f/3.1)
+    Entry 10: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 11: LightSource (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+    Entry 12: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Flash did not fire, compulsory flash mode
+    Entry 13: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 17.4 mm
+    Entry 14: MakerNote (Undefined)
+      Size, Comps: 4860, 4860
+      Value: 4860 bytes undefined data
+    Entry 15: UserComment (Undefined)
+      Size, Comps: 125, 125
+      Value:                                                                                                                      
+    Entry 16: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 17: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 18: PixelXDimension (Long)
+      Size, Comps: 4, 1
+      Value: 640
+    Entry 19: PixelYDimension (Long)
+      Size, Comps: 4, 1
+      Value: 480
+    Entry 20: FileSource (Undefined)
+      Size, Comps: 1, 1
+      Value: DSC
+    Entry 21: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Normal process
+    Entry 22: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Auto exposure
+    Entry 23: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Auto white balance
+    Entry 24: DigitalZoomRatio (Rational)
+      Size, Comps: 8, 1
+      Value: 1.00
+    Entry 25: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Standard
+    Entry 26: GainControl (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 27: Contrast (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 28: Saturation (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 29: Sharpness (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+  MakerNote
+    Entry 0: 512, Mode
+      Size: 10
+      Value: Normal/0/0
+    Entry 1: 513, Quality
+      Size: 11
+      Value: Normal, SQ2
+    Entry 2: 514, Macro
+      Size: 11
+      Value: Super macro
+    Entry 3: 515, BWMode
+      Size: 2
+      Value: No
+    Entry 4: 516, DigiZoom
+      Size: 4
+      Value: 1.00
+    Entry 5: 517, FocalPlaneDiagonal
+      Size: 5
+      Value: 7.150
+    Entry 6: 518, LensDistortionParams
+      Size: 12
+      Value: 0 0 0 0 0 0 
+    Entry 7: 519, FirmwareVersion
+      Size: 5
+      Value: D4199
+    Entry 8: 521, CameraID
+      Size: 31
+      Value: OLYMPUS DIGITAL CAMERA         
+    Entry 9: 8208, (unknown)
+      Size: 336
+      Value: 156 bytes unknown data: 060000000700040000003031300000010200060000003c0500000101020020000000420500000201020020000000620500000301050001000000820500000401040001000000131000000000000044343139390031313131313131313120202020202020202020202020202020202020202020003131313131313131313131313131313120202020202020202020202020202000cb02000064000000
+    Entry 10: 8224, (unknown)
+      Size: 1288
+      Value: 632 bytes unknown data: 1c000000070004000000303130000002030001000000020000000102030001000000000000000202030001000000050000000003030001000000020000000103030001000000000000000203030001000000000000000303030001000000000000000403040040000000e006000000040300010000000000000001040a0001000000e00700000204030001000000000000000005030001000000000000000105030001000000000000000205080001000000000000000305080003000000e80700000405030001000000000000000505080003000000ee0700000605080003000000f40700000705030001000000000000000905030001000000180000000a05030001000000000000000b05030001000000000000000c05030001000000000000000d05050001000000fa0700000e0503000100000000000000000603000200000000000000030603000100000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000400000001000000
+    Entry 11: 8240, (unknown)
+      Size: 83
+      Value: 30 bytes unknown data: 02000000070004000000303130000b010300010000000000000000000000
+    Entry 12: 8256, (unknown)
+      Size: 520
+      Value: 248 bytes unknown data: 0f000000070004000000303130000001030002000000cb0094000002030009000000da0800000003030001000000130000001003030001000000880000000006030004000000ec08000000080b0009000000f408000000100300010000000000000001100300010000000000000002100300010000000000000003100300010000000300000004100300010000000900000010100300010000000000000011100300010000000000000012100300010000000000000000000000b100c4ff0800e6ffbb00dcfffdffbdffc500ff00ff00fe00fe00f9ca4fbbd2eeb03b3bc07bbb0eb70cbb2924163a666f82b9f9ca4fbbd2eeb03b3bc07bbb
+    Entry 13: 8272, (unknown)
+      Size: 1999
+      Value: 3534 bytes unknown data: 2e000000070004000000303130000002080002000000000100000102080002000000aa0400000202080002000000de040000030208000100000095f90000040208000200000083f983f90902030001000000ff0000000a02030001000000000000000b02030001000000000000000d02040001000000000000000e02040005000000460b00000f020400050000005a0b000010020300010000000000000011020400080000006e0b000012020400d00200008e0b00001302030001000000000000001402030001000000000000000003030001000000140000000103030001000000ed01000002030300010000000b00000003030300010000004901000004030300010000009f0100000503050001000000ce1600000703030001000000000000000803030001000000000000000c03030002000000000000000f030800010000001900000010030300010000000000000011030300010000000000000012030300020000004d009a031303080001000000ba010000140303000100000005000000150308000100000000000000160308000100000083f900001c03080001000000000000001d03080001000000000000001e030800010000000000000000120300010000000000000001120300020000000000000002120300010000000000000003120a0001000000d61600000412030001000000000000000512050001000000de16000006120300010000000000000007120300010000000000000008120300010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
diff --git a/test/testdata/olympus_makernote_variant_4.jpg b/test/testdata/olympus_makernote_variant_4.jpg
new file mode 100644
index 0000000..233ff78
--- /dev/null
+++ b/test/testdata/olympus_makernote_variant_4.jpg
diff --git a/test/testdata/olympus_makernote_variant_4.jpg.parsed b/test/testdata/olympus_makernote_variant_4.jpg.parsed
new file mode 100644
index 0000000..e158ef9
--- /dev/null
+++ b/test/testdata/olympus_makernote_variant_4.jpg.parsed
@@ -0,0 +1,176 @@
+File olympus_makernote_variant_4.jpg
+Byte order: Intel
+  Content 0: ifd=0
+    Entry 0: ImageDescription (ASCII)
+      Size, Comps: 32, 32
+      Value: OLYMPUS DIGITAL CAMERA         
+    Entry 1: Make (ASCII)
+      Size, Comps: 24, 24
+      Value: OLYMPUS IMAGING CORP.  
+    Entry 2: Model (ASCII)
+      Size, Comps: 17, 17
+      Value: E-PL2           
+    Entry 3: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 4: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 160
+    Entry 5: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 160
+    Entry 6: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 7: Software (ASCII)
+      Size, Comps: 32, 32
+      Value: Version 1.0                    
+    Entry 8: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 0000:00:00 00:00:00
+    Entry 9: Artist (ASCII)
+      Size, Comps: 64, 64
+      Value: 
+    Entry 10: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Co-sited
+    Entry 11: Copyright (ASCII)
+      Size, Comps: 64, 64
+      Value: [None] (Photographer) - [None] (Editor)
+    Entry 12: PrintImageMatching (Undefined)
+      Size, Comps: 528, 528
+      Value: 528 bytes undefined data
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 2: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 3: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1/13 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/5.6
+    Entry 2: ExposureProgram (Short)
+      Size, Comps: 2, 1
+      Value: Manual
+    Entry 3: ISOSpeedRatings (Short)
+      Size, Comps: 2, 1
+      Value: 320
+    Entry 4: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.21
+    Entry 5: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 0000:00:00 00:00:00
+    Entry 6: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 0000:00:00 00:00:00
+    Entry 7: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 8: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: 0.00 EV
+    Entry 9: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 3.61 EV (f/3.5)
+    Entry 10: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 11: LightSource (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+    Entry 12: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Internal error (unknown value 72)
+    Entry 13: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 14.0 mm
+    Entry 14: MakerNote (Undefined)
+      Size, Comps: 9858, 9858
+      Value: 9858 bytes undefined data
+    Entry 15: UserComment (Undefined)
+      Size, Comps: 9, 9
+      Value:  
+    Entry 16: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 17: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 18: PixelXDimension (Long)
+      Size, Comps: 4, 1
+      Value: 1280
+    Entry 19: PixelYDimension (Long)
+      Size, Comps: 4, 1
+      Value: 960
+    Entry 20: FileSource (Undefined)
+      Size, Comps: 1, 1
+      Value: DSC
+    Entry 21: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Normal process
+    Entry 22: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Manual exposure
+    Entry 23: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Auto white balance
+    Entry 24: DigitalZoomRatio (Rational)
+      Size, Comps: 8, 1
+      Value: 1.00
+    Entry 25: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Standard
+    Entry 26: GainControl (Short)
+      Size, Comps: 2, 1
+      Value: Low gain up
+    Entry 27: Contrast (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 28: Saturation (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 29: Sharpness (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+  MakerNote
+    Entry 0: 512, Mode
+      Size: 8
+      Value: Fast/1/0
+    Entry 1: 521, CameraID
+      Size: 31
+      Value: OLYMPUS DIGITAL CAMERA         
+    Entry 2: 8208, (unknown)
+      Size: 0
+      Value: 
+    Entry 3: 8224, (unknown)
+      Size: 0
+      Value: 
+    Entry 4: 8240, (unknown)
+      Size: 0
+      Value: 
+    Entry 5: 8256, (unknown)
+      Size: 0
+      Value: 
+    Entry 6: 8272, (unknown)
+      Size: 0
+      Value: 
diff --git a/test/testdata/olympus_makernote_variant_5.jpg b/test/testdata/olympus_makernote_variant_5.jpg
new file mode 100644
index 0000000..f083f75
--- /dev/null
+++ b/test/testdata/olympus_makernote_variant_5.jpg
diff --git a/test/testdata/olympus_makernote_variant_5.jpg.parsed b/test/testdata/olympus_makernote_variant_5.jpg.parsed
new file mode 100644
index 0000000..e6cfaa5
--- /dev/null
+++ b/test/testdata/olympus_makernote_variant_5.jpg.parsed
@@ -0,0 +1,284 @@
+File olympus_makernote_variant_5.jpg
+Byte order: Intel
+  Content 0: ifd=0
+    Entry 0: ImageDescription (ASCII)
+      Size, Comps: 32, 32
+      Value: SANYO DIGITAL CAMERA           
+    Entry 1: Make (ASCII)
+      Size, Comps: 24, 24
+      Value: SANYO Electric Co.,Ltd.
+    Entry 2: Model (ASCII)
+      Size, Comps: 14, 14
+      Value: TH1          
+    Entry 3: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 4: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 5: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 6: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 7: Software (ASCII)
+      Size, Comps: 32, 32
+      Value: ver1.1.0                       
+    Entry 8: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:12:28 17:03:51
+    Entry 9: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Co-sited
+    Entry 10: PrintImageMatching (Undefined)
+      Size, Comps: 296, 296
+      Value: 296 bytes undefined data
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 2: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 3: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1/250 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/4.1
+    Entry 2: ExposureProgram (Short)
+      Size, Comps: 2, 1
+      Value: Manual
+    Entry 3: ISOSpeedRatings (Short)
+      Size, Comps: 2, 1
+      Value: 200
+    Entry 4: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.21
+    Entry 5: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:12:28 17:03:51
+    Entry 6: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:12:28 17:03:51
+    Entry 7: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 8: CompressedBitsPerPixel (Rational)
+      Size, Comps: 8, 1
+      Value:  2
+    Entry 9: BrightnessValue (SRational)
+      Size, Comps: 8, 1
+      Value: -0.10 EV (3.20 cd/m^2)
+    Entry 10: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: -1.80 EV
+    Entry 11: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 2.10 EV (f/2.1)
+    Entry 12: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 13: LightSource (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+    Entry 14: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Flash did not fire, compulsory flash mode
+    Entry 15: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 22.6 mm
+    Entry 16: MakerNote (Undefined)
+      Size, Comps: 8200, 8200
+      Value: 8200 bytes undefined data
+    Entry 17: UserComment (Undefined)
+      Size, Comps: 126, 126
+      Value:                                                                                                                      
+    Entry 18: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 19: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 20: PixelXDimension (Long)
+      Size, Comps: 4, 1
+      Value: 640
+    Entry 21: PixelYDimension (Long)
+      Size, Comps: 4, 1
+      Value: 480
+    Entry 22: FileSource (Undefined)
+      Size, Comps: 1, 1
+      Value: DSC
+    Entry 23: SceneType (Undefined)
+      Size, Comps: 1, 1
+      Value: Directly photographed
+    Entry 24: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Normal process
+    Entry 25: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Manual exposure
+    Entry 26: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Auto white balance
+    Entry 27: DigitalZoomRatio (Rational)
+      Size, Comps: 8, 1
+      Value: 0.00
+    Entry 28: FocalLengthIn35mmFilm (Short)
+      Size, Comps: 2, 1
+      Value: 393
+    Entry 29: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Standard
+    Entry 30: GainControl (Short)
+      Size, Comps: 2, 1
+      Value: Low gain up
+    Entry 31: Contrast (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 32: Saturation (Short)
+      Size, Comps: 2, 1
+      Value: High saturation
+    Entry 33: Sharpness (Short)
+      Size, Comps: 2, 1
+      Value: Soft
+    Entry 34: SubjectDistanceRange (Short)
+      Size, Comps: 2, 1
+      Value: Close view
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+  MakerNote
+    Entry 0: 256, ThumbnailImage
+      Size: 1999
+      Value: 1033 bytes unknown data: 0407060506080707080a110b0a09090a150f100c1118151a19181518171b1e27211b1d251d1718222e222528292b2c2b1a202f332f2a32272a2b2a010708080a090a140b0b142a1c181c2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a020708080a090a140b0b142a1c181c2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2affc401a20000010501010101010100000000000000000102030405060708090a0b100002010303020403050504040000017d01020300041105122131410613516107227114328191a1082342b1c11552d1f02433627282090a161718191a25262728292a3435363738393a434445464748494a535455565758595a636465666768696a737475767778797a838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae1e2e3e4e5e6e7e8e9eaf1f2f3f4f5f6f7f8f9fa0100030101010101010101010000000000000102030405060708090a0b1100020102040403040705040400010277000102031104052131061241510761711322328108144291a1b1c109233352f0156272d10a162434e125f11718191a262728292a35363738393a434445464748494a535455565758595a636465666768696a737475767778797a82838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae2e3e4e5e6e7e8e9eaf2f3f4f5f6f7f8f9faffc0001108007800a003012100021101031101ffda000c03010002110311003f00f9b68a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028
+    Entry 1: 512, Mode
+      Size: 10
+      Value: Normal/0/0
+    Entry 2: 513, Quality
+      Size: 16
+      Value: Normal, standard
+    Entry 3: 514, Macro
+      Size: 2
+      Value: No
+    Entry 4: 515, BWMode
+      Size: 2
+      Value: No
+    Entry 5: 516, DigiZoom
+      Size: 4
+      Value: None
+    Entry 6: 526, SequentialShot
+      Size: 4
+      Value: None
+    Entry 7: 527, WideRange
+      Size: 3
+      Value: Off
+    Entry 8: 528, ColorAdjustmentMode
+      Size: 3
+      Value: Off
+    Entry 9: 529, (unknown)
+      Size: 1
+      Value: 1
+    Entry 10: 530, FocusMode
+      Size: 10
+      Value: Spot focus
+    Entry 11: 531, QuickShot
+      Size: 3
+      Value: Off
+    Entry 12: 532, SelfTimer
+      Size: 3
+      Value: Off
+    Entry 13: 533, (unknown)
+      Size: 1
+      Value: 1
+    Entry 14: 534, VoiceMemo
+      Size: 3
+      Value: Off
+    Entry 15: 535, RecordShutterRelease
+      Size: 17
+      Value: Record while down
+    Entry 16: 536, FlickerReduce
+      Size: 3
+      Value: Off
+    Entry 17: 537, OpticalZoom
+      Size: 2
+      Value: On
+    Entry 18: 538, CCDSensitivity
+      Size: 4
+      Value: Auto
+    Entry 19: 539, DigitalZoom
+      Size: 2
+      Value: On
+    Entry 20: 540, (unknown)
+      Size: 2
+      Value: 21
+    Entry 21: 541, LightSourceSpecial
+      Size: 3
+      Value: Off
+    Entry 22: 542, Resaved
+      Size: 2
+      Value: No
+    Entry 23: 543, SceneSelect
+      Size: 3
+      Value: Off
+    Entry 24: 544, (unknown)
+      Size: 1
+      Value: 7
+    Entry 25: 545, (unknown)
+      Size: 3
+      Value: 238
+    Entry 26: 546, (unknown)
+      Size: 1
+      Value: 0
+    Entry 27: 547, ManualFocusDistance
+      Size: 45
+      Value: Invalid number of components (8, expected 1).
+    Entry 28: 548, SequenceShotInterval
+      Size: 12
+      Value: 5 frames/sec
+    Entry 29: 549, (unknown)
+      Size: 0
+      Value: 
+    Entry 30: 550, (unknown)
+      Size: 1
+      Value: 0
+    Entry 31: 551, (unknown)
+      Size: 1
+      Value: 0
+    Entry 32: 553, (unknown)
+      Size: 1
+      Value: 0
+    Entry 33: 3840, DataDump
+      Size: 1999
+      Value: 2540 bytes unknown data: 00000000000000000000ff00000037390000000000000000236236230c11008147434486004f4c4100000000804000000001700100a7003200001119000f000f00a3003206041119000000000000010100a300320604111905200388084b0c4b0ccb0dcb0dcb0f0f00f801fb01b400f401f401c70000ffff0b3404ed0000000001b9ffe50021001d00260025001e0028000f0016ffff000c0021fffb002800250028002c00200024001d0023ff91001d00bbfff5008c009b0076007d005b006808d50b3406f107bf04ed06ad09990bf30703082004ed06ad0a360bf608d0096e04ed088a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001741741701ee05040001e838054600150000000100f42400008d24d000000fa0000007bb000000010000000000000fa0017c1cc700c829150057005800ea00004000000000570ccc0000000064000b7802828001005101d7001500150000000000000122000001230000000000000000000000000000000017517517020000000d7112b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffff000000000000000000000000000000000000000000001711711700ef6464640064640182013300ff0103015f014100dc014500aa00ed0123016800ba014400ba00d900464b06012300000a080e1300340b10220f00
+    Entry 34: 3841, (unknown)
+      Size: 1999
+      Value: 4048 bytes unknown data: 59636759ea000006ea00005fea00004fea000058ea000052ea000060ea000041ea000045e59fd188e3a044f0e3a05b4054f0e2856bc0e3a064f0e2867a80e3a074f0e2878d40e3a084f0e2889164e59f9008e5840020e3a00000e5850f96e3a00001e250fffd1aff0000e59500c0e2000080e3501140059f10a0058600c0e3501138059f10a00586af40e3a0a051e28aae80038aa00005860940e3a00001e2800198e5869020e3c99008e5840000e3a00004e5880010e3a00001e250fffd1affa005e38aa000e58600ece5960011e2000011e350fffb1aff0030e3a00000e5850000e59500c2e2000082e35010d0059f00c2e35010cc059f0040e35010c8059f0080e35010c4059f00c0e35010c0059f0b80e3a004f0e2801000e5800037eb000054eb000032ea000008e52d00a4e59f0000e5900004e58d8001e8bd0008e52d0094e59f0000e5900004e58d8001e8bd0008e52d0084e59f0000e5900004e58d8001e8bd0008e52d0074e59f0000e5900004e58d8001e8bd0008e52d0064e59f0000e5900004e58d8001e8bd0008e52d0054e59f0000e5900004e58d8001e8bd0008e52d0044e59f0000e5900004e58d8001e8bd100040000c3010503b3b002600270026110a210711071105110611041104110311031102fff843fffffc43ffffe843fffff043ffffec43ffffe443fffff443ffc000e59fff1ce12f000043fc303fe3a03f10ee063037e3a03f11ee0631dde3a03f12ee063000e3a03f13ee063f14ee063f15ee063f16ee063f17ee061fc0e3a01033e2811f50ee051f70ee051000e3a01f10ee021006e3a01f30ee021000e3a01f10ee033000e3a03f15ee073f16ee073f10ee113d40e3833005e3833f10ee01f00ee1a0ffffeaff70b8e59f5004e3a00b79e3a00082e2804001e3a030b0e1d037a3e1a00004e153fffb1aff0b79e3a00082e2803000e3a030b0e1c00ce2e3a00b40e28030b0e1c0007ce59f3cffe3c530b0e1c00b79e3a03ec0e3a030b0e1c00b79e3a00042e2803000e5903f40e38330b0e1c00b79e3a00040e2803000e3a030b0e1c00b79e3a00082e2804c80e3a04080e28430b0e1d00004e153fffc1aff6ec0e3a08040e3a01e0fe8b61e0fe8a78001e258fffb1aff007ce35550041285ffd91afff00ee1a0000043fce20e0001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    Entry 35: 3842, (unknown)
+      Size: 1
+      Value: 0
+    Entry 36: 3843, (unknown)
+      Size: 5
+      Value: 67686
+    Entry 37: 3844, (unknown)
+      Size: 46
+      Value: Invalid number of components (1, expected 30).
+    Entry 38: 3845, (unknown)
+      Size: 45
+      Value: Invalid number of components (2, expected 1).
+    Entry 39: 3846, (unknown)
+      Size: 45
+      Value: Invalid number of components (2, expected 1).
diff --git a/test/testdata/pentax_makernote_variant_2.jpg b/test/testdata/pentax_makernote_variant_2.jpg
new file mode 100644
index 0000000..0ef0ef2
--- /dev/null
+++ b/test/testdata/pentax_makernote_variant_2.jpg
diff --git a/test/testdata/pentax_makernote_variant_2.jpg.parsed b/test/testdata/pentax_makernote_variant_2.jpg.parsed
new file mode 100644
index 0000000..55163b3
--- /dev/null
+++ b/test/testdata/pentax_makernote_variant_2.jpg.parsed
@@ -0,0 +1,233 @@
+File pentax_makernote_variant_2.jpg
+Byte order: Motorola
+  Content 0: ifd=0
+    Entry 0: Make (ASCII)
+      Size, Comps: 24, 24
+      Value: Asahi Optical Co.,Ltd. 
+    Entry 1: Model (ASCII)
+      Size, Comps: 18, 18
+      Value: PENTAX Optio430RS
+    Entry 2: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 3: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 4: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 5: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 6: Software (ASCII)
+      Size, Comps: 22, 22
+      Value: 1.00                 
+    Entry 7: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:10 18:46:42
+    Entry 8: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Centered
+    Entry 9: PrintImageMatching (Undefined)
+      Size, Comps: 40, 40
+      Value: 40 bytes undefined data
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 2: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 3: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/2.6
+    Entry 2: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.2
+    Entry 3: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:10 18:46:42
+    Entry 4: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:10 18:46:42
+    Entry 5: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 6: CompressedBitsPerPixel (Rational)
+      Size, Comps: 8, 1
+      Value: 0.433333
+    Entry 7: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: 0.00 EV
+    Entry 8: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 2.60 EV (f/2.5)
+    Entry 9: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 10: LightSource (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+    Entry 11: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Flash fired, auto mode
+    Entry 12: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 7.6 mm
+    Entry 13: MakerNote (Undefined)
+      Size, Comps: 474, 474
+      Value: 474 bytes undefined data
+    Entry 14: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 15: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 16: PixelXDimension (Long)
+      Size, Comps: 4, 1
+      Value: 640
+    Entry 17: PixelYDimension (Long)
+      Size, Comps: 4, 1
+      Value: 480
+    Entry 18: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Normal process
+    Entry 19: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Auto exposure
+    Entry 20: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Auto white balance
+    Entry 21: DigitalZoomRatio (Rational)
+      Size, Comps: 8, 1
+      Value: 0.00
+    Entry 22: FocalLengthIn35mmFilm (Short)
+      Size, Comps: 2, 1
+      Value: 37
+    Entry 23: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Night scene
+    Entry 24: Contrast (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 25: Saturation (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 26: Sharpness (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+  MakerNote
+    Entry 0: 16386, PentaxPreviewSize
+      Size: 8
+      Value: 320 240 
+    Entry 1: 16387, PentaxPreviewLength
+      Size: 2
+      Value: 4 
+    Entry 2: 16388, PentaxPreviewStart
+      Size: 5
+      Value: 1326 
+    Entry 3: 24576, CasioPreviewStart
+      Size: 20
+      Value: 4 bytes unknown data
+    Entry 4: 24577, (unknown)
+      Size: 4
+      Value: 0208
+    Entry 5: 24578, (unknown)
+      Size: 0
+      Value: 
+    Entry 6: 24579, (unknown)
+      Size: 20
+      Value: 8 bytes unknown data
+    Entry 7: 24593, WhiteBalanceBias
+      Size: 7
+      Value: 132 92 
+    Entry 8: 24594, WhiteBalance
+      Size: 3
+      Value: 12 
+    Entry 9: 24595, (unknown)
+      Size: 2
+      Value: 2 
+    Entry 10: 24609, (unknown)
+      Size: 24
+      Value: 65535 65535 65535 65535 
+    Entry 11: 24610, ObjectDistance
+      Size: 5
+      Value: 2000 
+    Entry 12: 24611, (unknown)
+      Size: 2
+      Value: 2 
+    Entry 13: 24625, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 14: 24626, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 15: 24627, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 16: 24628, FlashDistance
+      Size: 5
+      Value: 1000 
+    Entry 17: 28672, RecordMode
+      Size: 3
+      Value: 10 
+    Entry 18: 28673, SelfTimer
+      Size: 2
+      Value: 7 
+    Entry 19: 28674, CasioQuality
+      Size: 2
+      Value: 1 
+    Entry 20: 28675, CasioFocusMode
+      Size: 2
+      Value: 6 
+    Entry 21: 28677, (unknown)
+      Size: 4
+      Value: 1 0 
+    Entry 22: 28678, TimeZone
+      Size: 3
+      Value: ABC
+    Entry 23: 28679, BestshotMode
+      Size: 3
+      Value: Off
+    Entry 24: 28689, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 25: 28690, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 26: 28691, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 27: 28692, CCSISOSensitivity
+      Size: 4
+      Value: 100 
+    Entry 28: 28693, ColorMode
+      Size: 2
+      Value: 0 
+    Entry 29: 28694, Enhancement
+      Size: 2
+      Value: 0 
+    Entry 30: 28695, Finer
+      Size: 2
+      Value: 0 
+    Entry 31: 28696, (unknown)
+      Size: 2
+      Value: 0 
diff --git a/test/testdata/pentax_makernote_variant_3.jpg b/test/testdata/pentax_makernote_variant_3.jpg
new file mode 100644
index 0000000..d93b86f
--- /dev/null
+++ b/test/testdata/pentax_makernote_variant_3.jpg
diff --git a/test/testdata/pentax_makernote_variant_3.jpg.parsed b/test/testdata/pentax_makernote_variant_3.jpg.parsed
new file mode 100644
index 0000000..5408dbc
--- /dev/null
+++ b/test/testdata/pentax_makernote_variant_3.jpg.parsed
@@ -0,0 +1,260 @@
+File pentax_makernote_variant_3.jpg
+Byte order: Intel
+  Content 0: ifd=0
+    Entry 0: Make (ASCII)
+      Size, Comps: 19, 19
+      Value: PENTAX Corporation
+    Entry 1: Model (ASCII)
+      Size, Comps: 18, 18
+      Value: PENTAX Optio 750Z
+    Entry 2: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 3: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 4: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 5: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 6: Software (ASCII)
+      Size, Comps: 20, 20
+      Value: Optio 750Z Ver 1.01
+    Entry 7: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:11 19:06:04
+    Entry 8: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Co-sited
+    Entry 9: PrintImageMatching (Undefined)
+      Size, Comps: 94, 94
+      Value: 94 bytes undefined data
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 2: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 3: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/2.8
+    Entry 2: ISOSpeedRatings (Short)
+      Size, Comps: 2, 1
+      Value: 200
+    Entry 3: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.2
+    Entry 4: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:11 19:06:04
+    Entry 5: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 2009:10:11 19:06:04
+    Entry 6: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 7: CompressedBitsPerPixel (Rational)
+      Size, Comps: 8, 1
+      Value:  3
+    Entry 8: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: 0.00 EV
+    Entry 9: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 3.00 EV (f/2.8)
+    Entry 10: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 11: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Flash did not fire, compulsory flash mode
+    Entry 12: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 7.8 mm
+    Entry 13: MakerNote (Undefined)
+      Size, Comps: 986, 986
+      Value: 986 bytes undefined data
+    Entry 14: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 15: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 16: PixelXDimension (Long)
+      Size, Comps: 4, 1
+      Value: 640
+    Entry 17: PixelYDimension (Long)
+      Size, Comps: 4, 1
+      Value: 480
+    Entry 18: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Custom process
+    Entry 19: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Auto exposure
+    Entry 20: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Auto white balance
+    Entry 21: DigitalZoomRatio (Rational)
+      Size, Comps: 8, 1
+      Value: 1.00
+    Entry 22: FocalLengthIn35mmFilm (Short)
+      Size, Comps: 2, 1
+      Value: 37
+    Entry 23: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Standard
+    Entry 24: Contrast (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 25: Saturation (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 26: Sharpness (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 27: SubjectDistanceRange (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+  MakerNote
+    Entry 0: 16385, Mode
+      Size: 6
+      Value: Manual
+    Entry 1: 16386, PentaxPreviewSize
+      Size: 8
+      Value: 640 480 
+    Entry 2: 16387, PentaxPreviewLength
+      Size: 2
+      Value: 4 
+    Entry 3: 16388, PentaxPreviewStart
+      Size: 5
+      Value: 1898 
+    Entry 4: 16389, ModelID
+      Size: 6
+      Value: 76390 
+    Entry 5: 16390, Date
+      Size: 10
+      Value: 2009:10:11
+    Entry 6: 16391, Time
+      Size: 8
+      Value: 19:06:04
+    Entry 7: 16392, Quality
+      Size: 4
+      Value: Good
+    Entry 8: 16393, ImageSize
+      Size: 7
+      Value: 640x480
+    Entry 9: 16395, PictureMode
+      Size: 33
+      Value: Internal error (unknown value 21)
+    Entry 10: 16396, FlashMode
+      Size: 3
+      Value: Off
+    Entry 11: 16397, FocusMode
+      Size: 6
+      Value: Normal
+    Entry 12: 16398, AFPointSelected
+      Size: 4
+      Value: Auto
+    Entry 13: 16399, AutoAFPoint
+      Size: 8
+      Value: Multiple
+    Entry 14: 16400, FocusPosition
+      Size: 5
+      Value: 1013 
+    Entry 15: 16402, ExposureTime
+      Size: 7
+      Value: 100000 
+    Entry 16: 16403, FNumber
+      Size: 3
+      Value: 28 
+    Entry 17: 16404, ISO
+      Size: 2
+      Value: 9 
+    Entry 18: 16405, (unknown)
+      Size: 6
+      Value: 65533 
+    Entry 19: 16406, ExposureCompensation
+      Size: 3
+      Value: 50 
+    Entry 20: 16407, MeteringMode
+      Size: 2
+      Value: 0 
+    Entry 21: 16408, AutoBracketing
+      Size: 2
+      Value: 0 
+    Entry 22: 16409, WhiteBalance
+      Size: 4
+      Value: Auto
+    Entry 23: 16411, BlueBalance
+      Size: 2
+      Value: 0 
+    Entry 24: 16412, RedBalance
+      Size: 2
+      Value: 0 
+    Entry 25: 16413, FocalLength
+      Size: 3
+      Value: 78 
+    Entry 26: 16414, DigitalZoom
+      Size: 4
+      Value: 100 
+    Entry 27: 16415, Saturation
+      Size: 2
+      Value: 1 
+    Entry 28: 16416, Contrast
+      Size: 2
+      Value: 1 
+    Entry 29: 16417, Sharpness
+      Size: 2
+      Value: 1 
+    Entry 30: 16418, WorldTimeLocation
+      Size: 2
+      Value: 0 
+    Entry 31: 16419, HometownCity
+      Size: 3
+      Value: 20 
+    Entry 32: 16420, DestinationCity
+      Size: 3
+      Value: 15 
+    Entry 33: 16421, HometownDST,
+      Size: 2
+      Value: 0 
+    Entry 34: 16422, DestinationDST
+      Size: 2
+      Value: 0 
+    Entry 35: 16423, (unknown)
+      Size: 20
+      Value: 4 bytes unknown data
+    Entry 36: 16425, FrameNumber
+      Size: 2
+      Value: 0 
+    Entry 37: 16434, ImageProcessing
+      Size: 20
+      Value: 4 bytes unknown data
+    Entry 38: 16449, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 39: 17406, (unknown)
+      Size: 22
+      Value: 494 bytes unknown data
diff --git a/test/testdata/pentax_makernote_variant_4.jpg b/test/testdata/pentax_makernote_variant_4.jpg
new file mode 100644
index 0000000..297ea1c
--- /dev/null
+++ b/test/testdata/pentax_makernote_variant_4.jpg
diff --git a/test/testdata/pentax_makernote_variant_4.jpg.parsed b/test/testdata/pentax_makernote_variant_4.jpg.parsed
new file mode 100644
index 0000000..fa60d06
--- /dev/null
+++ b/test/testdata/pentax_makernote_variant_4.jpg.parsed
@@ -0,0 +1,629 @@
+File pentax_makernote_variant_4.jpg
+Byte order: Motorola
+  Content 0: ifd=0
+    Entry 0: Make (ASCII)
+      Size, Comps: 24, 24
+      Value: CASIO COMPUTER CO.,LTD.
+    Entry 1: Model (ASCII)
+      Size, Comps: 12, 12
+      Value: EX-S12     
+    Entry 2: Orientation (Short)
+      Size, Comps: 2, 1
+      Value: Top-left
+    Entry 3: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 4: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 5: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+    Entry 6: Software (ASCII)
+      Size, Comps: 18, 18
+      Value: 1.01             
+    Entry 7: DateTime (ASCII)
+      Size, Comps: 20, 20
+      Value: 2011:05:06 02:53:37
+    Entry 8: YCbCrPositioning (Short)
+      Size, Comps: 2, 1
+      Value: Co-sited
+    Entry 9: PrintImageMatching (Undefined)
+      Size, Comps: 46, 46
+      Value: 46 bytes undefined data
+  Content 1: ifd=1
+    Entry 0: Compression (Short)
+      Size, Comps: 2, 1
+      Value: JPEG compression
+    Entry 1: XResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 2: YResolution (Rational)
+      Size, Comps: 8, 1
+      Value: 72
+    Entry 3: ResolutionUnit (Short)
+      Size, Comps: 2, 1
+      Value: Inch
+  Content 2: ifd=2
+    Entry 0: ExposureTime (Rational)
+      Size, Comps: 8, 1
+      Value: 1/60 sec.
+    Entry 1: FNumber (Rational)
+      Size, Comps: 8, 1
+      Value: f/2.8
+    Entry 2: ExposureProgram (Short)
+      Size, Comps: 2, 1
+      Value: Normal program
+    Entry 3: ISOSpeedRatings (Short)
+      Size, Comps: 2, 1
+      Value: 400
+    Entry 4: ExifVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: Exif Version 2.21
+    Entry 5: DateTimeOriginal (ASCII)
+      Size, Comps: 20, 20
+      Value: 2011:05:06 02:53:37
+    Entry 6: DateTimeDigitized (ASCII)
+      Size, Comps: 20, 20
+      Value: 2011:05:06 02:53:37
+    Entry 7: ComponentsConfiguration (Undefined)
+      Size, Comps: 4, 4
+      Value: Y Cb Cr -
+    Entry 8: CompressedBitsPerPixel (Rational)
+      Size, Comps: 8, 1
+      Value: 5.066667
+    Entry 9: ExposureBiasValue (SRational)
+      Size, Comps: 8, 1
+      Value: 0.00 EV
+    Entry 10: MaxApertureValue (Rational)
+      Size, Comps: 8, 1
+      Value: 3.00 EV (f/2.8)
+    Entry 11: MeteringMode (Short)
+      Size, Comps: 2, 1
+      Value: Pattern
+    Entry 12: LightSource (Short)
+      Size, Comps: 2, 1
+      Value: Unknown
+    Entry 13: Flash (Short)
+      Size, Comps: 2, 1
+      Value: Flash fired, auto mode
+    Entry 14: FocalLength (Rational)
+      Size, Comps: 8, 1
+      Value: 6.3 mm
+    Entry 15: MakerNote (Undefined)
+      Size, Comps: 8216, 8216
+      Value: 8216 bytes undefined data
+    Entry 16: FlashpixVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: FlashPix Version 1.0
+    Entry 17: ColorSpace (Short)
+      Size, Comps: 2, 1
+      Value: sRGB
+    Entry 18: PixelXDimension (Long)
+      Size, Comps: 4, 1
+      Value: 640
+    Entry 19: PixelYDimension (Long)
+      Size, Comps: 4, 1
+      Value: 480
+    Entry 20: FileSource (Undefined)
+      Size, Comps: 1, 1
+      Value: DSC
+    Entry 21: CustomRendered (Short)
+      Size, Comps: 2, 1
+      Value: Normal process
+    Entry 22: ExposureMode (Short)
+      Size, Comps: 2, 1
+      Value: Auto exposure
+    Entry 23: WhiteBalance (Short)
+      Size, Comps: 2, 1
+      Value: Auto white balance
+    Entry 24: DigitalZoomRatio (Rational)
+      Size, Comps: 8, 1
+      Value: 0/0
+    Entry 25: FocalLengthIn35mmFilm (Short)
+      Size, Comps: 2, 1
+      Value: 36
+    Entry 26: SceneCaptureType (Short)
+      Size, Comps: 2, 1
+      Value: Standard
+    Entry 27: GainControl (Short)
+      Size, Comps: 2, 1
+      Value: High gain up
+    Entry 28: Contrast (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 29: Saturation (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+    Entry 30: Sharpness (Short)
+      Size, Comps: 2, 1
+      Value: Normal
+  Content 3: ifd=3
+  Content 4: ifd=4
+    Entry 0: InteroperabilityIndex (ASCII)
+      Size, Comps: 4, 4
+      Value: R98
+    Entry 1: InteroperabilityVersion (Undefined)
+      Size, Comps: 4, 4
+      Value: 0100
+  MakerNote
+    Entry 0: 16386, PentaxPreviewSize
+      Size: 8
+      Value: 320 240 
+    Entry 1: 16387, PentaxPreviewLength
+      Size: 2
+      Value: 4 
+    Entry 2: 16388, PentaxPreviewStart
+      Size: 5
+      Value: 9112 
+    Entry 3: 16389, ModelID
+      Size: 5
+      Value: 8216 
+    Entry 4: 24576, CasioPreviewStart
+      Size: 20
+      Value: 4 bytes unknown data
+    Entry 5: 24577, (unknown)
+      Size: 4
+      Value: 0906
+    Entry 6: 24578, (unknown)
+      Size: 0
+      Value: 
+    Entry 7: 24579, (unknown)
+      Size: 20
+      Value: 8 bytes unknown data
+    Entry 8: 24580, (unknown)
+      Size: 20
+      Value: 4 bytes unknown data
+    Entry 9: 24581, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 10: 24582, (unknown)
+      Size: 20
+      Value: 1 bytes unknown data
+    Entry 11: 24593, WhiteBalanceBias
+      Size: 8
+      Value: 531 375 
+    Entry 12: 24594, WhiteBalance
+      Size: 3
+      Value: 12 
+    Entry 13: 24595, (unknown)
+      Size: 2
+      Value: 2 
+    Entry 14: 24596, (unknown)
+      Size: 21
+      Value: 36 bytes unknown data
+    Entry 15: 24609, (unknown)
+      Size: 24
+      Value: 65535 65535 65535 65535 
+    Entry 16: 24610, ObjectDistance
+      Size: 5
+      Value: 3221 
+    Entry 17: 24611, (unknown)
+      Size: 2
+      Value: 3 
+    Entry 18: 24625, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 19: 24626, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 20: 24627, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 21: 24628, FlashDistance
+      Size: 4
+      Value: 806 
+    Entry 22: 24629, (unknown)
+      Size: 4
+      Value: 100 
+    Entry 23: 24630, (unknown)
+      Size: 10
+      Value: 144214016 
+    Entry 24: 24631, (unknown)
+      Size: 10
+      Value: 554106865 
+    Entry 25: 24632, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 26: 24633, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 27: 24634, (unknown)
+      Size: 5
+      Value: 1680 
+    Entry 28: 24635, (unknown)
+      Size: 10
+      Value: 1392 1993 
+    Entry 29: 24636, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 30: 24637, (unknown)
+      Size: 6
+      Value: 15625 
+    Entry 31: 24638, (unknown)
+      Size: 6
+      Value: 62000 
+    Entry 32: 24641, (unknown)
+      Size: 5
+      Value: 1385 
+    Entry 33: 24642, (unknown)
+      Size: 5
+      Value: 1379 
+    Entry 34: 24643, (unknown)
+      Size: 3
+      Value: 33 
+    Entry 35: 24644, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 36: 24645, (unknown)
+      Size: 2
+      Value: 6 
+    Entry 37: 24646, (unknown)
+      Size: 5
+      Value: 8265 
+    Entry 38: 24647, (unknown)
+      Size: 7
+      Value: 983040 
+    Entry 39: 24648, (unknown)
+      Size: 4
+      Value: 971 
+    Entry 40: 24649, (unknown)
+      Size: 5
+      Value: 1385 
+    Entry 41: 24650, (unknown)
+      Size: 2
+      Value: 6 
+    Entry 42: 24651, (unknown)
+      Size: 21
+      Value: 80 bytes unknown data
+    Entry 43: 24657, (unknown)
+      Size: 2
+      Value: 6 
+    Entry 44: 24658, (unknown)
+      Size: 9
+      Value: 55943347 
+    Entry 45: 24659, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 46: 24660, (unknown)
+      Size: 11
+      Value: 2172740352 
+    Entry 47: 24661, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 48: 24662, (unknown)
+      Size: 20
+      Value: 1 bytes unknown data
+    Entry 49: 24663, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 50: 24664, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 51: 24665, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 52: 24666, (unknown)
+      Size: 23
+      Value: 2200 bytes unknown data
+    Entry 53: 24667, (unknown)
+      Size: 11
+      Value: 1845559811 
+    Entry 54: 24668, (unknown)
+      Size: 10
+      Value: 671219712 
+    Entry 55: 24669, (unknown)
+      Size: 7
+      Value: 131072 
+    Entry 56: 24670, (unknown)
+      Size: 7
+      Value: 131072 
+    Entry 57: 24673, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 58: 24674, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 59: 24675, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 60: 24676, (unknown)
+      Size: 22
+      Value: 100 bytes unknown data
+    Entry 61: 24677, (unknown)
+      Size: 10
+      Value: 920694200 
+    Entry 62: 24678, (unknown)
+      Size: 10
+      Value: 439355600 
+    Entry 63: 24689, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 64: 24691, (unknown)
+      Size: 4
+      Value: 100 
+    Entry 65: 24693, (unknown)
+      Size: 20
+      Value: 3 bytes unknown data
+    Entry 66: 24694, (unknown)
+      Size: 20
+      Value: 3 bytes unknown data
+    Entry 67: 24695, (unknown)
+      Size: 20
+      Value: 3 bytes unknown data
+    Entry 68: 24697, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 69: 24698, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 70: 24699, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 71: 24700, (unknown)
+      Size: 5
+      Value: 1536 
+    Entry 72: 24701, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 73: 24702, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 74: 24703, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 75: 24705, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 76: 24706, (unknown)
+      Size: 5
+      Value: 4112 
+    Entry 77: 24707, (unknown)
+      Size: 22
+      Value: 256 bytes unknown data
+    Entry 78: 24708, (unknown)
+      Size: 20
+      Value: 1 bytes unknown data
+    Entry 79: 24709, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 80: 24710, (unknown)
+      Size: 4
+      Value: 223 
+    Entry 81: 24711, (unknown)
+      Size: 4
+      Value: 255 
+    Entry 82: 24712, (unknown)
+      Size: 22
+      Value: 800 bytes unknown data
+    Entry 83: 24713, (unknown)
+      Size: 23
+      Value: 1216 bytes unknown data
+    Entry 84: 24714, (unknown)
+      Size: 23
+      Value: 1216 bytes unknown data
+    Entry 85: 24715, (unknown)
+      Size: 21
+      Value: 30 bytes unknown data
+    Entry 86: 24716, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 87: 24717, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 88: 24718, (unknown)
+      Size: 2
+      Value: 3 
+    Entry 89: 24721, (unknown)
+      Size: 20
+      Value: 1 bytes unknown data
+    Entry 90: 24722, (unknown)
+      Size: 20
+      Value: 1 bytes unknown data
+    Entry 91: 24723, (unknown)
+      Size: 6
+      Value: 65280 
+    Entry 92: 24724, (unknown)
+      Size: 21
+      Value: 60 bytes unknown data
+    Entry 93: 24725, (unknown)
+      Size: 4
+      Value: 255 
+    Entry 94: 24726, (unknown)
+      Size: 20
+      Value: 4 bytes unknown data
+    Entry 95: 24727, (unknown)
+      Size: 21
+      Value: 40 bytes unknown data
+    Entry 96: 24728, (unknown)
+      Size: 21
+      Value: 10 bytes unknown data
+    Entry 97: 24729, (unknown)
+      Size: 21
+      Value: 10 bytes unknown data
+    Entry 98: 24730, (unknown)
+      Size: 22
+      Value: 120 bytes unknown data
+    Entry 99: 24737, (unknown)
+      Size: 3
+      Value: 16 
+    Entry 100: 24738, (unknown)
+      Size: 4
+      Value: 0 0 
+    Entry 101: 24739, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 102: 24740, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 103: 24741, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 104: 24753, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 105: 24754, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 106: 24755, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 107: 24756, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 108: 24757, (unknown)
+      Size: 4
+      Value: 0 0 
+    Entry 109: 24768, (unknown)
+      Size: 21
+      Value: 16 bytes unknown data
+    Entry 110: 24769, (unknown)
+      Size: 21
+      Value: 16 bytes unknown data
+    Entry 111: 28672, RecordMode
+      Size: 2
+      Value: 2 
+    Entry 112: 28673, SelfTimer
+      Size: 2
+      Value: 1 
+    Entry 113: 28674, CasioQuality
+      Size: 2
+      Value: 2 
+    Entry 114: 28675, CasioFocusMode
+      Size: 2
+      Value: 3 
+    Entry 115: 28677, (unknown)
+      Size: 4
+      Value: 0 0 
+    Entry 116: 28678, TimeZone
+      Size: 6
+      Value: London
+    Entry 117: 28679, BestshotMode
+      Size: 2
+      Value: On
+    Entry 118: 28680, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 119: 28681, (unknown)
+      Size: 2
+      Value: 3 
+    Entry 120: 28682, (unknown)
+      Size: 6
+      Value: 4 217 
+    Entry 121: 28689, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 122: 28690, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 123: 28691, (unknown)
+      Size: 20
+      Value: 2 bytes unknown data
+    Entry 124: 28692, CCSISOSensitivity
+      Size: 4
+      Value: 400 
+    Entry 125: 28693, ColorMode
+      Size: 2
+      Value: 0 
+    Entry 126: 28694, Enhancement
+      Size: 2
+      Value: 0 
+    Entry 127: 28695, Finer
+      Size: 2
+      Value: 0 
+    Entry 128: 28696, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 129: 28697, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 130: 28698, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 131: 28699, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 132: 28700, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 133: 28701, (unknown)
+      Size: 4
+      Value: 0 0 
+    Entry 134: 28702, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 135: 28703, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 136: 28704, (unknown)
+      Size: 4
+      Value: 0 0 
+    Entry 137: 28705, (unknown)
+      Size: 4
+      Value: 0 0 
+    Entry 138: 28706, (unknown)
+      Size: 4
+      Value: 0 0 
+    Entry 139: 28707, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 140: 28708, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 141: 28709, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 142: 28710, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 143: 28711, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 144: 28712, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 145: 28713, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 146: 28714, (unknown)
+      Size: 2
+      Value: 6 
+    Entry 147: 28715, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 148: 28716, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 149: 28717, (unknown)
+      Size: 2
+      Value: 1 
+    Entry 150: 28718, (unknown)
+      Size: 4
+      Value: 0 0 
+    Entry 151: 28719, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 152: 28720, (unknown)
+      Size: 2
+      Value: 6 
+    Entry 153: 28929, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 154: 28930, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 155: 28931, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 156: 28933, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 157: 28934, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 158: 28935, (unknown)
+      Size: 2
+      Value: 0 
+    Entry 159: 28936, (unknown)
+      Size: 2
+      Value: 0