[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=bde4fa8

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

    Update Canon CS Easy mode to match ExifTool
---
 src/canonmn.cpp | 100 ++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 29 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 4ebe05e..bb08bbb 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -528,35 +528,77 @@ namespace Exiv2 {
 
     //! EasyMode, tag 0x000b
     extern const TagDetails canonCsEasyMode[] = {
-        {  0, N_("Full auto")        },
-        {  1, N_("Manual")           },
-        {  2, N_("Landscape")        },
-        {  3, N_("Fast shutter")     },
-        {  4, N_("Slow shutter")     },
-        {  5, N_("Night Scene")      },
-        {  6, N_("Gray scale")       },
-        {  7, N_("Sepia")            },
-        {  8, N_("Portrait")         },
-        {  9, N_("Sports")           },
-        { 10, N_("Macro / close-up") },
-        { 11, N_("Black & white")    },
-        { 12, N_("Pan focus")        },
-        { 13, N_("Vivid")            },
-        { 14, N_("Neutral")          },
-        { 15, N_("Flash off")        },
-        { 16, N_("Long shutter")     },
-        { 17, N_("Super macro")      },
-        { 18, N_("Foliage")          },
-        { 19, N_("Indoor")           },
-        { 20, N_("Fireworks")        },
-        { 21, N_("Beach")            },
-        { 22, N_("Underwater")       },
-        { 23, N_("Snow")             },
-        { 24, N_("Kids & pets")      },
-        { 25, N_("Night SnapShot")   },
-        { 26, N_("Digital macro")    },
-        { 27, N_("My Colors")        },
-        { 28, N_("Still image")      }
+        {   0, N_("Full auto")              },
+        {   1, N_("Manual")                 },
+        {   2, N_("Landscape")              },
+        {   3, N_("Fast shutter")           },
+        {   4, N_("Slow shutter")           },
+        {   5, N_("Night")                  },
+        {   6, N_("Gray Scale")             },
+        {   7, N_("Sepia")                  },
+        {   8, N_("Portrait")               },
+        {   9, N_("Sports")                 },
+        {  10, N_("Macro")                  },
+        {  11, N_("Black & White")          },
+        {  12, N_("Pan focus")              },
+        {  13, N_("Vivid")                  },
+        {  14, N_("Neutral")                },
+        {  15, N_("Flash Off")              },
+        {  16, N_("Long Shutter")           },
+        {  17, N_("Super Macro")            },
+        {  18, N_("Foliage")                },
+        {  19, N_("Indoor")                 },
+        {  20, N_("Fireworks")              },
+        {  21, N_("Beach")                  },
+        {  22, N_("Underwater")             },
+        {  23, N_("Snow")                   },
+        {  24, N_("Kids & Pets")            },
+        {  25, N_("Night Snapshot")         },
+        {  26, N_("Digital Macro")          },
+        {  27, N_("My Colors")              },
+        {  28, N_("Movie Snap")             },
+        {  29, N_("Super Macro 2")          },
+        {  30, N_("Color Accent")           },
+        {  31, N_("Color Swap")             },
+        {  32, N_("Aquarium")               },
+        {  33, N_("ISO 3200")               },
+        {  34, N_("ISO 6400")               },
+        {  35, N_("Creative Light Effect")  },
+        {  36, N_("Easy")                   },
+        {  37, N_("Quick Shot")             },
+        {  38, N_("Creative Auto")          },
+        {  39, N_("Zoom Blur")              },
+        {  40, N_("Low Light")              },
+        {  41, N_("Nostalgic")              },
+        {  42, N_("Super Vivid")            },
+        {  43, N_("Poster Effect")          },
+        {  44, N_("Face Self-timer")        },
+        {  45, N_("Smile")                  },
+        {  46, N_("Wink Self-timer")        },
+        {  47, N_("Fisheye Effect")         },
+        {  48, N_("Miniature Effect")       },
+        {  49, N_("High-speed Burst")       },
+        {  50, N_("Best Image Selection")   },
+        {  51, N_("High Dynamic Range")     },
+        {  52, N_("Handheld Night Scene")   },
+        {  53, N_("Movie Digest")           },
+        {  54, N_("Live View Control")      },
+        {  55, N_("Discreet")               },
+        {  56, N_("Blur Reduction")         },
+        {  57, N_("Monochrome")             },
+        {  58, N_("Toy Camera Effect")      },
+        {  59, N_("Scene Intelligent Auto") },
+        {  60, N_("High-speed Burst HQ")    },
+        {  61, N_("Smooth Skin")            },
+        {  62, N_("Soft Focus")             },
+        { 257, N_("Spotlight")              },
+        { 258, N_("Night 2")                },
+        { 259, N_("Night+")                 },
+        { 260, N_("Super Night")            },
+        { 261, N_("Sunset")                 },
+        { 263, N_("Night Scene")            },
+        { 264, N_("Surface")                },
+        { 265, N_("Low Light 2")            }
     };
 
     //! DigitalZoom, tag 0x000c

-- 
exiv2 packaging