Update $wgEXIFMessages for r86169.

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 82f6dd9..fb3334c 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -400,7 +400,7 @@ $wgOptionalMessages = array(
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */
 $wgEXIFMessages = array(
-       'exif-imagewidth',
+       'exif-imagewidth'
        'exif-imagelength',
        'exif-bitspersample',
        'exif-compression',
@@ -412,7 +412,6 @@ $wgEXIFMessages = array(
        'exif-ycbcrpositioning',
        'exif-xresolution',
        'exif-yresolution',
-       'exif-resolutionunit',
        'exif-stripoffsets',
        'exif-rowsperstrip',
        'exif-stripbytecounts',
@@ -446,6 +445,7 @@ $wgEXIFMessages = array(
        'exif-exposuretime',
        'exif-exposuretime-format',
        'exif-fnumber',
+       'exif-fnumber-format',
        'exif-exposureprogram',
        'exif-spectralsensitivity',
        'exif-isospeedratings',
@@ -459,6 +459,7 @@ $wgEXIFMessages = array(
        'exif-lightsource',
        'exif-flash',
        'exif-focallength',
+       'exif-focallength-format',
        'exif-subjectarea',
        'exif-flashenergy',
        'exif-focalplanexresolution',
@@ -513,8 +514,83 @@ $wgEXIFMessages = array(
        'exif-gpsareainformation',
        'exif-gpsdatestamp',
        'exif-gpsdifferential',
-       'exif-colorspace-65535',
+       'exif-coordinate-format',
+       'exif-jpegfilecomment',
+       'exif-keywords',
+       'exif-worldregioncreated',
+       'exif-countrycreated',
+       'exif-countrycodecreated',
+       'exif-provinceorstatecreated',
+       'exif-citycreated',
+       'exif-sublocationcreated',
+       'exif-worldregiondest',
+       'exif-countrydest',
+       'exif-countrycodedest',
+       'exif-provinceorstatedest',
+       '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-contact',
+       'exif-writer',
+       'exif-languagecode',
+       'exif-iimversion',
+       'exif-iimcategory',
+       'exif-iimsupplementalcategory',
+       'exif-datetimeexpires',
+       'exif-datetimereleased',
+       'exif-originaltransmissionref',
+       'exif-identifier',
+       '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-pngfilecomment',
+       'exif-disclaimer',
+       'exif-contentwarning',
+       'exif-giffilecomment',
+       'exif-intellectualgenre',
+       'exif-subjectnewscode',
+       'exif-scenecode',
+       'exif-event',
+       'exif-organisationinimage',
+       'exif-personinimage',
+       'exif-originalimageheight',
+       'exif-originalimagewidth',
+       'exif-make-value',
+       'exif-model-value',
+       'exif-software-value',
+       'exif-software-version-value',
+       'exif-contact-value',
+       'exif-subjectnewscode-value',
        'exif-compression-1',
+       'exif-compression-6',
+       'exif-copyrighted-true',
+       'exif-copyrighted-false',
+       'exif-photometricinterpretation-2',
+       'exif-photometricinterpretation-6',
        'exif-unknowndate',
        'exif-orientation-1',
        'exif-orientation-2',
@@ -526,7 +602,17 @@ $wgEXIFMessages = array(
        'exif-orientation-8',
        'exif-planarconfiguration-1',
        'exif-planarconfiguration-2',
+       'exif-xyresolution-i',
+       'exif-xyresolution-c',
+       'exif-colorspace-1',
+       'exif-colorspace-65535',
        'exif-componentsconfiguration-0',
+       'exif-componentsconfiguration-1',
+       'exif-componentsconfiguration-2',
+       'exif-componentsconfiguration-3',
+       'exif-componentsconfiguration-4',
+       'exif-componentsconfiguration-5',
+       'exif-componentsconfiguration-6',
        'exif-exposureprogram-0',
        'exif-exposureprogram-1',
        'exif-exposureprogram-2',
@@ -560,18 +646,22 @@ $wgEXIFMessages = array(
        'exif-lightsource-17',
        'exif-lightsource-18',
        'exif-lightsource-19',
+       'exif-lightsource-20',
+       'exif-lightsource-21',
+       'exif-lightsource-22',
+       'exif-lightsource-23',
        'exif-lightsource-24',
        'exif-lightsource-255',
-       'exif-flash-fired-0' ,
-       'exif-flash-fired-1' ,
-       'exif-flash-return-0' ,
-       'exif-flash-return-2' ,
-       'exif-flash-return-3' ,
-       'exif-flash-mode-1' ,
-       'exif-flash-mode-2' ,
-       'exif-flash-mode-3' ,
-       'exif-flash-function-1' ,
-       'exif-flash-redeye-1' ,
+       'exif-flash-fired-0',
+       'exif-flash-fired-1',
+       'exif-flash-return-0',
+       'exif-flash-return-2',
+       'exif-flash-return-3',
+       'exif-flash-mode-1',
+       'exif-flash-mode-2',
+       'exif-flash-mode-3',
+       'exif-flash-function-1',
+       'exif-flash-redeye-1',
        'exif-focalplaneresolutionunit-2',
        'exif-sensingmethod-1',
        'exif-sensingmethod-2',
@@ -580,6 +670,7 @@ $wgEXIFMessages = array(
        'exif-sensingmethod-5',
        'exif-sensingmethod-7',
        'exif-sensingmethod-8',
+       'exif-filesource-3',
        'exif-scenetype-1',
        'exif-customrendered-0',
        'exif-customrendered-1',
@@ -600,7 +691,6 @@ $wgEXIFMessages = array(
        'exif-contrast-0',
        'exif-contrast-1',
        'exif-contrast-2',
-       'exif-filesource-3',
        'exif-saturation-0',
        'exif-saturation-1',
        'exif-saturation-2',
@@ -627,54 +717,18 @@ $wgEXIFMessages = array(
        'exif-gpsdestdistance-k',
        'exif-gpsdestdistance-m',
        '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-gpsdirection-t',
+       'exif-gpsdirection-m',
+       'exif-ycbcrpositioning-1',
+       'exif-ycbcrpositioning-2',
        'exif-dc-contributor',
        'exif-dc-coverage',
        'exif-dc-date',
@@ -683,32 +737,9 @@ $wgEXIFMessages = array(
        '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-maxaperturevalue-value',
        'exif-iimcategory-ace',
        'exif-iimcategory-clj',
        'exif-iimcategory-dis',
@@ -726,13 +757,6 @@ $wgEXIFMessages = array(
        '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',