[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=2abe3dc

The following commit has been merged in the master branch:
commit 2abe3dc8242d899c82ab042492a138a07d339d22
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Nov 19 05:06:54 2011 +0000

    #794: Made flash mode descriptions more consistent.
---
 src/tags.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index b5df667..af3bf9d 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -362,14 +362,14 @@ namespace Exiv2 {
     extern const TagDetails exifFlash[] = {
         { 0x00, N_("No flash")                                                      },
         { 0x01, N_("Fired")                                                         },
-        { 0x05, N_("Fired, strobe return light not detected")                       },
-        { 0x07, N_("Fired, strobe return light detected")                           },
+        { 0x05, N_("Fired, return light not detected")                              },
+        { 0x07, N_("Fired, return light detected")                                  },
         { 0x08, N_("Yes, did not fire")                                             },
         { 0x09, N_("Yes, compulsory")                                               },
         { 0x0d, N_("Yes, compulsory, return light not detected")                    },
         { 0x0f, N_("Yes, compulsory, return light detected")                        },
         { 0x10, N_("No, compulsory")                                                },
-        { 0x14, N_("No, did not fire, return not detected")                         },
+        { 0x14, N_("No, did not fire, return light not detected")                   },
         { 0x18, N_("No, auto")                                                      },
         { 0x19, N_("Yes, auto")                                                     },
         { 0x1d, N_("Yes, auto, return light not detected")                          },

-- 
exiv2 packaging