Merge to trunk everything in img_metadata branch.

[lhc/web/wiklou.git] / maintenance / language / messageTypes.inc

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 7c16635..9f6aba6 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -100,6 +100,7 @@ $wgIgnoredMessages = array(
        'exif-make-value',
        'exif-model-value',
        'exif-software-value',
+       'exif-software-version-value',
        'history_copyright',
        'licenses',
        'loginstart',
@@ -280,18 +281,20 @@ $wgOptionalMessages = array(
        'exif-xyresolution-i',
        'exif-xyresolution-c',
        'exif-colorspace-1',
-       'exif-colorspace-ffff.h',
        'exif-componentsconfiguration-1',
        'exif-componentsconfiguration-2',
        'exif-componentsconfiguration-3',
        'exif-componentsconfiguration-4',
        'exif-componentsconfiguration-5',
        'exif-componentsconfiguration-6',
+       'exif-contact-value',
+       'exif-coordinate-format',
        'exif-lightsource-20',
        'exif-lightsource-21',
        'exif-lightsource-22',
        'exif-lightsource-23',
-       'exif-filesource-3',
+       'exif-maxaperturevalue-value',
+       'exif-subjectnewscode-value',
        'booksources-isbn',
        'sp-contributions-explain',
        'sorbs',
@@ -389,6 +392,8 @@ $wgOptionalMessages = array(
        'shared-repo-name-wikimediacommons',
        'usermessage-template',
        'filepage.css',
+       'metadata-langitem',
+       'metadata-langitem-default',
        'nocookiesforlogin',
 );
 
@@ -412,7 +417,6 @@ $wgEXIFMessages = array(
        'exif-stripbytecounts',
        'exif-jpeginterchangeformat',
        'exif-jpeginterchangeformatlength',
-       'exif-transferfunction',
        'exif-whitepoint',
        'exif-primarychromaticities',
        'exif-ycbcrcoefficients',
@@ -431,7 +435,6 @@ $wgEXIFMessages = array(
        'exif-compressedbitsperpixel',
        'exif-pixelydimension',
        'exif-pixelxdimension',
-       'exif-makernote',
        'exif-usercomment',
        'exif-relatedsoundfile',
        'exif-datetimeoriginal',
@@ -445,7 +448,6 @@ $wgEXIFMessages = array(
        'exif-exposureprogram',
        'exif-spectralsensitivity',
        'exif-isospeedratings',
-       'exif-oecf',
        'exif-shutterspeedvalue',
        'exif-aperturevalue',
        'exif-brightnessvalue',
@@ -458,7 +460,6 @@ $wgEXIFMessages = array(
        'exif-focallength',
        'exif-subjectarea',
        'exif-flashenergy',
-       'exif-spatialfrequencyresponse',
        'exif-focalplanexresolution',
        'exif-focalplaneyresolution',
        'exif-focalplaneresolutionunit',
@@ -467,7 +468,6 @@ $wgEXIFMessages = array(
        'exif-sensingmethod',
        'exif-filesource',
        'exif-scenetype',
-       'exif-cfapattern',
        'exif-customrendered',
        'exif-exposuremode',
        'exif-whitebalance',
@@ -512,6 +512,7 @@ $wgEXIFMessages = array(
        'exif-gpsareainformation',
        'exif-gpsdatestamp',
        'exif-gpsdifferential',
+       'exif-colorspace-65535',
        'exif-compression-1',
        'exif-unknowndate',
        'exif-orientation-1',
@@ -598,6 +599,7 @@ $wgEXIFMessages = array(
        'exif-contrast-0',
        'exif-contrast-1',
        'exif-contrast-2',
+       'exif-filesource-3',
        'exif-saturation-0',
        'exif-saturation-1',
        'exif-saturation-2',
@@ -612,8 +614,8 @@ $wgEXIFMessages = array(
        'exif-gpslatitude-s',
        'exif-gpslongitude-e',
        'exif-gpslongitude-w',
-       'exif-gpsaltitude-0',
-       'exif-gpsaltitude-1',
+       'exif-gpsaltitude-above-sealevel',
+       'exif-gpsaltitude-below-sealevel',
        'exif-gpsstatus-a',
        'exif-gpsstatus-v',
        'exif-gpsmeasuremode-2',
@@ -626,5 +628,112 @@ $wgEXIFMessages = array(
        'exif-gpsdestdistance-n',
        'exif-gpsdirection-t',
        'exif-gpsdirection-m',
+       'exif-gpsdop-excellent',
+       'exif-gpsdop-good',
+       'exif-gpsdop-moderate',
+       'exif-gpsdop-fair',
+       'exif-gpsdop-poor',
+       'exif-ycbcrpositioning-1',
+       'exif-ycbcrpositioning-2',
+       //non-exif metadata that is still image metadata
+       'exif-jpegfilecomment',
+       'exif-keywords',
+       'exif-worldregioncreated',
+       'exif-countrycreated',
+       'exif-countrycodecreated',
+       'exif-provinceorstatecreated',
+       'exif-citycreated',
+       'exif-sublocationcreated',
+       'exif-worldregiondest',
+       'exif-countrydest',
+       'exif-countrycodedest',
+       'exif-stateorprovincedest',
+       'exif-citydest',
+       'exif-sublocationdest',
        'exif-objectname',
+       'exif-specialinstructions',
+       'exif-headline',
+       'exif-credit',
+       'exif-source',
+       'exif-editstatus',
+       'exif-urgency',
+       'exif-fixtureidentifier',
+       'exif-locationdest',
+       'exif-locationdestcode',
+       'exif-objectcycle',
+       'exif-objectcycle-a',
+       'exif-objectcycle-p',
+       'exif-objectcycle-b',
+       'exif-contact',
+       'exif-writer',
+       'exif-languagecode',
+       'exif-iimversion',
+       'exif-iimcategory',
+       'exif-iimsupplementalcategory',
+       'exif-datetimeexpires',
+       'exif-datetimereleased',
+       'exif-originaltransmissionref',
+       'exif-identifier',
+       'exif-dc-contributor',
+       'exif-dc-coverage',
+       'exif-dc-date',
+       'exif-dc-publisher',
+       'exif-dc-relation',
+       'exif-dc-rights',
+       'exif-dc-source',
+       'exif-dc-type',
+       'exif-lens',
+       'exif-serialnumber',
+       'exif-cameraownername',
+       'exif-label',                      
+       'exif-datetimemetadata',
+       'exif-nickname',                   
+       'exif-rating',                     
+       'exif-rightscertificate',
+       'exif-copyrighted',
+       'exif-copyrightowner',             
+       'exif-usageterms',
+       'exif-webstatement',
+       'exif-originaldocumentid',
+       'exif-licenseurl',
+       'exif-morepermissionsurl',
+       'exif-attributionurl',
+       'exif-preferredattributionname',
+       'exif-copyrighted-true',
+       'exif-copyrighted-false',
+       'exif-rating-rejected',
+       'exif-isospeedratings-overflow',
+       'exif-pngfilecomment',
+       'exif-disclaimer',
+       'exif-contentwarning',
+       'exif-giffilecomment',
+       'exif-intellectualgenre',
+       'exif-iimcategory-ace',
+       'exif-iimcategory-clj',
+       'exif-iimcategory-dis',
+       'exif-iimcategory-fin',
+       'exif-iimcategory-edu',
+       'exif-iimcategory-evn',
+       'exif-iimcategory-hth',
+       'exif-iimcategory-hum',
+       'exif-iimcategory-lab',
+       'exif-iimcategory-lif',
+       'exif-iimcategory-pol',
+       'exif-iimcategory-rel',
+       'exif-iimcategory-sci',
+       'exif-iimcategory-soi',
+       'exif-iimcategory-spo',
+       'exif-iimcategory-war',
+       'exif-iimcategory-wea',
+       'exif-subjectnewscode',
+       'exif-scenecode',
+       'exif-event',
+       'exif-organisationinimage',
+       'exif-personinimage',
+       'exif-originalimageheight',
+       'exif-originalimagewidth',
+       'exif-urgency-normal',
+       'exif-urgency-low',
+       'exif-urgency-high',
+       'exif-urgency-other',
 );