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

The following commit has been merged in the master branch:
commit dd282835f31218e53b9028b5bb1a0d073169f309
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Sep 20 04:53:55 2015 +0000

    Fix typo in Sony makernotes.
---
 src/sonymn.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 9436db2..f8a0e75 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -211,9 +211,9 @@ namespace Exiv2 {
         { 4,  N_("Manual")                     },
         { 5,  N_("Daylight")                   },
         { 6,  N_("Cloudy")                     },
-        { 7,  N_("White Flourescent")          },
-        { 8,  N_("Cool White Flourescent")     },
-        { 9,  N_("Day White Flourescent")      },
+        { 7,  N_("White Fluorescent")          },
+        { 8,  N_("Cool White Fluorescent")     },
+        { 9,  N_("Day White Fluorescent")      },
         { 10, N_("Incandescent2")              },
         { 11, N_("Warm White Fluorescent")     }, 
         { 14, N_("Incandescent")               },

-- 
exiv2 packaging