[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:27 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6996716
The following commit has been merged in the master branch:
commit 699671605b7ff4788118d1cfae02dfd819578b55
Author: asp <alan.pater at gmail.com>
Date: Wed May 20 01:27:32 2015 +0000
#1085 typos. Thanks Anders Jonsson!
---
src/fujimn.cpp | 8 ++++----
src/olympusmn.cpp | 2 +-
src/panasonicmn.cpp | 2 +-
src/pentaxmn.cpp | 22 +++++++++++-----------
src/properties.cpp | 6 +++---
src/tags.cpp | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 52d5861..f339c27 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -261,11 +261,11 @@ namespace Exiv2 {
TagInfo(0x1405, "MaxFocalLength", N_("Maximum Focal Length"),
N_("Maximum focal length"),
fujiId, makerTags, unsignedRational, -1, printValue),
- TagInfo(0x1406, "MaxApertureAtMinFocal", N_("Maximum Aperture at Mininimum Focal"),
- N_("Maximum aperture at mininimum focal"),
+ TagInfo(0x1406, "MaxApertureAtMinFocal", N_("Maximum Aperture at Minimum Focal"),
+ N_("Maximum aperture at minimum focal"),
fujiId, makerTags, unsignedRational, -1, printValue),
- TagInfo(0x1407, "MaxApertureAtMaxFocal", N_("Maximum Aperture at Maxinimum Focal"),
- N_("Maximum aperture at maxinimum focal"),
+ TagInfo(0x1407, "MaxApertureAtMaxFocal", N_("Maximum Aperture at Maximum Focal"),
+ N_("Maximum aperture at maximum focal"),
fujiId, makerTags, unsignedRational, -1, printValue),
TagInfo(0x8000, "FileSource", N_("File Source"),
N_("File source"),
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index bf1bfb6..ff07ccb 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -340,7 +340,7 @@ namespace Exiv2 {
N_("Blue balance"),
olympusId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x1019, "ColorMatrixNumber", N_("Color Matrix Number"),
- N_("Color matrix mumber"),
+ N_("Color matrix number"),
olympusId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x101a, "SerialNumber2", N_("Serial Number 2"),
N_("Serial number 2"),
diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp
index 38b2140..29b97f2 100644
--- a/src/panasonicmn.cpp
+++ b/src/panasonicmn.cpp
@@ -497,7 +497,7 @@ namespace Exiv2 {
TagInfo(0x0059, "Transform1", N_("Transform 1"), N_("Transform 1"), panasonicId, makerTags, undefined, -1, printValue),
TagInfo(0x005d, "IntelligentExposure", N_("Intelligent Exposure"), N_("Intelligent Exposure"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicIntelligentExposure)),
TagInfo(0x0060, "LensFirmwareVersion", N_("Firmware Version of the Lens"), N_("Firmware Version of the Lens"), panasonicId, makerTags, undefined, -1, printValue),
- TagInfo(0x0061, "FaceRecInfo", N_("Face recognation info"), N_("Face recognation info"), panasonicId, makerTags, undefined, -1, printValue),
+ TagInfo(0x0061, "FaceRecInfo", N_("Face recognition info"), N_("Face recognition info"), panasonicId, makerTags, undefined, -1, printValue),
TagInfo(0x0062, "FlashWarning", N_("Flash Warning"), N_("Flash warning"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFlashWarning)),
TagInfo(0x0065, "Title", N_("Title"), N_("Title"), panasonicId, makerTags, undefined, -1, printPanasonicText),
TagInfo(0x0066, "BabyName", N_("Baby Name"), N_("Baby name (or pet name)"), panasonicId, makerTags, undefined, -1, printPanasonicText),
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 03d3798..3ddb2b0 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -403,8 +403,8 @@ namespace Exiv2 {
{ 2, N_("Spot") },
};
- //! WhiteBallance, tag 0x0019
- extern const TagDetails pentaxWhiteBallance[] = {
+ //! WhiteBalance, tag 0x0019
+ extern const TagDetails pentaxWhiteBalance[] = {
{ 0, N_("Auto") },
{ 1, N_("Daylight") },
{ 2, N_("Shade") },
@@ -422,8 +422,8 @@ namespace Exiv2 {
{ 65535, N_("User Selected") },
};
- //! WhiteBallance, tag 0x001a
- extern const TagDetails pentaxWhiteBallanceMode[] = {
+ //! WhiteBalance, tag 0x001a
+ extern const TagDetails pentaxWhiteBalanceMode[] = {
{ 1, N_("Auto (Daylight)") },
{ 2, N_("Auto (Shade)") },
{ 3, N_("Auto (Flash)") },
@@ -1157,7 +1157,7 @@ namespace Exiv2 {
N_("Offset to an IFD containing a preview image"),
pentaxId, makerTags, undefined, -1, printValue),
TagInfo(0x0005, "ModelID", N_("Model identification"),
- N_("Pentax model idenfication"),
+ N_("Pentax model identification"),
pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxModel)),
TagInfo(0x0006, "Date", N_("Date"),
N_("Date"),
@@ -1205,12 +1205,12 @@ namespace Exiv2 {
TagInfo(0x0018, "AutoBracketing", N_("AutoBracketing"),
N_("AutoBracketing"),
pentaxId, makerTags, undefined, -1, printPentaxBracketing),
- TagInfo(0x0019, "WhiteBallance", N_("White ballance"),
- N_("White ballance"),
- pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxWhiteBallance)),
- TagInfo(0x001a, "WhiteBallanceMode", N_("White ballance mode"),
- N_("White ballance mode"),
- pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxWhiteBallanceMode)),
+ TagInfo(0x0019, "WhiteBalance", N_("White balance"),
+ N_("White balance"),
+ pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxWhiteBalance)),
+ TagInfo(0x001a, "WhiteBalanceMode", N_("White balance mode"),
+ N_("White balance mode"),
+ pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxWhiteBalanceMode)),
TagInfo(0x001b, "BlueBalance", N_("Blue balance"),
N_("Blue color balance"),
pentaxId, makerTags, unsignedLong, -1, printValue),
diff --git a/src/properties.cpp b/src/properties.cpp
index d9472ae..7f9ddf4 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -464,7 +464,7 @@ namespace Exiv2 {
{ "CameraProfile", N_("Camera Profile"), "Text", xmpText, xmpExternal, N_("\"Camera Profile\" setting.") },
{ "ChromaticAberrationB", N_("Chromatic Aberration Blue"), "Integer", xmpText, xmpExternal, N_("\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100.") },
{ "ChromaticAberrationR", N_("Chromatic Aberration Red"), "Integer", xmpText, xmpExternal, N_("\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100.") },
- { "ColorNoiseReduction", N_("Color Noise Reduction"), "Integer", xmpText, xmpExternal, N_("\"Color Noise Reducton\" setting. Range 0 to +100.") },
+ { "ColorNoiseReduction", N_("Color Noise Reduction"), "Integer", xmpText, xmpExternal, N_("\"Color Noise Reduction\" setting. Range 0 to +100.") },
{ "Contrast", N_("Contrast"), "Integer", xmpText, xmpExternal, N_("\"Contrast\" setting. Range -50 to +100.") },
{ "CropTop", N_("Crop Top"), "Real", xmpText, xmpExternal, N_("When \"Has Crop\" is true, top of crop rectangle") },
{ "CropLeft", N_("Crop Left"), "Real", xmpText, xmpExternal, N_("When \"Has Crop\" is true, left of crop rectangle.") },
@@ -1077,7 +1077,7 @@ namespace Exiv2 {
{ "CodecDownloadUrl", N_("Video Codec Download URL"), "Text", xmpText, xmpExternal, N_("Video Codec Download URL.") },
{ "CodecSettings", N_("Video Codec Settings"), "Text", xmpText, xmpExternal, N_("Contains settings the codec needs before decoding can be started.") },
{ "ColorMode", N_("Color Mode"), "Text", xmpText, xmpExternal, N_("Color Mode") },
- { "ColorNoiseReduction", N_("Color Noise Reduction"), "Integer", xmpText, xmpExternal, N_("\"Color Noise Reducton\" setting. Range 0 to +100.") },
+ { "ColorNoiseReduction", N_("Color Noise Reduction"), "Integer", xmpText, xmpExternal, N_("\"Color Noise Reduction\" setting. Range 0 to +100.") },
{ "ColorSpace", N_("Video Color Space"), "closed Choice of Text", xmpText, xmpInternal, N_("The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
"CCIR-709 (used for HD).") },
{ "Comment", N_("Comment"), "Text", xmpText, xmpExternal, N_("Information about the Comment.") },
@@ -1365,7 +1365,7 @@ namespace Exiv2 {
{ "TrackName", N_("Track Name"), "Text", xmpText, xmpExternal, N_("Track Name could be used to define titles for a segment.") },
{ "TrackNumber", N_("Track Number"), "Integer", xmpText, xmpExternal, N_("Track Number.") },
{ "TrackVolume", N_("Track Volume"), "Rational", xmpText, xmpExternal, N_("A 16-bit fixed-point number that specifies how loud to play this track's sound. A value of 1.0 indicates full volume.") },
- { "TranslateCodec", N_("Chapter Translate Codec"), "Text", xmpText, xmpExternal, N_("Chapter Translate Codec information. Usually used in Matroska filr type.") },
+ { "TranslateCodec", N_("Chapter Translate Codec"), "Text", xmpText, xmpExternal, N_("Chapter Translate Codec information. Usually used in Matroska file type.") },
{ "UnknownInfo", N_("Unknown Information"), "Text", xmpText, xmpExternal, N_("Unknown / Unregistered Metadata Tags and their values.") },
{ "UnknownInfo2", N_("Unknown Information"), "Text", xmpText, xmpExternal, N_("Unknown / Unregistered Metadata Tags and their values.") },
{ "URL", N_("Video URL"), "Text", xmpText, xmpExternal, N_("A C string that specifies a URL. There may be additional data after the C string.") },
diff --git a/src/tags.cpp b/src/tags.cpp
index b47330e..8d8b9c4 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -975,7 +975,7 @@ namespace Exiv2 {
"scan order."),
ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
TagInfo(0xc623, "CameraCalibration1", N_("Camera Calibration 1"),
- N_("CameraClalibration1 defines a calibration matrix that transforms "
+ N_("CameraCalibration1 defines a calibration matrix that transforms "
"reference camera native space values to individual camera native "
"space values under the first calibration illuminant. The matrix is "
"stored in row scan order. This matrix is stored separately from the "
@@ -2026,7 +2026,7 @@ namespace Exiv2 {
N_("Indicates the geodetic survey data used by the GPS receiver. If the survey data "
"is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84\"."),
gpsId, gpsTags, asciiString, 0, printValue),
- TagInfo(0x0013, "GPSDestLatitudeRef", N_("GPS Destination Latitude Refeference"),
+ TagInfo(0x0013, "GPSDestLatitudeRef", N_("GPS Destination Latitude Reference"),
N_("Indicates whether the latitude of the destination point is north or south latitude. "
"The ASCII value \"N\" indicates north latitude, and \"S\" is south latitude."),
gpsId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLatitudeRef)),
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list