[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:38:47 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3c2da7a
The following commit has been merged in the master branch:
commit 3c2da7a72318edf9ba2d1cfae22356bd70ebfd9e
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Fri Sep 28 17:15:23 2007 +0000
start XMP i18n
---
src/minoltamn.cpp | 14 +++++++-------
src/properties.cpp | 29 +++++++++++++++--------------
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 6bcf08f..a400307 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -141,25 +141,25 @@ namespace Exiv2 {
{ 40, "AFDT18-70mm F3.5-5.6(D)" },
{ 41, "AFDT11-18mm F4.5-5.6(D)" },
{ 42, "AFDT18-200mm F3.5-6.3(D)" },
- { 45, "CZ Planar T* AF85mm F1.4" },
- { 46, "CZ Vario-Sonnar T* AFDT16-80mm F3.5-4.5" },
- { 47, "CZ Sonnar T* 135mm F1.8" },
+ { 45, "CZ Planar T* AF85mm F1.4" },
+ { 46, "CZ Vario-Sonnar T* AFDT16-80mm F3.5-4.5" },
+ { 47, "CZ Sonnar T* 135mm F1.8" },
{ 128, "TAMRON 18-200, 28-300 | 80-300mm F3.5-6.3" },
- { 193, "AF 1.4x APO II" },
+ { 193, "AF 1.4x APO II" },
{ 25500, "AF50mm F1.7" },
{ 25501, "AF50mm F1.7" },
{ 25510, "AF35-70mm F1.4" },
- { 25511, "AF35-70mm F4" },
+ { 25511, "AF35-70mm F4" },
{ 25520, "AF28-85mm F3.5-4.5" },
{ 25521, "TOKINA 19-35mm F3.5-4.5 | TOKINA 28-70mm F2.8 AT-X" },
{ 25530, "AF28-135mm F4-4.5" },
- { 25531, "AF28-135mm F4-4.5" },
+ { 25531, "AF28-135mm F4-4.5" },
{ 25540, "AF35-105mm F3.5-4.5" },
{ 25541, "AF35-105mm F3.5-4.5" },
{ 25550, "AF70-210mm F4" },
{ 25551, "AF70-210mm F4 Macro | SIGMA 70-210mm F4-5.6 APO" },
{ 25560, "AF135mm F2.8" },
- { 25561, "AF135mm F2.8" },
+ { 25561, "AF135mm F2.8" },
{ 25570, "AF28mm F2.8" },
{ 25571, "AF28mm F2.8" },
{ 25580, "AF24-50mm F4" },
diff --git a/src/properties.cpp b/src/properties.cpp
index 087f5df..179ac3e 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -64,20 +64,21 @@ namespace Exiv2 {
extern const XmpNsInfo xmpNsInfo[] = {
// Schemas
- { "http://purl.org/dc/elements/1.1/", "dc", xmpDcInfo, "Dublin Core schema" },
- { "http://ns.adobe.com/xap/1.0/", "xmp", xmpXmpInfo, "XMP Basic schema" },
- { "http://ns.adobe.com/xap/1.0/rights/", "xmpRights", xmpXmpRightsInfo, "XMP Rights Management schema" },
- { "http://ns.adobe.com/xap/1.0/mm/", "xmpMM", xmpXmpMMInfo, "XMP Media Management schema" },
- { "http://ns.adobe.com/xap/1.0/bj/", "xmpBJ", xmpXmpBJInfo, "XMP Basic Job Ticket schema" },
- { "http://ns.adobe.com/xap/1.0/t/pg/", "xmpTPg", xmpXmpTPgInfo, "XMP Paged-Text schema" },
- { "http://ns.adobe.com/xmp/1.0/DynamicMedia/", "xmpDM", xmpXmpDMInfo, "XMP Dynamic Media schema" },
- { "http://ns.adobe.com/pdf/1.3/", "pdf", xmpPdfInfo, "Adobe PDF schema" },
- { "http://ns.adobe.com/photoshop/1.0/", "photoshop", xmpPhotoshopInfo, "Adobe photoshop schema" },
- { "http://ns.adobe.com/camera-raw-settings/1.0/", "crs", xmpCrsInfo, "Camera Raw schema" },
- { "http://ns.adobe.com/tiff/1.0/", "tiff", xmpTiffInfo, "Exif Schema for TIFF Properties" },
- { "http://ns.adobe.com/exif/1.0/", "exif", xmpExifInfo, "Exif schema for Exif-specific Properties" },
- { "http://ns.adobe.com/exif/1.0/aux/", "aux", xmpAuxInfo, "Exif schema for Additional Exif Properties" },
- { "http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/", "iptc", xmpIptcInfo, "IPTC Core schema" }, // 'Iptc4xmpCore' is just too long
+ { "http://purl.org/dc/elements/1.1/", "dc", xmpDcInfo, N_("Dublin Core schema") },
+ { "http://ns.adobe.com/xap/1.0/", "xmp", xmpXmpInfo, N_("XMP Basic schema") },
+ { "http://ns.adobe.com/xap/1.0/rights/", "xmpRights", xmpXmpRightsInfo, N_("XMP Rights Management schema") },
+ { "http://ns.adobe.com/xap/1.0/mm/", "xmpMM", xmpXmpMMInfo, N_("XMP Media Management schema") },
+ { "http://ns.adobe.com/xap/1.0/bj/", "xmpBJ", xmpXmpBJInfo, N_("XMP Basic Job Ticket schema") },
+ { "http://ns.adobe.com/xap/1.0/t/pg/", "xmpTPg", xmpXmpTPgInfo, N_("XMP Paged-Text schema") },
+ { "http://ns.adobe.com/xmp/1.0/DynamicMedia/", "xmpDM", xmpXmpDMInfo, N_("XMP Dynamic Media schema") },
+ { "http://ns.adobe.com/pdf/1.3/", "pdf", xmpPdfInfo, N_("Adobe PDF schema") },
+ { "http://ns.adobe.com/photoshop/1.0/", "photoshop", xmpPhotoshopInfo, N_("Adobe photoshop schema") },
+ { "http://ns.adobe.com/camera-raw-settings/1.0/", "crs", xmpCrsInfo, N_("Camera Raw schema") },
+ { "http://ns.adobe.com/tiff/1.0/", "tiff", xmpTiffInfo, N_("Exif Schema for TIFF Properties") },
+ { "http://ns.adobe.com/exif/1.0/", "exif", xmpExifInfo, N_("Exif schema for Exif-specific Properties") },
+ { "http://ns.adobe.com/exif/1.0/aux/", "aux", xmpAuxInfo, N_("Exif schema for Additional Exif Properties")},
+ { "http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/", "iptc", xmpIptcInfo, N_("IPTC Core schema") },
+ // NOTE: 'Iptc4xmpCore' is just too long
// Structures
{ "http://ns.adobe.com/xap/1.0/g/", "xapG", 0, "Colorant structure" },
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list