Index: trunk/phase3/maintenance/language/messageTypes.inc |
— | — | @@ -400,7 +400,7 @@ |
401 | 401 | |
402 | 402 | /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ |
403 | 403 | $wgEXIFMessages = array( |
404 | | - 'exif-imagewidth', |
| 404 | + 'exif-imagewidth' |
405 | 405 | 'exif-imagelength', |
406 | 406 | 'exif-bitspersample', |
407 | 407 | 'exif-compression', |
— | — | @@ -412,7 +412,6 @@ |
413 | 413 | 'exif-ycbcrpositioning', |
414 | 414 | 'exif-xresolution', |
415 | 415 | 'exif-yresolution', |
416 | | - 'exif-resolutionunit', |
417 | 416 | 'exif-stripoffsets', |
418 | 417 | 'exif-rowsperstrip', |
419 | 418 | 'exif-stripbytecounts', |
— | — | @@ -446,6 +445,7 @@ |
447 | 446 | 'exif-exposuretime', |
448 | 447 | 'exif-exposuretime-format', |
449 | 448 | 'exif-fnumber', |
| 449 | + 'exif-fnumber-format', |
450 | 450 | 'exif-exposureprogram', |
451 | 451 | 'exif-spectralsensitivity', |
452 | 452 | 'exif-isospeedratings', |
— | — | @@ -459,6 +459,7 @@ |
460 | 460 | 'exif-lightsource', |
461 | 461 | 'exif-flash', |
462 | 462 | 'exif-focallength', |
| 463 | + 'exif-focallength-format', |
463 | 464 | 'exif-subjectarea', |
464 | 465 | 'exif-flashenergy', |
465 | 466 | 'exif-focalplanexresolution', |
— | — | @@ -513,8 +514,83 @@ |
514 | 515 | 'exif-gpsareainformation', |
515 | 516 | 'exif-gpsdatestamp', |
516 | 517 | 'exif-gpsdifferential', |
517 | | - 'exif-colorspace-65535', |
| 518 | + 'exif-coordinate-format', |
| 519 | + 'exif-jpegfilecomment', |
| 520 | + 'exif-keywords', |
| 521 | + 'exif-worldregioncreated', |
| 522 | + 'exif-countrycreated', |
| 523 | + 'exif-countrycodecreated', |
| 524 | + 'exif-provinceorstatecreated', |
| 525 | + 'exif-citycreated', |
| 526 | + 'exif-sublocationcreated', |
| 527 | + 'exif-worldregiondest', |
| 528 | + 'exif-countrydest', |
| 529 | + 'exif-countrycodedest', |
| 530 | + 'exif-provinceorstatedest', |
| 531 | + 'exif-citydest', |
| 532 | + 'exif-sublocationdest', |
| 533 | + 'exif-objectname', |
| 534 | + 'exif-specialinstructions', |
| 535 | + 'exif-headline', |
| 536 | + 'exif-credit', |
| 537 | + 'exif-source', |
| 538 | + 'exif-editstatus', |
| 539 | + 'exif-urgency', |
| 540 | + 'exif-fixtureidentifier', |
| 541 | + 'exif-locationdest', |
| 542 | + 'exif-locationdestcode', |
| 543 | + 'exif-objectcycle', |
| 544 | + 'exif-contact', |
| 545 | + 'exif-writer', |
| 546 | + 'exif-languagecode', |
| 547 | + 'exif-iimversion', |
| 548 | + 'exif-iimcategory', |
| 549 | + 'exif-iimsupplementalcategory', |
| 550 | + 'exif-datetimeexpires', |
| 551 | + 'exif-datetimereleased', |
| 552 | + 'exif-originaltransmissionref', |
| 553 | + 'exif-identifier', |
| 554 | + 'exif-lens', |
| 555 | + 'exif-serialnumber', |
| 556 | + 'exif-cameraownername', |
| 557 | + 'exif-label', |
| 558 | + 'exif-datetimemetadata', |
| 559 | + 'exif-nickname', |
| 560 | + 'exif-rating', |
| 561 | + 'exif-rightscertificate', |
| 562 | + 'exif-copyrighted', |
| 563 | + 'exif-copyrightowner', |
| 564 | + 'exif-usageterms', |
| 565 | + 'exif-webstatement', |
| 566 | + 'exif-originaldocumentid', |
| 567 | + 'exif-licenseurl', |
| 568 | + 'exif-morepermissionsurl', |
| 569 | + 'exif-attributionurl', |
| 570 | + 'exif-preferredattributionname', |
| 571 | + 'exif-pngfilecomment', |
| 572 | + 'exif-disclaimer', |
| 573 | + 'exif-contentwarning', |
| 574 | + 'exif-giffilecomment', |
| 575 | + 'exif-intellectualgenre', |
| 576 | + 'exif-subjectnewscode', |
| 577 | + 'exif-scenecode', |
| 578 | + 'exif-event', |
| 579 | + 'exif-organisationinimage', |
| 580 | + 'exif-personinimage', |
| 581 | + 'exif-originalimageheight', |
| 582 | + 'exif-originalimagewidth', |
| 583 | + 'exif-make-value', |
| 584 | + 'exif-model-value', |
| 585 | + 'exif-software-value', |
| 586 | + 'exif-software-version-value', |
| 587 | + 'exif-contact-value', |
| 588 | + 'exif-subjectnewscode-value', |
518 | 589 | 'exif-compression-1', |
| 590 | + 'exif-compression-6', |
| 591 | + 'exif-copyrighted-true', |
| 592 | + 'exif-copyrighted-false', |
| 593 | + 'exif-photometricinterpretation-2', |
| 594 | + 'exif-photometricinterpretation-6', |
519 | 595 | 'exif-unknowndate', |
520 | 596 | 'exif-orientation-1', |
521 | 597 | 'exif-orientation-2', |
— | — | @@ -526,7 +602,17 @@ |
527 | 603 | 'exif-orientation-8', |
528 | 604 | 'exif-planarconfiguration-1', |
529 | 605 | 'exif-planarconfiguration-2', |
| 606 | + 'exif-xyresolution-i', |
| 607 | + 'exif-xyresolution-c', |
| 608 | + 'exif-colorspace-1', |
| 609 | + 'exif-colorspace-65535', |
530 | 610 | 'exif-componentsconfiguration-0', |
| 611 | + 'exif-componentsconfiguration-1', |
| 612 | + 'exif-componentsconfiguration-2', |
| 613 | + 'exif-componentsconfiguration-3', |
| 614 | + 'exif-componentsconfiguration-4', |
| 615 | + 'exif-componentsconfiguration-5', |
| 616 | + 'exif-componentsconfiguration-6', |
531 | 617 | 'exif-exposureprogram-0', |
532 | 618 | 'exif-exposureprogram-1', |
533 | 619 | 'exif-exposureprogram-2', |
— | — | @@ -560,18 +646,22 @@ |
561 | 647 | 'exif-lightsource-17', |
562 | 648 | 'exif-lightsource-18', |
563 | 649 | 'exif-lightsource-19', |
| 650 | + 'exif-lightsource-20', |
| 651 | + 'exif-lightsource-21', |
| 652 | + 'exif-lightsource-22', |
| 653 | + 'exif-lightsource-23', |
564 | 654 | 'exif-lightsource-24', |
565 | 655 | 'exif-lightsource-255', |
566 | | - 'exif-flash-fired-0' , |
567 | | - 'exif-flash-fired-1' , |
568 | | - 'exif-flash-return-0' , |
569 | | - 'exif-flash-return-2' , |
570 | | - 'exif-flash-return-3' , |
571 | | - 'exif-flash-mode-1' , |
572 | | - 'exif-flash-mode-2' , |
573 | | - 'exif-flash-mode-3' , |
574 | | - 'exif-flash-function-1' , |
575 | | - 'exif-flash-redeye-1' , |
| 656 | + 'exif-flash-fired-0', |
| 657 | + 'exif-flash-fired-1', |
| 658 | + 'exif-flash-return-0', |
| 659 | + 'exif-flash-return-2', |
| 660 | + 'exif-flash-return-3', |
| 661 | + 'exif-flash-mode-1', |
| 662 | + 'exif-flash-mode-2', |
| 663 | + 'exif-flash-mode-3', |
| 664 | + 'exif-flash-function-1', |
| 665 | + 'exif-flash-redeye-1', |
576 | 666 | 'exif-focalplaneresolutionunit-2', |
577 | 667 | 'exif-sensingmethod-1', |
578 | 668 | 'exif-sensingmethod-2', |
— | — | @@ -580,6 +670,7 @@ |
581 | 671 | 'exif-sensingmethod-5', |
582 | 672 | 'exif-sensingmethod-7', |
583 | 673 | 'exif-sensingmethod-8', |
| 674 | + 'exif-filesource-3', |
584 | 675 | 'exif-scenetype-1', |
585 | 676 | 'exif-customrendered-0', |
586 | 677 | 'exif-customrendered-1', |
— | — | @@ -600,7 +691,6 @@ |
601 | 692 | 'exif-contrast-0', |
602 | 693 | 'exif-contrast-1', |
603 | 694 | 'exif-contrast-2', |
604 | | - 'exif-filesource-3', |
605 | 695 | 'exif-saturation-0', |
606 | 696 | 'exif-saturation-1', |
607 | 697 | 'exif-saturation-2', |
— | — | @@ -627,54 +717,18 @@ |
628 | 718 | 'exif-gpsdestdistance-k', |
629 | 719 | 'exif-gpsdestdistance-m', |
630 | 720 | 'exif-gpsdestdistance-n', |
631 | | - 'exif-gpsdirection-t', |
632 | | - 'exif-gpsdirection-m', |
633 | 721 | 'exif-gpsdop-excellent', |
634 | 722 | 'exif-gpsdop-good', |
635 | 723 | 'exif-gpsdop-moderate', |
636 | 724 | 'exif-gpsdop-fair', |
637 | 725 | 'exif-gpsdop-poor', |
638 | | - 'exif-ycbcrpositioning-1', |
639 | | - 'exif-ycbcrpositioning-2', |
640 | | - //non-exif metadata that is still image metadata |
641 | | - 'exif-jpegfilecomment', |
642 | | - 'exif-keywords', |
643 | | - 'exif-worldregioncreated', |
644 | | - 'exif-countrycreated', |
645 | | - 'exif-countrycodecreated', |
646 | | - 'exif-provinceorstatecreated', |
647 | | - 'exif-citycreated', |
648 | | - 'exif-sublocationcreated', |
649 | | - 'exif-worldregiondest', |
650 | | - 'exif-countrydest', |
651 | | - 'exif-countrycodedest', |
652 | | - 'exif-stateorprovincedest', |
653 | | - 'exif-citydest', |
654 | | - 'exif-sublocationdest', |
655 | | - 'exif-objectname', |
656 | | - 'exif-specialinstructions', |
657 | | - 'exif-headline', |
658 | | - 'exif-credit', |
659 | | - 'exif-source', |
660 | | - 'exif-editstatus', |
661 | | - 'exif-urgency', |
662 | | - 'exif-fixtureidentifier', |
663 | | - 'exif-locationdest', |
664 | | - 'exif-locationdestcode', |
665 | | - 'exif-objectcycle', |
666 | 726 | 'exif-objectcycle-a', |
667 | 727 | 'exif-objectcycle-p', |
668 | 728 | 'exif-objectcycle-b', |
669 | | - 'exif-contact', |
670 | | - 'exif-writer', |
671 | | - 'exif-languagecode', |
672 | | - 'exif-iimversion', |
673 | | - 'exif-iimcategory', |
674 | | - 'exif-iimsupplementalcategory', |
675 | | - 'exif-datetimeexpires', |
676 | | - 'exif-datetimereleased', |
677 | | - 'exif-originaltransmissionref', |
678 | | - 'exif-identifier', |
| 729 | + 'exif-gpsdirection-t', |
| 730 | + 'exif-gpsdirection-m', |
| 731 | + 'exif-ycbcrpositioning-1', |
| 732 | + 'exif-ycbcrpositioning-2', |
679 | 733 | 'exif-dc-contributor', |
680 | 734 | 'exif-dc-coverage', |
681 | 735 | 'exif-dc-date', |
— | — | @@ -683,32 +737,9 @@ |
684 | 738 | 'exif-dc-rights', |
685 | 739 | 'exif-dc-source', |
686 | 740 | 'exif-dc-type', |
687 | | - 'exif-lens', |
688 | | - 'exif-serialnumber', |
689 | | - 'exif-cameraownername', |
690 | | - 'exif-label', |
691 | | - 'exif-datetimemetadata', |
692 | | - 'exif-nickname', |
693 | | - 'exif-rating', |
694 | | - 'exif-rightscertificate', |
695 | | - 'exif-copyrighted', |
696 | | - 'exif-copyrightowner', |
697 | | - 'exif-usageterms', |
698 | | - 'exif-webstatement', |
699 | | - 'exif-originaldocumentid', |
700 | | - 'exif-licenseurl', |
701 | | - 'exif-morepermissionsurl', |
702 | | - 'exif-attributionurl', |
703 | | - 'exif-preferredattributionname', |
704 | | - 'exif-copyrighted-true', |
705 | | - 'exif-copyrighted-false', |
706 | 741 | 'exif-rating-rejected', |
707 | 742 | 'exif-isospeedratings-overflow', |
708 | | - 'exif-pngfilecomment', |
709 | | - 'exif-disclaimer', |
710 | | - 'exif-contentwarning', |
711 | | - 'exif-giffilecomment', |
712 | | - 'exif-intellectualgenre', |
| 743 | + 'exif-maxaperturevalue-value', |
713 | 744 | 'exif-iimcategory-ace', |
714 | 745 | 'exif-iimcategory-clj', |
715 | 746 | 'exif-iimcategory-dis', |
— | — | @@ -726,13 +757,6 @@ |
727 | 758 | 'exif-iimcategory-spo', |
728 | 759 | 'exif-iimcategory-war', |
729 | 760 | 'exif-iimcategory-wea', |
730 | | - 'exif-subjectnewscode', |
731 | | - 'exif-scenecode', |
732 | | - 'exif-event', |
733 | | - 'exif-organisationinimage', |
734 | | - 'exif-personinimage', |
735 | | - 'exif-originalimageheight', |
736 | | - 'exif-originalimagewidth', |
737 | 761 | 'exif-urgency-normal', |
738 | 762 | 'exif-urgency-low', |
739 | 763 | 'exif-urgency-high', |