diff --git a/CMakeLists.txt b/CMakeLists.txt
index 560f412f..a92937fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ PROJECT( exiv2 )
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )
 
+SET( PACKAGE_COPYRIGHT      "Andreas Huggel" )
 SET( PACKAGE_BUGREPORT      "ahuggel@gmx.net" )
 SET( PACKAGE                "exiv2" )
 SET( PACKAGE_NAME           "exiv2" )
diff --git a/config/ConfigureChecks.cmake b/config/ConfigureChecks.cmake
index d0c67d14..2d3b1e8f 100644
--- a/config/ConfigureChecks.cmake
+++ b/config/ConfigureChecks.cmake
@@ -73,7 +73,7 @@ ENDIF( EXIV2_ENABLE_SHARED )
 
 IF( EXIV2_ENABLE_NLS )
     IF( NOT LOCALEDIR )
-        SET( LOCALEDIR "\"${CMAKE_INSTALL_PREFIX}/share/locale\"" )
+        SET( LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale" )
         IF( WIN32 )
             STRING( REPLACE "/" "\\\\" LOCALEDIR ${LOCALEDIR} )
         ENDIF( WIN32 )
diff --git a/config/FindMSGFMT.cmake b/config/FindMSGFMT.cmake
index 5d5f7eaf..ee9ea084 100644
--- a/config/FindMSGFMT.cmake
+++ b/config/FindMSGFMT.cmake
@@ -42,9 +42,8 @@ MACRO(ADD_TRANSLATIONS _baseName)
         ADD_CUSTOM_COMMAND(OUTPUT ${_out}
                            COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in}
                            DEPENDS ${_in})
-        SET(_dest "${LOCALEDIR}/${_file_we}/LC_MESSAGES/")
         INSTALL(FILES ${_out}
-                DESTINATION dest
+                DESTINATION ${LOCALEDIR}/${_file_we}/LC_MESSAGES/
                 RENAME ${_baseName}.mo)
         SET(_outputs ${_outputs} ${_out})
     ENDFOREACH(_file)
diff --git a/config/exiv2.lsm.cmake b/config/exiv2.lsm.cmake
index 7c2e1768..f657ee84 100644
--- a/config/exiv2.lsm.cmake
+++ b/config/exiv2.lsm.cmake
@@ -5,8 +5,8 @@ Entered-date:   2004-05-01
 Description:    Exiv2 is a C++ library and a command line utility to manage image metadata. 
                 It provides fast and easy read and write access to the Exif, IPTC and XMP metadata of images in various formats.
 Keywords:       image photo metadata exif iptc xmp makernotes
-Author:         Andreas Huggel <ahuggel@gmx.net>
-Maintained-by:  Andreas Huggel <ahuggel@gmx.net>
+Author:         ${PACKAGE_COPYRIGHT} <${PACKAGE_BUGREPORT}>
+Maintained-by:  ${PACKAGE_COPYRIGHT} <${PACKAGE_BUGREPORT}>
 Primary-site:   ${PACKAGE_URL}
 Original-site:  ${PACKAGE_URL}
 Platforms:      Linux and other Unices, MacOs-X, Win32.
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 542fa304..1c1a5c8a 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -32,4 +32,55 @@
 # automatically include all po files in the directory
 FILE(GLOB PO_FILES *.po)
 
-ADD_TRANSLATIONS(exiv2 ${PO_FILES})
+ADD_CUSTOM_TARGET( pot-update
+                   COMMAND xgettext -d ${PACKAGE_NAME}
+                                    -s
+                                    -D ${CMAKE_CURRENT_SOURCE_DIR}/..
+                                    -o ${PACKAGE_NAME}.pot
+                                    -p ${CMAKE_CURRENT_SOURCE_DIR}/
+                                    --from-code=UTF-8 
+                                    --files-from=POTFILES.in
+                                    -j
+                                    --keyword=_
+                                    --package-name=${PACKAGE_NAME}
+                                    --package-version=${PACKAGE_VERSION}
+                                    --copyright-holder=${PACKAGE_COPYRIGHT}
+                                    --msgid-bugs-address=${PACKAGE_BUGREPORT}
+                 )
+
+# .mo files creation and .po files update
+
+FOREACH (PO_CURRENT ${PO_FILES})
+    GET_FILENAME_COMPONENT(langue
+                           ${PO_CURRENT}
+                           NAME_WE
+                          )
+
+    SET(MO_FILE ${langue}.mo)
+    ADD_CUSTOM_COMMAND(TARGET update_pot
+                       POST_BUILD
+                       COMMAND msgmerge --update ./${PO_CURRENT} ./${PACKAGE_NAME}.pot
+                       DEPENDS ${PO_CURRENT} ${pot_file}
+    )
+
+#     MESSAGE ("DEPENDANCE : ${PO_CURRENT}")
+#     MESSAGE ("DEPENDANCE : ${PACKAGE_NAME}.POT")
+#     MESSAGE ("DEPENDANCE : ${LANGUE}")
+#     MESSAGE ("DEPENDANCE : ${MO_FILE}")
+#     MESSAGE ("DEPENDANCE : ${PO_FILES}")
+
+    ADD_CUSTOM_COMMAND(
+        OUTPUT ${MO_FILE}
+        COMMAND msgfmt -c ${CMAKE_CURRENT_SOURCE_DIR}/${PO_CURRENT} -o ${CMAKE_CURRENT_SOURCE_DIR}/${langue}.mo
+    )
+
+    INSTALL(FILES ${langue}.gmo
+            DESTINATION ${LOCALEDIR}/po/locale/${langue}/LC_MESSAGES
+            RENAME ${langue}.mo
+           )
+
+    SET( POS_CURRENT ${POS_CURRENT} ${PO_CURRENT})
+ENDFOREACH (PO_CURRENT)
+
+# MESSAGE ("dependance : ${POS_CURRENT}")
+ADD_CUSTOM_TARGET(build_mo ALL DEPENDS ${POS_CURRENT})
diff --git a/po/exiv2.pot b/po/exiv2.pot
index e47399d8..35063730 100644
--- a/po/exiv2.pot
+++ b/po/exiv2.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: exiv2 0.19.1\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2010-04-20 16:52+0200\n"
+"POT-Creation-Date: 2010-04-21 13:54+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"
@@ -16,41 +16,515 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/actions.cpp:254 src/actions.cpp:488 src/actions.cpp:750
-#: src/actions.cpp:767 src/actions.cpp:812 src/actions.cpp:902
-#: src/actions.cpp:1045 src/actions.cpp:1087 src/actions.cpp:1156
-#: src/actions.cpp:1198 src/actions.cpp:1203 src/actions.cpp:1223
-#: src/actions.cpp:1228 src/actions.cpp:1260 src/actions.cpp:1503
-#: src/actions.cpp:1639 src/actions.cpp:1704 src/actions.cpp:1876
-msgid "Failed to open the file\n"
+#: src/exiv2.cpp:237
+msgid ""
+"\n"
+"Actions:\n"
 msgstr ""
 
-#: src/actions.cpp:264
-msgid "File name"
+#: src/exiv2.cpp:255
+msgid ""
+"\n"
+"Options:\n"
 msgstr ""
 
-#: src/actions.cpp:270
-msgid "File size"
+#: src/exiv2.cpp:318
+msgid "             :basename:   - original filename without extension\n"
+msgstr ""
+
+#: src/exiv2.cpp:319
+msgid ""
+"             :dirname:    - name of the directory holding the original file\n"
+msgstr ""
+
+#: src/exiv2.cpp:320
+msgid "             :parentname: - name of parent directory\n"
+msgstr ""
+
+#: src/exiv2.cpp:285
+msgid "             E : include Exif tags in the list\n"
+msgstr ""
+
+#: src/exiv2.cpp:286
+msgid "             I : IPTC datasets\n"
+msgstr ""
+
+#: src/exiv2.cpp:287
+msgid "             X : XMP properties\n"
+msgstr ""
+
+#: src/exiv2.cpp:300
+msgid "             a : all supported metadata (the default)\n"
+msgstr ""
+
+#: src/exiv2.cpp:276
+msgid ""
+"             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
+msgstr ""
+
+#: src/exiv2.cpp:282 src/exiv2.cpp:305
+msgid "             c : JPEG comment\n"
+msgstr ""
+
+#: src/exiv2.cpp:294
+msgid "             c : number of components (count)\n"
+msgstr ""
+
+#: src/exiv2.cpp:301
+msgid "             e : Exif section\n"
+msgstr ""
+
+#: src/exiv2.cpp:289
+msgid "             g : group name\n"
+msgstr ""
+
+#: src/exiv2.cpp:279
+msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
+msgstr ""
+
+#: src/exiv2.cpp:298
+msgid "             h : hexdump of the data\n"
+msgstr ""
+
+#: src/exiv2.cpp:303
+msgid "             i : IPTC data\n"
+msgstr ""
+
+#: src/exiv2.cpp:280
+msgid "             i : IPTC data values (-PIkyct)\n"
+msgstr ""
+
+#: src/exiv2.cpp:290
+msgid "             k : key\n"
+msgstr ""
+
+#: src/exiv2.cpp:291
+msgid "             l : tag label\n"
+msgstr ""
+
+#: src/exiv2.cpp:292
+msgid "             n : tag name\n"
+msgstr ""
+
+#: src/exiv2.cpp:283
+msgid "             p : list available previews\n"
+msgstr ""
+
+#: src/exiv2.cpp:275
+msgid "             s : print a summary of the Exif metadata (the default)\n"
+msgstr ""
+
+#: src/exiv2.cpp:295
+msgid "             s : size in bytes\n"
+msgstr ""
+
+#: src/exiv2.cpp:302
+msgid "             t : Exif thumbnail only\n"
+msgstr ""
+
+#: src/exiv2.cpp:277
+msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
+msgstr ""
+
+#: src/exiv2.cpp:297
+msgid "             t : interpreted (translated) data\n"
+msgstr ""
+
+#: src/exiv2.cpp:278
+msgid "             v : plain Exif data values (-PExgnycv)\n"
+msgstr ""
+
+#: src/exiv2.cpp:296
+msgid "             v : plain data value\n"
+msgstr ""
+
+#: src/exiv2.cpp:304
+msgid "             x : XMP packet\n"
+msgstr ""
+
+#: src/exiv2.cpp:281
+msgid "             x : XMP properties (-PXkyct)\n"
+msgstr ""
+
+#: src/exiv2.cpp:288
+msgid "             x : print a column with the tag number\n"
+msgstr ""
+
+#: src/exiv2.cpp:293
+msgid "             y : type\n"
+msgstr ""
+
+#: src/exiv2.cpp:321
+msgid "           Default filename format is "
+msgstr ""
+
+#: src/exiv2.cpp:273
+msgid "   -D day  Day adjustment with the 'adjust' action.\n"
+msgstr ""
+
+#: src/exiv2.cpp:268
+msgid "   -F      Do not prompt before renaming files (Force).\n"
+msgstr ""
+
+#: src/exiv2.cpp:326
+msgid ""
+"   -M cmd  Command line for the modify action. The format for the\n"
+"           commands is the same as that of the lines of a command file.\n"
+msgstr ""
+
+#: src/exiv2.cpp:272
+msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
+msgstr ""
+
+#: src/exiv2.cpp:284
+msgid ""
+"   -P flgs Print flags for fine control of tag lists ('print' action):\n"
+msgstr ""
+
+#: src/exiv2.cpp:329
+msgid ""
+"   -S .suf Use suffix .suf for source files for insert command.\n"
+"\n"
+msgstr ""
+
+#: src/exiv2.cpp:265
+msgid ""
+"   -T      Only set the file timestamp in 'rename' action, do not rename\n"
+"           the file (overrides -k).\n"
+msgstr ""
+
+#: src/exiv2.cpp:257
+msgid "   -V      Show the program version and exit.\n"
+msgstr ""
+
+#: src/exiv2.cpp:271
+msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
+msgstr ""
+
+#: src/exiv2.cpp:269
+msgid ""
+"   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
+"           is only used with the 'adjust' action.\n"
+msgstr ""
+
+#: src/exiv2.cpp:259
+msgid "   -b      Show large binary values.\n"
+msgstr ""
+
+#: src/exiv2.cpp:323
+msgid "   -c txt  JPEG comment string to set in the image.\n"
+msgstr ""
+
+#: src/exiv2.cpp:299
+msgid ""
+"   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
+msgstr ""
+
+#: src/exiv2.cpp:311
+msgid ""
+"   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
+"           are the same as those for the -d option, plus a target to "
+"extract\n"
+"           preview images and a modifier to generate an XMP sidecar file:\n"
+"             p[<n>[,<m> ...]] : Extract preview images.\n"
+"             X : Extract metadata to an XMP sidecar file <file>.xmp\n"
+msgstr ""
+
+#: src/exiv2.cpp:267
+msgid "   -f      Do not prompt before overwriting existing files (force).\n"
+msgstr ""
+
+#: src/exiv2.cpp:261
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:256
+msgid "   -h      Display this help and exit.\n"
+msgstr ""
+
+#: src/exiv2.cpp:306
+msgid ""
+"   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
+"           the same as those for the -d option, plus a modifier:\n"
+"             X : Insert metadata from an XMP sidecar file <file>.xmp\n"
+"           Only JPEG thumbnails can be inserted, they need to be named\n"
+"           <file>-thumb.jpg\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -k      Preserve file timestamps (keep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:328
+msgid ""
+"   -l dir  Location (directory) for files to be inserted from or extracted "
+"to.\n"
+msgstr ""
+
+#: src/exiv2.cpp:324
+msgid ""
+"   -m file Command file for the modify action. The format for commands is\n"
+"           set|add|del <key> [[<type>] <value>].\n"
+msgstr ""
+
+#: src/exiv2.cpp:262
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:274
+msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
+msgstr ""
+
+#: src/exiv2.cpp:316
+msgid ""
+"   -r fmt  Filename format for the 'rename' action. The format string\n"
+"           follows strftime(3). The following keywords are supported:\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
+msgid ""
+"   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
+msgstr ""
+
+#: src/exiv2.cpp:260
+msgid "   -u      Show unknown tags.\n"
+msgstr ""
+
+#: src/exiv2.cpp:258
+msgid "   -v      Be verbose during the program run.\n"
+msgstr ""
+
+#: src/exiv2.cpp:238
+msgid ""
+"  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
+"                requires at least one of the -a, -Y, -O or -D options.\n"
+msgstr ""
+
+#: src/exiv2.cpp:244
+msgid ""
+"  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
+msgstr ""
+
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:251
+msgid ""
+"  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
+"                Exif tag.\n"
+msgstr ""
+
+#: src/exiv2.cpp:242
+msgid ""
+"  in | insert   Insert metadata from corresponding *.exv files.\n"
+"                Use option -S to change the suffix of the input files.\n"
+msgstr ""
+
+#: src/exiv2.cpp:248
+msgid ""
+"  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
+"                IPTC metadata of image files or set the JPEG comment.\n"
+"                Requires option -c, -m or -M.\n"
+msgstr ""
+
+#: src/exiv2.cpp:245
+msgid ""
+"  mv | rename   Rename files and/or set file timestamps according to the\n"
+"                Exif create timestamp. The filename format can be set with\n"
+"                -r format, timestamp options are controlled with -t and -T.\n"
+msgstr ""
+
+#: src/exiv2.cpp:240
+msgid "  pr | print    Print image metadata.\n"
+msgstr ""
+
+#: src/exiv2.cpp:241
+msgid "  rm | delete   Delete image metadata from the files.\n"
+msgstr ""
+
+#: src/panasonicmn.cpp:320
+msgid " EV"
+msgstr ""
+
+#: src/actions.cpp:690 src/actions.cpp:715 src/actions.cpp:736
+msgid "(Binary value suppressed)"
+msgstr ""
+
+#: src/exiv2.cpp:1003
+msgid "-M option"
+msgstr ""
+
+#: src/exiv2.cpp:818
+msgid "-S option can only be used with insert action\n"
+msgstr ""
+
+#: src/exiv2.cpp:828
+msgid "-T option can only be used with rename action\n"
+msgstr ""
+
+#: src/exiv2.cpp:813
+msgid "-l option can only be used with extract or insert actions\n"
+msgstr ""
+
+#: src/exiv2.cpp:823
+msgid "-t option can only be used with rename action\n"
+msgstr ""
+
+#: src/panasonicmn.cpp:303
+msgid "1-area"
+msgstr ""
+
+#: src/panasonicmn.cpp:304
+msgid "1-area (high speed)"
+msgstr ""
+
+#: src/panasonicmn.cpp:305
+msgid "3-area (auto)"
+msgstr ""
+
+#: src/panasonicmn.cpp:307
+msgid "3-area (center)"
+msgstr ""
+
+#: src/panasonicmn.cpp:306
+msgid "3-area (left)"
+msgstr ""
+
+#: src/panasonicmn.cpp:308
+msgid "3-area (right)"
+msgstr ""
+
+#: src/olympusmn.cpp:1124
+msgid "3000 Kelvin"
+msgstr ""
+
+#: src/actions.cpp:342
+msgid "35 mm equivalent"
+msgstr ""
+
+#: src/olympusmn.cpp:1125
+msgid "3700 Kelvin"
+msgstr ""
+
+#: src/olympusmn.cpp:1126
+msgid "4000 Kelvin"
+msgstr ""
+
+#: src/olympusmn.cpp:1127
+msgid "4500 Kelvin"
+msgstr ""
+
+#: src/panasonicmn.cpp:302
+msgid "5-area"
+msgstr ""
+
+#: src/olympusmn.cpp:1128
+msgid "5500 Kelvin"
+msgstr ""
+
+#: src/olympusmn.cpp:1129
+msgid "6500 Kelvin"
+msgstr ""
+
+#: src/olympusmn.cpp:1130
+msgid "7500 Kelvin"
+msgstr ""
+
+#: src/sigmamn.cpp:167
+msgid "8-Segment"
+msgstr ""
+
+#: src/exiv2.cpp:674
+msgid "Action adjust is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:692
+msgid "Action delete is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:703
+msgid "Action extract is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:750
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:741
+msgid "Action fixiso is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:714
+msgid "Action insert is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:732
+msgid "Action modify is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:683
+msgid "Action print is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:723
+msgid "Action rename is not compatible with the given options\n"
+msgstr ""
+
+#: src/actions.cpp:1334
+msgid "Add"
+msgstr ""
+
+#: src/exiv2.cpp:783
+msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
+msgstr ""
+
+#: src/actions.cpp:1564
+msgid "Adjusting"
+msgstr ""
+
+#: src/nikonmn.cpp:1359
+msgid "All 11 Points"
+msgstr ""
+
+#: src/exiv2.cpp:774
+msgid "An action must be specified\n"
+msgstr ""
+
+#: src/actions.cpp:316
+msgid "Aperture"
+msgstr ""
+
+#: src/sigmamn.cpp:152
+msgid "Aperture priority"
+msgstr ""
+
+#: src/exiv2.cpp:793
+msgid "At least one file is required\n"
+msgstr ""
+
+#: src/olympusmn.cpp:1112 src/olympusmn.cpp:1118 src/olympusmn.cpp:1119
+msgid "Auto"
+msgstr ""
+
+#: src/olympusmn.cpp:1031
+msgid "Auto-Override"
+msgstr ""
+
+#: src/sigmamn.cpp:165
+msgid "Average"
+msgstr ""
+
+#: src/olympusmn.cpp:1082
+msgid "Bottom to top"
 msgstr ""
 
 #: src/actions.cpp:271 src/actions.cpp:423 src/actions.cpp:1071
 msgid "Bytes"
 msgstr ""
 
-#: src/actions.cpp:275
-msgid "MIME type"
-msgstr ""
-
-#: src/actions.cpp:279
-msgid "Image size"
-msgstr ""
-
-#: src/actions.cpp:284 src/actions.cpp:526 src/actions.cpp:577
-#: src/actions.cpp:825 src/actions.cpp:1054 src/actions.cpp:1516
-#: src/actions.cpp:1652 src/actions.cpp:1717
-msgid "No Exif data found in the file\n"
-msgstr ""
-
 #: src/actions.cpp:289
 msgid "Camera make"
 msgstr ""
@@ -59,152 +533,52 @@ msgstr ""
 msgid "Camera model"
 msgstr ""
 
-#: src/actions.cpp:295
-msgid "Image timestamp"
+#: src/actions.cpp:1615
+msgid "Can't adjust timestamp by"
 msgstr ""
 
-#: src/actions.cpp:299
-msgid "Image number"
+#: src/sigmamn.cpp:166
+msgid "Center"
 msgstr ""
 
-#: src/actions.cpp:304
-msgid "Exposure time"
+#: src/nikonmn.cpp:1299
+msgid "Closest subject"
 msgstr ""
 
-#: src/actions.cpp:316
-msgid "Aperture"
+#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
+msgid "Continuous autofocus"
 msgstr ""
 
-#: src/actions.cpp:326
-msgid "Exposure bias"
-msgstr ""
-
-#: src/actions.cpp:329
-msgid "Flash"
-msgstr ""
-
-#: src/actions.cpp:332
-msgid "Flash bias"
-msgstr ""
-
-#: src/actions.cpp:337
-msgid "Focal length"
-msgstr ""
-
-#: src/actions.cpp:342
-msgid "35 mm equivalent"
-msgstr ""
-
-#: src/actions.cpp:352
-msgid "Subject distance"
-msgstr ""
-
-#: src/actions.cpp:363
-msgid "ISO speed"
-msgstr ""
-
-#: src/actions.cpp:366
-msgid "Exposure mode"
-msgstr ""
-
-#: src/actions.cpp:369
-msgid "Metering mode"
-msgstr ""
-
-#: src/actions.cpp:372
-msgid "Macro mode"
-msgstr ""
-
-#: src/actions.cpp:375
-msgid "Image quality"
-msgstr ""
-
-#: src/actions.cpp:378
-msgid "Exif Resolution"
-msgstr ""
-
-#: src/actions.cpp:407
-msgid "White balance"
-msgstr ""
-
-#: src/actions.cpp:410
-msgid "Thumbnail"
-msgstr ""
-
-#: src/actions.cpp:414 src/actions.cpp:419 src/olympusmn.cpp:1097
-msgid "None"
+#: src/pentaxmn.cpp:770
+msgid "Contrast"
 msgstr ""
 
 #: src/actions.cpp:429
 msgid "Copyright"
 msgstr ""
 
-#: src/actions.cpp:432
-msgid "Exif comment"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
 msgstr ""
 
-#: src/actions.cpp:540 src/actions.cpp:590
-msgid "No IPTC data found in the file\n"
+#: src/actions.cpp:1934
+msgid "Could not write metadata to file"
 msgstr ""
 
-#: src/actions.cpp:554 src/actions.cpp:603
-msgid "No XMP data found in the file\n"
+#: src/actions.cpp:1442
+msgid "Del"
 msgstr ""
 
-#: src/actions.cpp:561 src/exiv2.cpp:1064
-msgid "Invalid key"
+#: src/tags.cpp:2752
+msgid "Digital zoom not used"
 msgstr ""
 
-#: src/actions.cpp:690 src/actions.cpp:715 src/actions.cpp:736
-msgid "(Binary value suppressed)"
+#: src/nikonmn.cpp:1298
+msgid "Dynamic area"
 msgstr ""
 
-#: src/actions.cpp:757
-msgid "JPEG comment"
-msgstr ""
-
-#: src/actions.cpp:782
-msgid "Preview"
-msgstr ""
-
-#: src/actions.cpp:786 src/actions.cpp:1126
-msgid "pixels"
-msgstr ""
-
-#: src/actions.cpp:788 src/actions.cpp:1128
-msgid "bytes"
-msgstr ""
-
-#: src/actions.cpp:835
-msgid "Neither tag"
-msgstr ""
-
-#: src/actions.cpp:836
-msgid "nor"
-msgstr ""
-
-#: src/actions.cpp:837
-msgid "found in the file"
-msgstr ""
-
-#: src/actions.cpp:842
-msgid "Image file creation timestamp not set in the file"
-msgstr ""
-
-#: src/actions.cpp:848 src/actions.cpp:1605
-msgid "Failed to parse timestamp"
-msgstr ""
-
-#: src/actions.cpp:849
-msgid "in the file"
-msgstr ""
-
-#: src/actions.cpp:860
-msgid "Updating timestamp to"
-msgstr ""
-
-#: src/actions.cpp:954
-msgid "Erasing thumbnail data"
+#: src/nikonmn.cpp:1302
+msgid "Dynamic area (wide)"
 msgstr ""
 
 #: src/actions.cpp:962
@@ -223,654 +597,297 @@ msgstr ""
 msgid "Erasing XMP data from the file"
 msgstr ""
 
-#: src/actions.cpp:1061
-msgid "Image does not contain an Exif thumbnail\n"
-msgstr ""
-
-#: src/actions.cpp:1070
-msgid "Writing thumbnail"
-msgstr ""
-
-#: src/actions.cpp:1071 src/actions.cpp:1129
-msgid "to file"
-msgstr ""
-
-#: src/actions.cpp:1077
-msgid "Exif data doesn't contain a thumbnail\n"
-msgstr ""
-
-#: src/actions.cpp:1107 src/actions.cpp:1133
-msgid "Image does not have preview"
-msgstr ""
-
-#: src/actions.cpp:1122
-msgid "Writing preview"
-msgstr ""
-
-#: src/actions.cpp:1293
-msgid "Setting JPEG comment"
-msgstr ""
-
-#: src/actions.cpp:1334
-msgid "Add"
-msgstr ""
-
-#: src/actions.cpp:1356 src/actions.cpp:1430
-msgid "Warning"
-msgstr ""
-
-#: src/actions.cpp:1357 src/actions.cpp:1431
-msgid "Failed to read"
-msgstr ""
-
-#: src/actions.cpp:1359 src/actions.cpp:1433
-msgid "value"
-msgstr ""
-
-#: src/actions.cpp:1370
-msgid "Set"
-msgstr ""
-
-#: src/actions.cpp:1442
-msgid "Del"
-msgstr ""
-
-#: src/actions.cpp:1474
-msgid "Reg "
-msgstr ""
-
-#: src/actions.cpp:1558
-msgid "Timestamp of metadatum with key"
-msgstr ""
-
-#: src/actions.cpp:1559
-msgid "not set\n"
-msgstr ""
-
-#: src/actions.cpp:1564
-msgid "Adjusting"
-msgstr ""
-
-#: src/actions.cpp:1564
-msgid "by"
-msgstr ""
-
-#: src/actions.cpp:1568 src/actions.cpp:1617
-msgid "years"
-msgstr ""
-
-#: src/actions.cpp:1571
-msgid "year"
-msgstr ""
-
-#: src/actions.cpp:1579
-msgid "months"
-msgstr ""
-
-#: src/actions.cpp:1582
-msgid "month"
-msgstr ""
-
-#: src/actions.cpp:1590
-msgid "days"
-msgstr ""
-
-#: src/actions.cpp:1593
-msgid "day"
-msgstr ""
-
-#: src/actions.cpp:1599
-msgid "s"
-msgstr ""
-
-#: src/actions.cpp:1615
-msgid "Can't adjust timestamp by"
-msgstr ""
-
-#: src/actions.cpp:1624 src/actions.cpp:1900 src/actions.cpp:1908
-#: src/actions.cpp:1916 src/actions.cpp:1925 src/actions.cpp:2034
-msgid "to"
-msgstr ""
-
-#: src/actions.cpp:1659
-msgid "Standard Exif ISO tag exists; not modified\n"
-msgstr ""
-
-#: src/actions.cpp:1667
-msgid "Setting Exif ISO value to"
-msgstr ""
-
-#: src/actions.cpp:1723
-msgid "No Exif user comment found"
-msgstr ""
-
-#: src/actions.cpp:1731
-msgid "Found Exif user comment with unexpected value type"
-msgstr ""
-
-#: src/actions.cpp:1738
-msgid "No Exif UNICODE user comment found"
-msgstr ""
-
-#: src/actions.cpp:1744
-msgid "Setting Exif UNICODE user comment to"
-msgstr ""
-
-#: src/actions.cpp:1899
-msgid "Writing Exif data from"
-msgstr ""
-
-#: src/actions.cpp:1907
-msgid "Writing IPTC data from"
-msgstr ""
-
-#: src/actions.cpp:1915
-msgid "Writing XMP data from"
-msgstr ""
-
-#: src/actions.cpp:1924
-msgid "Writing JPEG comment from"
-msgstr ""
-
-#: src/actions.cpp:1934
-msgid "Could not write metadata to file"
-msgstr ""
-
-#: src/actions.cpp:1960
-msgid "Filename format yields empty filename for the file"
-msgstr ""
-
-#: src/actions.cpp:1969
-msgid "This file already has the correct name"
-msgstr ""
-
-#: src/actions.cpp:1993 src/exiv2.cpp:168
-msgid "File"
-msgstr ""
-
-#: src/actions.cpp:1994
-msgid "exists. [O]verwrite, [r]ename or [s]kip?"
-msgstr ""
-
-#: src/actions.cpp:2022
-msgid "Renaming file to"
-msgstr ""
-
-#: src/actions.cpp:2024
-msgid "updating timestamp"
-msgstr ""
-
-#: src/actions.cpp:2033
-msgid "Failed to rename"
-msgstr ""
-
-#: src/actions.cpp:2055
-msgid "Overwrite"
-msgstr ""
-
-#: src/crwimage.cpp:663
-msgid "Header, offset"
-msgstr ""
-
-#: src/crwimage.cpp:680
-msgid "tag"
-msgstr ""
-
-#: src/crwimage.cpp:682
-msgid "dir"
-msgstr ""
-
-#: src/crwimage.cpp:684
-msgid "type"
-msgstr ""
-
-#: src/crwimage.cpp:685
-msgid "size"
-msgstr ""
-
-#: src/crwimage.cpp:686
-msgid "offset"
-msgstr ""
-
-#: src/exiv2.cpp:209
-msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
-msgstr ""
-
-#: src/exiv2.cpp:211
-msgid ""
-"This program is free software; you can redistribute it and/or\n"
-"modify it under the terms of the GNU General Public License\n"
-"as published by the Free Software Foundation; either version 2\n"
-"of the License, or (at your option) any later version.\n"
-msgstr ""
-
-#: src/exiv2.cpp:216
-msgid ""
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-msgstr ""
-
-#: src/exiv2.cpp:221
-msgid ""
-"You should have received a copy of the GNU General Public\n"
-"License along with this program; if not, write to the Free\n"
-"Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
-"Boston, MA 02110-1301 USA\n"
-msgstr ""
-
-#: src/exiv2.cpp:229
-msgid "Usage:"
-msgstr ""
-
-#: src/exiv2.cpp:230
-msgid ""
-"[ options ] [ action ] file ...\n"
-"\n"
-msgstr ""
-
-#: src/exiv2.cpp:231
-msgid "Manipulate the Exif metadata of images.\n"
-msgstr ""
-
-#: src/exiv2.cpp:237
-msgid ""
-"\n"
-"Actions:\n"
-msgstr ""
-
-#: src/exiv2.cpp:238
-msgid ""
-"  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
-"                requires at least one of the -a, -Y, -O or -D options.\n"
-msgstr ""
-
-#: src/exiv2.cpp:240
-msgid "  pr | print    Print image metadata.\n"
-msgstr ""
-
-#: src/exiv2.cpp:241
-msgid "  rm | delete   Delete image metadata from the files.\n"
-msgstr ""
-
-#: src/exiv2.cpp:242
-msgid ""
-"  in | insert   Insert metadata from corresponding *.exv files.\n"
-"                Use option -S to change the suffix of the input files.\n"
-msgstr ""
-
-#: src/exiv2.cpp:244
-msgid ""
-"  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
-msgstr ""
-
-#: src/exiv2.cpp:245
-msgid ""
-"  mv | rename   Rename files and/or set file timestamps according to the\n"
-"                Exif create timestamp. The filename format can be set with\n"
-"                -r format, timestamp options are controlled with -t and -T.\n"
-msgstr ""
-
-#: src/exiv2.cpp:248
-msgid ""
-"  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
-"                IPTC metadata of image files or set the JPEG comment.\n"
-"                Requires option -c, -m or -M.\n"
-msgstr ""
-
-#: src/exiv2.cpp:251
-msgid ""
-"  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
-"                Exif tag.\n"
-msgstr ""
-
-#: src/exiv2.cpp:253
-msgid ""
-"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
-"                character encoding can be specified with the -n option.\n"
-msgstr ""
-
-#: src/exiv2.cpp:255
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-
-#: src/exiv2.cpp:256
-msgid "   -h      Display this help and exit.\n"
-msgstr ""
-
-#: src/exiv2.cpp:257
-msgid "   -V      Show the program version and exit.\n"
-msgstr ""
-
-#: src/exiv2.cpp:258
-msgid "   -v      Be verbose during the program run.\n"
-msgstr ""
-
-#: src/exiv2.cpp:259
-msgid "   -b      Show large binary values.\n"
-msgstr ""
-
-#: src/exiv2.cpp:260
-msgid "   -u      Show unknown tags.\n"
-msgstr ""
-
-#: src/exiv2.cpp:261
-msgid "   -g key  Only output info for this key (grep).\n"
-msgstr ""
-
-#: src/exiv2.cpp:262
-msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
-msgstr ""
-
-#: src/exiv2.cpp:263
-msgid "   -k      Preserve file timestamps (keep).\n"
-msgstr ""
-
-#: src/exiv2.cpp:264
-msgid ""
-"   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
-msgstr ""
-
-#: src/exiv2.cpp:265
-msgid ""
-"   -T      Only set the file timestamp in 'rename' action, do not rename\n"
-"           the file (overrides -k).\n"
-msgstr ""
-
-#: src/exiv2.cpp:267
-msgid "   -f      Do not prompt before overwriting existing files (force).\n"
-msgstr ""
-
-#: src/exiv2.cpp:268
-msgid "   -F      Do not prompt before renaming files (Force).\n"
-msgstr ""
-
-#: src/exiv2.cpp:269
-msgid ""
-"   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
-"           is only used with the 'adjust' action.\n"
-msgstr ""
-
-#: src/exiv2.cpp:271
-msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
-msgstr ""
-
-#: src/exiv2.cpp:272
-msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
-msgstr ""
-
-#: src/exiv2.cpp:273
-msgid "   -D day  Day adjustment with the 'adjust' action.\n"
-msgstr ""
-
-#: src/exiv2.cpp:274
-msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
-msgstr ""
-
-#: src/exiv2.cpp:275
-msgid "             s : print a summary of the Exif metadata (the default)\n"
-msgstr ""
-
-#: src/exiv2.cpp:276
-msgid ""
-"             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
-msgstr ""
-
-#: src/exiv2.cpp:277
-msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
-msgstr ""
-
-#: src/exiv2.cpp:278
-msgid "             v : plain Exif data values (-PExgnycv)\n"
-msgstr ""
-
-#: src/exiv2.cpp:279
-msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
-msgstr ""
-
-#: src/exiv2.cpp:280
-msgid "             i : IPTC data values (-PIkyct)\n"
-msgstr ""
-
-#: src/exiv2.cpp:281
-msgid "             x : XMP properties (-PXkyct)\n"
-msgstr ""
-
-#: src/exiv2.cpp:282 src/exiv2.cpp:305
-msgid "             c : JPEG comment\n"
-msgstr ""
-
-#: src/exiv2.cpp:283
-msgid "             p : list available previews\n"
-msgstr ""
-
-#: src/exiv2.cpp:284
-msgid ""
-"   -P flgs Print flags for fine control of tag lists ('print' action):\n"
-msgstr ""
-
-#: src/exiv2.cpp:285
-msgid "             E : include Exif tags in the list\n"
-msgstr ""
-
-#: src/exiv2.cpp:286
-msgid "             I : IPTC datasets\n"
-msgstr ""
-
-#: src/exiv2.cpp:287
-msgid "             X : XMP properties\n"
-msgstr ""
-
-#: src/exiv2.cpp:288
-msgid "             x : print a column with the tag number\n"
-msgstr ""
-
-#: src/exiv2.cpp:289
-msgid "             g : group name\n"
-msgstr ""
-
-#: src/exiv2.cpp:290
-msgid "             k : key\n"
-msgstr ""
-
-#: src/exiv2.cpp:291
-msgid "             l : tag label\n"
-msgstr ""
-
-#: src/exiv2.cpp:292
-msgid "             n : tag name\n"
-msgstr ""
-
-#: src/exiv2.cpp:293
-msgid "             y : type\n"
-msgstr ""
-
-#: src/exiv2.cpp:294
-msgid "             c : number of components (count)\n"
-msgstr ""
-
-#: src/exiv2.cpp:295
-msgid "             s : size in bytes\n"
-msgstr ""
-
-#: src/exiv2.cpp:296
-msgid "             v : plain data value\n"
-msgstr ""
-
-#: src/exiv2.cpp:297
-msgid "             t : interpreted (translated) data\n"
-msgstr ""
-
-#: src/exiv2.cpp:298
-msgid "             h : hexdump of the data\n"
-msgstr ""
-
-#: src/exiv2.cpp:299
-msgid ""
-"   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
-msgstr ""
-
-#: src/exiv2.cpp:300
-msgid "             a : all supported metadata (the default)\n"
-msgstr ""
-
-#: src/exiv2.cpp:301
-msgid "             e : Exif section\n"
-msgstr ""
-
-#: src/exiv2.cpp:302
-msgid "             t : Exif thumbnail only\n"
-msgstr ""
-
-#: src/exiv2.cpp:303
-msgid "             i : IPTC data\n"
-msgstr ""
-
-#: src/exiv2.cpp:304
-msgid "             x : XMP packet\n"
-msgstr ""
-
-#: src/exiv2.cpp:306
-msgid ""
-"   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
-"           the same as those for the -d option, plus a modifier:\n"
-"             X : Insert metadata from an XMP sidecar file <file>.xmp\n"
-"           Only JPEG thumbnails can be inserted, they need to be named\n"
-"           <file>-thumb.jpg\n"
-msgstr ""
-
-#: src/exiv2.cpp:311
-msgid ""
-"   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
-"           are the same as those for the -d option, plus a target to "
-"extract\n"
-"           preview images and a modifier to generate an XMP sidecar file:\n"
-"             p[<n>[,<m> ...]] : Extract preview images.\n"
-"             X : Extract metadata to an XMP sidecar file <file>.xmp\n"
-msgstr ""
-
-#: src/exiv2.cpp:316
-msgid ""
-"   -r fmt  Filename format for the 'rename' action. The format string\n"
-"           follows strftime(3). The following keywords are supported:\n"
-msgstr ""
-
-#: src/exiv2.cpp:318
-msgid "             :basename:   - original filename without extension\n"
-msgstr ""
-
-#: src/exiv2.cpp:319
-msgid ""
-"             :dirname:    - name of the directory holding the original file\n"
-msgstr ""
-
-#: src/exiv2.cpp:320
-msgid "             :parentname: - name of parent directory\n"
-msgstr ""
-
-#: src/exiv2.cpp:321
-msgid "           Default filename format is "
-msgstr ""
-
-#: src/exiv2.cpp:323
-msgid "   -c txt  JPEG comment string to set in the image.\n"
-msgstr ""
-
-#: src/exiv2.cpp:324
-msgid ""
-"   -m file Command file for the modify action. The format for commands is\n"
-"           set|add|del <key> [[<type>] <value>].\n"
-msgstr ""
-
-#: src/exiv2.cpp:326
-msgid ""
-"   -M cmd  Command line for the modify action. The format for the\n"
-"           commands is the same as that of the lines of a command file.\n"
-msgstr ""
-
-#: src/exiv2.cpp:328
-msgid ""
-"   -l dir  Location (directory) for files to be inserted from or extracted "
-"to.\n"
-msgstr ""
-
-#: src/exiv2.cpp:329
-msgid ""
-"   -S .suf Use suffix .suf for source files for insert command.\n"
-"\n"
-msgstr ""
-
-#: src/exiv2.cpp:364 src/exiv2.cpp:410 src/exiv2.cpp:469 src/exiv2.cpp:656
-msgid "Option"
-msgstr ""
-
-#: src/exiv2.cpp:365
-msgid "requires an argument\n"
-msgstr ""
-
-#: src/exiv2.cpp:369
-msgid "Unrecognized option"
-msgstr ""
-
-#: src/exiv2.cpp:375
-msgid "getopt returned unexpected character code"
-msgstr ""
-
-#: src/exiv2.cpp:401 src/exiv2.cpp:454
-msgid "Ignoring surplus option"
-msgstr ""
-
-#: src/exiv2.cpp:411 src/exiv2.cpp:471 src/exiv2.cpp:657
-msgid "is not compatible with a previous option\n"
-msgstr ""
-
-#: src/exiv2.cpp:426
-msgid "Ignoring surplus option -a"
-msgstr ""
-
-#: src/exiv2.cpp:432
-msgid "Error parsing -a option argument"
-msgstr ""
-
-#: src/exiv2.cpp:439
-msgid "Option -a is not compatible with a previous option\n"
+#: src/actions.cpp:954
+msgid "Erasing thumbnail data"
 msgstr ""
 
 #: src/exiv2.cpp:461
 msgid "Error parsing"
 msgstr ""
 
-#: src/exiv2.cpp:463
-msgid "option argument"
+#: src/exiv2.cpp:806
+msgid "Error parsing -M option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:494
-msgid "Unrecognized print mode"
+#: src/exiv2.cpp:432
+msgid "Error parsing -a option argument"
 msgstr ""
 
-#: src/exiv2.cpp:502
-msgid "Ignoring surplus option -p"
+#: src/exiv2.cpp:799
+msgid "Error parsing -m option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:506
-msgid "Option -p is not compatible with a previous option\n"
+#: src/actions.cpp:378
+msgid "Exif Resolution"
 msgstr ""
 
-#: src/exiv2.cpp:537
-msgid "Unrecognized print item"
+#: src/actions.cpp:432
+msgid "Exif comment"
+msgstr ""
+
+#: src/actions.cpp:1077
+msgid "Exif data doesn't contain a thumbnail\n"
+msgstr ""
+
+#: src/actions.cpp:326
+msgid "Exposure bias"
+msgstr ""
+
+#: src/actions.cpp:366
+msgid "Exposure mode"
+msgstr ""
+
+#: src/actions.cpp:304
+msgid "Exposure time"
+msgstr ""
+
+#: src/exiv2.cpp:967
+msgid "Failed to open command file for reading\n"
+msgstr ""
+
+#: src/actions.cpp:254 src/actions.cpp:488 src/actions.cpp:750
+#: src/actions.cpp:767 src/actions.cpp:812 src/actions.cpp:902
+#: src/actions.cpp:1045 src/actions.cpp:1087 src/actions.cpp:1156
+#: src/actions.cpp:1198 src/actions.cpp:1203 src/actions.cpp:1223
+#: src/actions.cpp:1228 src/actions.cpp:1260 src/actions.cpp:1503
+#: src/actions.cpp:1639 src/actions.cpp:1704 src/actions.cpp:1876
+msgid "Failed to open the file\n"
+msgstr ""
+
+#: src/actions.cpp:848 src/actions.cpp:1605
+msgid "Failed to parse timestamp"
+msgstr ""
+
+#: src/actions.cpp:1357 src/actions.cpp:1431
+msgid "Failed to read"
+msgstr ""
+
+#: src/actions.cpp:2033
+msgid "Failed to rename"
+msgstr ""
+
+#: src/olympusmn.cpp:1067
+msgid "Fast"
+msgstr ""
+
+#: src/actions.cpp:1993 src/exiv2.cpp:168
+msgid "File"
+msgstr ""
+
+#: src/actions.cpp:264
+msgid "File name"
+msgstr ""
+
+#: src/actions.cpp:270
+msgid "File size"
+msgstr ""
+
+#: src/actions.cpp:1960
+msgid "Filename format yields empty filename for the file"
+msgstr ""
+
+#: src/actions.cpp:329
+msgid "Flash"
+msgstr ""
+
+#: src/actions.cpp:332
+msgid "Flash bias"
+msgstr ""
+
+#: src/actions.cpp:337
+msgid "Focal length"
+msgstr ""
+
+#: src/actions.cpp:1731
+msgid "Found Exif user comment with unexpected value type"
+msgstr ""
+
+#: src/nikonmn.cpp:1300
+msgid "Group dynamic-AF"
+msgstr ""
+
+#: src/crwimage.cpp:663
+msgid "Header, offset"
+msgstr ""
+
+#: src/olympusmn.cpp:1052
+msgid "High"
+msgstr ""
+
+#: src/olympusmn.cpp:1025
+msgid "High Key"
+msgstr ""
+
+#: src/actions.cpp:363
+msgid "ISO speed"
+msgstr ""
+
+#: src/exiv2.cpp:401 src/exiv2.cpp:454
+msgid "Ignoring surplus option"
 msgstr ""
 
 #: src/exiv2.cpp:546
 msgid "Ignoring surplus option -P"
 msgstr ""
 
+#: src/exiv2.cpp:426
+msgid "Ignoring surplus option -a"
+msgstr ""
+
+#: src/exiv2.cpp:502
+msgid "Ignoring surplus option -p"
+msgstr ""
+
+#: src/actions.cpp:1061
+msgid "Image does not contain an Exif thumbnail\n"
+msgstr ""
+
+#: src/actions.cpp:1107 src/actions.cpp:1133
+msgid "Image does not have preview"
+msgstr ""
+
+#: src/actions.cpp:842
+msgid "Image file creation timestamp not set in the file"
+msgstr ""
+
+#: src/actions.cpp:299
+msgid "Image number"
+msgstr ""
+
+#: src/actions.cpp:375
+msgid "Image quality"
+msgstr ""
+
+#: src/actions.cpp:279
+msgid "Image size"
+msgstr ""
+
+#: src/actions.cpp:295
+msgid "Image timestamp"
+msgstr ""
+
+#: src/tags.cpp:2658
+msgid "Infinity"
+msgstr ""
+
+#: src/exiv2.cpp:1031
+msgid "Invalid command"
+msgstr ""
+
+#: src/exiv2.cpp:1024 src/exiv2.cpp:1083 src/exiv2.cpp:1093
+msgid "Invalid command line"
+msgstr ""
+
+#: src/actions.cpp:561 src/exiv2.cpp:1064
+msgid "Invalid key"
+msgstr ""
+
+#: src/exiv2.cpp:935
+msgid "Invalid preview number"
+msgstr ""
+
+#: src/actions.cpp:757
+msgid "JPEG comment"
+msgstr ""
+
+#: src/olympusmn.cpp:1080
+msgid "Left to right"
+msgstr ""
+
+#: src/olympusmn.cpp:1050
+msgid "Low"
+msgstr ""
+
+#: src/olympusmn.cpp:1023
+msgid "Low Key"
+msgstr ""
+
+#: src/actions.cpp:275
+msgid "MIME type"
+msgstr ""
+
+#: src/actions.cpp:372
+msgid "Macro mode"
+msgstr ""
+
+#: src/exiv2.cpp:231
+msgid "Manipulate the Exif metadata of images.\n"
+msgstr ""
+
+#: src/sigmamn.cpp:154
+msgid "Manual"
+msgstr ""
+
+#: src/actions.cpp:369
+msgid "Metering mode"
+msgstr ""
+
+#: src/exiv2.cpp:789
+msgid "Modify action requires at least one -c, -m or -M option\n"
+msgstr ""
+
+#: src/actions.cpp:835
+msgid "Neither tag"
+msgstr ""
+
+#: src/actions.cpp:1738
+msgid "No Exif UNICODE user comment found"
+msgstr ""
+
+#: src/actions.cpp:284 src/actions.cpp:526 src/actions.cpp:577
+#: src/actions.cpp:825 src/actions.cpp:1054 src/actions.cpp:1516
+#: src/actions.cpp:1652 src/actions.cpp:1717
+msgid "No Exif data found in the file\n"
+msgstr ""
+
+#: src/actions.cpp:1723
+msgid "No Exif user comment found"
+msgstr ""
+
+#: src/actions.cpp:540 src/actions.cpp:590
+msgid "No IPTC data found in the file\n"
+msgstr ""
+
+#: src/actions.cpp:554 src/actions.cpp:603
+msgid "No XMP data found in the file\n"
+msgstr ""
+
+#: src/pentaxmn.cpp:752
+msgid "No extended bracketing"
+msgstr ""
+
+#: src/actions.cpp:414 src/actions.cpp:419 src/olympusmn.cpp:1097
+msgid "None"
+msgstr ""
+
+#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066
+msgid "Normal"
+msgstr ""
+
+#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
+msgid "Not used"
+msgstr ""
+
+#: src/olympusmn.cpp:1049
+msgid "Off"
+msgstr ""
+
+#: src/olympusmn.cpp:1136
+msgid "One-touch"
+msgstr ""
+
+#: src/exiv2.cpp:364 src/exiv2.cpp:410 src/exiv2.cpp:469 src/exiv2.cpp:656
+msgid "Option"
+msgstr ""
+
 #: src/exiv2.cpp:550
 msgid "Option -P is not compatible with a previous option\n"
 msgstr ""
 
+#: src/exiv2.cpp:439
+msgid "Option -a is not compatible with a previous option\n"
+msgstr ""
+
 #: src/exiv2.cpp:577
 msgid "Option -d is not compatible with a previous option\n"
 msgstr ""
@@ -883,321 +900,181 @@ msgstr ""
 msgid "Option -i is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:674
-msgid "Action adjust is not compatible with the given options\n"
+#: src/exiv2.cpp:506
+msgid "Option -p is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:683
-msgid "Action print is not compatible with the given options\n"
-msgstr ""
-
-#: src/exiv2.cpp:692
-msgid "Action delete is not compatible with the given options\n"
-msgstr ""
-
-#: src/exiv2.cpp:703
-msgid "Action extract is not compatible with the given options\n"
-msgstr ""
-
-#: src/exiv2.cpp:714
-msgid "Action insert is not compatible with the given options\n"
-msgstr ""
-
-#: src/exiv2.cpp:723
-msgid "Action rename is not compatible with the given options\n"
-msgstr ""
-
-#: src/exiv2.cpp:732
-msgid "Action modify is not compatible with the given options\n"
-msgstr ""
-
-#: src/exiv2.cpp:741
-msgid "Action fixiso is not compatible with the given options\n"
-msgstr ""
-
-#: src/exiv2.cpp:750
-msgid "Action fixcom is not compatible with the given options\n"
-msgstr ""
-
-#: src/exiv2.cpp:774
-msgid "An action must be specified\n"
-msgstr ""
-
-#: src/exiv2.cpp:783
-msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
-msgstr ""
-
-#: src/exiv2.cpp:789
-msgid "Modify action requires at least one -c, -m or -M option\n"
-msgstr ""
-
-#: src/exiv2.cpp:793
-msgid "At least one file is required\n"
-msgstr ""
-
-#: src/exiv2.cpp:799
-msgid "Error parsing -m option arguments\n"
-msgstr ""
-
-#: src/exiv2.cpp:806
-msgid "Error parsing -M option arguments\n"
-msgstr ""
-
-#: src/exiv2.cpp:813
-msgid "-l option can only be used with extract or insert actions\n"
-msgstr ""
-
-#: src/exiv2.cpp:818
-msgid "-S option can only be used with insert action\n"
-msgstr ""
-
-#: src/exiv2.cpp:823
-msgid "-t option can only be used with rename action\n"
-msgstr ""
-
-#: src/exiv2.cpp:828
-msgid "-T option can only be used with rename action\n"
-msgstr ""
-
-#: src/exiv2.cpp:908
-msgid "Unrecognized "
-msgstr ""
-
-#: src/exiv2.cpp:909
-msgid "target"
-msgstr ""
-
-#: src/exiv2.cpp:935
-msgid "Invalid preview number"
-msgstr ""
-
-#: src/exiv2.cpp:967
-msgid "Failed to open command file for reading\n"
-msgstr ""
-
-#: src/exiv2.cpp:980
-msgid "line"
-msgstr ""
-
-#: src/exiv2.cpp:1003
-msgid "-M option"
-msgstr ""
-
-#: src/exiv2.cpp:1024 src/exiv2.cpp:1083 src/exiv2.cpp:1093
-msgid "Invalid command line"
-msgstr ""
-
-#: src/exiv2.cpp:1031
-msgid "Invalid command"
-msgstr ""
-
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
-msgid "Continuous autofocus"
-msgstr ""
-
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
-msgid "Single autofocus"
-msgstr ""
-
-#: src/nikonmn.cpp:291 src/nikonmn.cpp:1232 src/nikonmn.cpp:2111
-#: src/tags.cpp:2653 src/tags.cpp:2766
-msgid "Unknown"
-msgstr ""
-
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
-msgid "Not used"
-msgstr ""
-
-#: src/nikonmn.cpp:353
-msgid "guess"
-msgstr ""
-
-#: src/nikonmn.cpp:1297
-msgid "Single area"
-msgstr ""
-
-#: src/nikonmn.cpp:1298
-msgid "Dynamic area"
-msgstr ""
-
-#: src/nikonmn.cpp:1299
-msgid "Closest subject"
-msgstr ""
-
-#: src/nikonmn.cpp:1300
-msgid "Group dynamic-AF"
-msgstr ""
-
-#: src/nikonmn.cpp:1301
-msgid "Single area (wide)"
-msgstr ""
-
-#: src/nikonmn.cpp:1302
-msgid "Dynamic area (wide)"
-msgstr ""
-
-#: src/nikonmn.cpp:1323
-msgid "none"
-msgstr ""
-
-#: src/nikonmn.cpp:1333
-msgid "used"
-msgstr ""
-
-#: src/nikonmn.cpp:1359
-msgid "All 11 Points"
-msgstr ""
-
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375
-msgid "Single-frame"
-msgstr ""
-
-#: src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr ""
-
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066
-msgid "Normal"
-msgstr ""
-
-#: src/olympusmn.cpp:1025
-msgid "High Key"
-msgstr ""
-
-#: src/olympusmn.cpp:1030
-msgid "User-Selected"
-msgstr ""
-
-#: src/olympusmn.cpp:1031
-msgid "Auto-Override"
-msgstr ""
-
-#: src/olympusmn.cpp:1049
-msgid "Off"
-msgstr ""
-
-#: src/olympusmn.cpp:1050
-msgid "Low"
-msgstr ""
-
-#: src/olympusmn.cpp:1051
-msgid "Standard"
-msgstr ""
-
-#: src/olympusmn.cpp:1052
-msgid "High"
-msgstr ""
-
-#: src/olympusmn.cpp:1067
-msgid "Fast"
+#: src/actions.cpp:2055
+msgid "Overwrite"
 msgstr ""
 
 #: src/olympusmn.cpp:1068
 msgid "Panorama"
 msgstr ""
 
-#: src/olympusmn.cpp:1074
-msgid "Sequence number"
+#: src/actions.cpp:782
+msgid "Preview"
 msgstr ""
 
-#: src/olympusmn.cpp:1080
-msgid "Left to right"
+#: src/sigmamn.cpp:151
+msgid "Program"
+msgstr ""
+
+#: src/actions.cpp:1474
+msgid "Reg "
+msgstr ""
+
+#: src/actions.cpp:2022
+msgid "Renaming file to"
 msgstr ""
 
 #: src/olympusmn.cpp:1081
 msgid "Right to left"
 msgstr ""
 
-#: src/olympusmn.cpp:1082
-msgid "Bottom to top"
+#: src/pentaxmn.cpp:764
+msgid "Saturation"
 msgstr ""
 
-#: src/olympusmn.cpp:1083
-msgid "Top to bottom"
+#: src/olympusmn.cpp:1074
+msgid "Sequence number"
 msgstr ""
 
-#: src/olympusmn.cpp:1112 src/olympusmn.cpp:1118 src/olympusmn.cpp:1119
-msgid "Auto"
+#: src/actions.cpp:1370
+msgid "Set"
 msgstr ""
 
-#: src/olympusmn.cpp:1124
-msgid "3000 Kelvin"
+#: src/actions.cpp:1667
+msgid "Setting Exif ISO value to"
 msgstr ""
 
-#: src/olympusmn.cpp:1125
-msgid "3700 Kelvin"
+#: src/actions.cpp:1744
+msgid "Setting Exif UNICODE user comment to"
 msgstr ""
 
-#: src/olympusmn.cpp:1126
-msgid "4000 Kelvin"
+#: src/actions.cpp:1293
+msgid "Setting JPEG comment"
 msgstr ""
 
-#: src/olympusmn.cpp:1127
-msgid "4500 Kelvin"
+#: src/pentaxmn.cpp:767
+msgid "Sharpness"
 msgstr ""
 
-#: src/olympusmn.cpp:1128
-msgid "5500 Kelvin"
+#: src/sigmamn.cpp:153
+msgid "Shutter priority"
 msgstr ""
 
-#: src/olympusmn.cpp:1129
-msgid "6500 Kelvin"
+#: src/nikonmn.cpp:1297
+msgid "Single area"
 msgstr ""
 
-#: src/olympusmn.cpp:1130
-msgid "7500 Kelvin"
+#: src/nikonmn.cpp:1301
+msgid "Single area (wide)"
 msgstr ""
 
-#: src/olympusmn.cpp:1136
-msgid "One-touch"
+#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
+msgid "Single autofocus"
 msgstr ""
 
-#: src/panasonicmn.cpp:299
-msgid "Spot mode on"
-msgstr ""
-
-#: src/panasonicmn.cpp:300
-msgid "Spot mode off or 3-area (high speed)"
+#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375
+msgid "Single-frame"
 msgstr ""
 
 #: src/panasonicmn.cpp:301
 msgid "Spot focussing"
 msgstr ""
 
-#: src/panasonicmn.cpp:302
-msgid "5-area"
+#: src/panasonicmn.cpp:300
+msgid "Spot mode off or 3-area (high speed)"
 msgstr ""
 
-#: src/panasonicmn.cpp:303
-msgid "1-area"
+#: src/panasonicmn.cpp:299
+msgid "Spot mode on"
 msgstr ""
 
-#: src/panasonicmn.cpp:304
-msgid "1-area (high speed)"
+#: src/olympusmn.cpp:1051
+msgid "Standard"
 msgstr ""
 
-#: src/panasonicmn.cpp:305
-msgid "3-area (auto)"
+#: src/actions.cpp:1659
+msgid "Standard Exif ISO tag exists; not modified\n"
 msgstr ""
 
-#: src/panasonicmn.cpp:306
-msgid "3-area (left)"
+#: src/actions.cpp:352
+msgid "Subject distance"
 msgstr ""
 
-#: src/panasonicmn.cpp:307
-msgid "3-area (center)"
+#: src/tiffimage.cpp:1618
+msgid "TIFF header, offset"
 msgstr ""
 
-#: src/panasonicmn.cpp:308
-msgid "3-area (right)"
+#: src/actions.cpp:1969
+msgid "This file already has the correct name"
 msgstr ""
 
-#: src/panasonicmn.cpp:320
-msgid " EV"
+#: src/exiv2.cpp:216
+msgid ""
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
 msgstr ""
 
-#: src/pentaxmn.cpp:752
-msgid "No extended bracketing"
+#: src/exiv2.cpp:211
+msgid ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License\n"
+"as published by the Free Software Foundation; either version 2\n"
+"of the License, or (at your option) any later version.\n"
+msgstr ""
+
+#: src/actions.cpp:410
+msgid "Thumbnail"
+msgstr ""
+
+#: src/actions.cpp:1558
+msgid "Timestamp of metadatum with key"
+msgstr ""
+
+#: src/olympusmn.cpp:1083
+msgid "Top to bottom"
+msgstr ""
+
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1232 src/nikonmn.cpp:2111
+#: src/tags.cpp:2655 src/tags.cpp:2768
+msgid "Unknown"
+msgstr ""
+
+#: src/pentaxmn.cpp:773
+msgid "Unknown "
+msgstr ""
+
+#: src/exiv2.cpp:908
+msgid "Unrecognized "
+msgstr ""
+
+#: src/exiv2.cpp:369
+msgid "Unrecognized option"
+msgstr ""
+
+#: src/exiv2.cpp:537
+msgid "Unrecognized print item"
+msgstr ""
+
+#: src/exiv2.cpp:494
+msgid "Unrecognized print mode"
+msgstr ""
+
+#: src/actions.cpp:860
+msgid "Updating timestamp to"
+msgstr ""
+
+#: src/exiv2.cpp:229
+msgid "Usage:"
+msgstr ""
+
+#: src/olympusmn.cpp:1030
+msgid "User-Selected"
 msgstr ""
 
 #: src/pentaxmn.cpp:758
@@ -1208,66 +1085,189 @@ msgstr ""
 msgid "WB-GM"
 msgstr ""
 
-#: src/pentaxmn.cpp:764
-msgid "Saturation"
+#: src/actions.cpp:1356 src/actions.cpp:1430
+msgid "Warning"
 msgstr ""
 
-#: src/pentaxmn.cpp:767
-msgid "Sharpness"
+#: src/actions.cpp:407
+msgid "White balance"
 msgstr ""
 
-#: src/pentaxmn.cpp:770
-msgid "Contrast"
+#: src/actions.cpp:1899
+msgid "Writing Exif data from"
 msgstr ""
 
-#: src/pentaxmn.cpp:773
-msgid "Unknown "
+#: src/actions.cpp:1907
+msgid "Writing IPTC data from"
 msgstr ""
 
-#: src/sigmamn.cpp:151
-msgid "Program"
+#: src/actions.cpp:1924
+msgid "Writing JPEG comment from"
 msgstr ""
 
-#: src/sigmamn.cpp:152
-msgid "Aperture priority"
+#: src/actions.cpp:1915
+msgid "Writing XMP data from"
 msgstr ""
 
-#: src/sigmamn.cpp:153
-msgid "Shutter priority"
+#: src/actions.cpp:1122
+msgid "Writing preview"
 msgstr ""
 
-#: src/sigmamn.cpp:154
-msgid "Manual"
+#: src/actions.cpp:1070
+msgid "Writing thumbnail"
 msgstr ""
 
-#: src/sigmamn.cpp:165
-msgid "Average"
+#: src/exiv2.cpp:221
+msgid ""
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free\n"
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
+"Boston, MA 02110-1301 USA\n"
 msgstr ""
 
-#: src/sigmamn.cpp:166
-msgid "Center"
+#: src/exiv2.cpp:230
+msgid ""
+"[ options ] [ action ] file ...\n"
+"\n"
 msgstr ""
 
-#: src/sigmamn.cpp:167
-msgid "8-Segment"
+#: src/tiffimage.cpp:1624
+msgid "big endian encoded"
 msgstr ""
 
-#: src/tags.cpp:2656
-msgid "Infinity"
+#: src/actions.cpp:1564
+msgid "by"
 msgstr ""
 
-#: src/tags.cpp:2750
-msgid "Digital zoom not used"
+#: src/actions.cpp:788 src/actions.cpp:1128
+msgid "bytes"
 msgstr ""
 
-#: src/tiffimage.cpp:1590
-msgid "TIFF header, offset"
+#: src/actions.cpp:1593
+msgid "day"
 msgstr ""
 
-#: src/tiffimage.cpp:1595
+#: src/actions.cpp:1590
+msgid "days"
+msgstr ""
+
+#: src/crwimage.cpp:682
+msgid "dir"
+msgstr ""
+
+#: src/actions.cpp:1994
+msgid "exists. [O]verwrite, [r]ename or [s]kip?"
+msgstr ""
+
+#: src/actions.cpp:837
+msgid "found in the file"
+msgstr ""
+
+#: src/exiv2.cpp:375
+msgid "getopt returned unexpected character code"
+msgstr ""
+
+#: src/nikonmn.cpp:353
+msgid "guess"
+msgstr ""
+
+#: src/actions.cpp:849
+msgid "in the file"
+msgstr ""
+
+#: src/exiv2.cpp:411 src/exiv2.cpp:471 src/exiv2.cpp:657
+msgid "is not compatible with a previous option\n"
+msgstr ""
+
+#: src/exiv2.cpp:980
+msgid "line"
+msgstr ""
+
+#: src/tiffimage.cpp:1623
 msgid "little endian encoded"
 msgstr ""
 
-#: src/tiffimage.cpp:1596
-msgid "big endian encoded"
+#: src/actions.cpp:1582
+msgid "month"
+msgstr ""
+
+#: src/actions.cpp:1579
+msgid "months"
+msgstr ""
+
+#: src/nikonmn.cpp:1323
+msgid "none"
+msgstr ""
+
+#: src/actions.cpp:836
+msgid "nor"
+msgstr ""
+
+#: src/actions.cpp:1559
+msgid "not set\n"
+msgstr ""
+
+#: src/crwimage.cpp:686
+msgid "offset"
+msgstr ""
+
+#: src/exiv2.cpp:463
+msgid "option argument"
+msgstr ""
+
+#: src/actions.cpp:786 src/actions.cpp:1126
+msgid "pixels"
+msgstr ""
+
+#: src/exiv2.cpp:365
+msgid "requires an argument\n"
+msgstr ""
+
+#: src/actions.cpp:1599
+msgid "s"
+msgstr ""
+
+#: src/crwimage.cpp:685
+msgid "size"
+msgstr ""
+
+#: src/crwimage.cpp:680
+msgid "tag"
+msgstr ""
+
+#: src/exiv2.cpp:909
+msgid "target"
+msgstr ""
+
+#: src/actions.cpp:1624 src/actions.cpp:1900 src/actions.cpp:1908
+#: src/actions.cpp:1916 src/actions.cpp:1925 src/actions.cpp:2034
+msgid "to"
+msgstr ""
+
+#: src/actions.cpp:1071 src/actions.cpp:1129
+msgid "to file"
+msgstr ""
+
+#: src/crwimage.cpp:684
+msgid "type"
+msgstr ""
+
+#: src/actions.cpp:2024
+msgid "updating timestamp"
+msgstr ""
+
+#: src/nikonmn.cpp:1333
+msgid "used"
+msgstr ""
+
+#: src/actions.cpp:1359 src/actions.cpp:1433
+msgid "value"
+msgstr ""
+
+#: src/actions.cpp:1571
+msgid "year"
+msgstr ""
+
+#: src/actions.cpp:1568 src/actions.cpp:1617
+msgid "years"
 msgstr ""