[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=cbe1eaf

The following commit has been merged in the master branch:
commit cbe1eafd2816935447ef2e1f28496bad3c338075
Author: tbeu <mail at tbeu.de>
Date:   Tue Aug 16 20:09:28 2016 +0000

    Update Canon CS Drive mode to match ExifTool
---
 src/canonmn.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index a8da8f3..bc1cdb9 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -478,12 +478,15 @@ namespace Exiv2 {
 
     //! DriveMode, tag 0x0005
     extern const TagDetails canonCsDriveMode[] = {
-        { 0, N_("Single / timer")             },
-        { 1, N_("Continuous")                 },
-        { 2, N_("Movie")                      },
-        { 3, N_("Continuous, speed priority") },
-        { 4, N_("Continuous, low")            },
-        { 5, N_("Continuous, high")           }
+        {  0, N_("Single / timer")             },
+        {  1, N_("Continuous")                 },
+        {  2, N_("Movie")                      },
+        {  3, N_("Continuous, speed priority") },
+        {  4, N_("Continuous, low")            },
+        {  5, N_("Continuous, high")           },
+        {  6, N_("Silent Single")              },
+        {  9, N_("Single, Silent")             },
+        { 10, N_("Continuous, Silent")         }
     };
 
     //! FocusMode, tag 0x0007

-- 
exiv2 packaging