r86191 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r86190‎ | r86191 | r86192 >
Date:09:03, 16 April 2011
Author:ialex
Status:ok
Tags:
Comment:
Fix for r86169: added missing items in messages.inc and rebuilt MessagesEn.php
Modified paths:
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
@@ -2751,6 +2751,7 @@
27522752 'exif-gpsareainformation',
27532753 'exif-gpsdatestamp',
27542754 'exif-gpsdifferential',
 2755+ 'exif-coordinate-format',
27552756 'exif-jpegfilecomment',
27562757 'exif-keywords',
27572758 'exif-worldregioncreated',
@@ -3555,6 +3556,7 @@
35563557 'exif' => 'EXIF tags',
35573558 'exif-values' => 'Make & model, can be wikified in order to link to the camera and model name',
35583559 'exif-compression' => 'EXIF attributes',
 3560+ 'exif-copyrighted' => '',
35593561 'exif-unknowndate' => '',
35603562 'exif-photometricinterpretation' => '',
35613563 'exif-orientation' => '',
@@ -3587,7 +3589,16 @@
35883590 'exif-gpsmeasuremode' => '',
35893591 'exif-gpsspeed' => 'Pseudotags used for GPSSpeedRef',
35903592 'exif-gpsdestdistanceref' => 'Pseudotags used for GPSDestDistanceRef',
 3593+ 'exif-gdop' => '',
 3594+ 'exif-objectcycle' => '',
35913595 'exif-gpsdirection' => 'Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef',
 3596+ 'exif-ycbcrpositioning' => '',
 3597+ 'exif-dc' => '',
 3598+ 'exif-rating' => '',
 3599+ 'exif-isospeedratings' => '',
 3600+ 'exif-maxaperturevalue' => '',
 3601+ 'exif-iimcategory' => '',
 3602+ 'exif-urgency' => '',
35923603 'edit-externally' => 'External editor support',
35933604 'all' => "'all' in various places, this might be different for inflected languages",
35943605 'confirmemail' => 'E-mail address confirmation',
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -3674,8 +3674,6 @@
36753675 If the file has been modified from its original state, some details may not fully reflect the modified file.',
36763676 'metadata-expand' => 'Show extended details',
36773677 'metadata-collapse' => 'Hide extended details',
3678 -'metadata-langitem' => '\'\'\'$2:\'\'\' $1',
3679 -'metadata-langitem-default' => '$1',
36803678 'metadata-fields' => 'Image metadata fields listed in this message will be included on image page display when the metadata table is collapsed.
36813679 Others will be hidden by default.
36823680 * make
@@ -3691,6 +3689,8 @@
36923690 * gpslatitude
36933691 * gpslongitude
36943692 * gpsaltitude',
 3693+'metadata-langitem' => "'''$2:''' $1", # only translate this message to other languages if you have to change it
 3694+'metadata-langitem-default' => '$1', # only translate this message to other languages if you have to change it
36953695
36963696 # EXIF tags
36973697 'exif-imagewidth' => 'Width',
@@ -3807,7 +3807,7 @@
38083808 'exif-gpsareainformation' => 'Name of GPS area',
38093809 'exif-gpsdatestamp' => 'GPS date',
38103810 'exif-gpsdifferential' => 'GPS differential correction',
3811 -'exif-coordinate-format' => '$1° $2′ $3″ $4',
 3811+'exif-coordinate-format' => '$1° $2′ $3″ $4', # only translate this message to other languages if you have to change it
38123812 'exif-jpegfilecomment' => 'JPEG file comment',
38133813 'exif-keywords' => 'Keywords',
38143814 'exif-worldregioncreated' => 'World region that the picture was taken in',
@@ -3827,7 +3827,7 @@
38283828 'exif-headline' => 'Headline',
38293829 'exif-credit' => 'Credit/Provider',
38303830 'exif-source' => 'Source',
3831 -'exif-editstatus' => 'Editorial status of image',
 3831+'exif-editstatus' => 'Editorial status of image',
38323832 'exif-urgency' => 'Urgency',
38333833 'exif-fixtureidentifier' => 'Fixture name',
38343834 'exif-locationdest' => 'Location depicted',
@@ -3842,6 +3842,7 @@
38433843 'exif-datetimeexpires' => 'Do not use after',
38443844 'exif-datetimereleased' => 'Released on',
38453845 'exif-originaltransmissionref' => 'Original transmission location code',
 3846+'exif-identifier' => 'Identifier',
38463847 'exif-lens' => 'Lens used',
38473848 'exif-serialnumber' => 'Serial number of camera',
38483849 'exif-cameraownername' => 'Owner of camera',
@@ -3872,17 +3873,29 @@
38733874 'exif-originalimageheight' => 'Height of image before it was cropped',
38743875 'exif-originalimagewidth' => 'Width of image before it was cropped',
38753876
3876 -
38773877 # Make & model, can be wikified in order to link to the camera and model name
38783878 'exif-make-value' => '$1', # do not translate or duplicate this message to other languages
38793879 'exif-model-value' => '$1', # do not translate or duplicate this message to other languages
38803880 'exif-software-value' => '$1', # do not translate or duplicate this message to other languages
3881 -'exif-software-version-value' => '$1 (Version $2)',
 3881+'exif-software-version-value' => '$1 (Version $2)', # do not translate or duplicate this message to other languages
 3882+'exif-contact-value' => '$1
38823883
 3884+$2
 3885+<div class="adr">
 3886+$3
 3887+
 3888+$4, $5, $6 $7
 3889+</div>
 3890+$8', # only translate this message to other languages if you have to change it
 3891+'exif-subjectnewscode-value' => '$2 ($1)', # only translate this message to other languages if you have to change it
 3892+
38833893 # EXIF attributes
38843894 'exif-compression-1' => 'Uncompressed',
38853895 'exif-compression-6' => 'JPEG', # only translate this message to other languages if you have to change it
38863896
 3897+'exif-copyrighted-true' => 'Copyrighted',
 3898+'exif-copyrighted-false' => 'Public domain',
 3899+
38873900 'exif-photometricinterpretation-2' => 'RGB', # only translate this message to other languages if you have to change it
38883901 'exif-photometricinterpretation-6' => 'YCbCr', # only translate this message to other languages if you have to change it
38893902
@@ -3903,8 +3916,8 @@
39043917 'exif-xyresolution-i' => '$1 dpi', # only translate this message to other languages if you have to change it
39053918 'exif-xyresolution-c' => '$1 dpc', # only translate this message to other languages if you have to change it
39063919
3907 -'exif-colorspace-1' => 'sRGB', # only translate this message to other languages if you have to change it
3908 -'exif-colorspace-65535' => 'Uncalibrated', # only translate this message to other languages if you have to change it
 3920+'exif-colorspace-1' => 'sRGB', # only translate this message to other languages if you have to change it
 3921+'exif-colorspace-65535' => 'Uncalibrated',
39093922
39103923 'exif-componentsconfiguration-0' => 'does not exist',
39113924 'exif-componentsconfiguration-1' => 'Y', # only translate this message to other languages if you have to change it
@@ -4029,7 +4042,7 @@
40304043 'exif-gpslongitude-e' => 'East longitude',
40314044 'exif-gpslongitude-w' => 'West longitude',
40324045
4033 -# Pseudotags used for GPSAltitude
 4046+# Pseudotags used for GPSAltitudeRef
40344047 'exif-gpsaltitude-above-sealevel' => '$1 {{plural:$1|meters|meter}} above sea level',
40354048 'exif-gpsaltitude-below-sealevel' => '$1 {{plural:$1|meters|meter}} below sea level',
40364049
@@ -4049,10 +4062,6 @@
40504063 'exif-gpsdestdistance-m' => 'Miles',
40514064 'exif-gpsdestdistance-n' => 'Nautical miles',
40524065
4053 -# Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
4054 -'exif-gpsdirection-t' => 'True direction',
4055 -'exif-gpsdirection-m' => 'Magnetic direction',
4056 -
40574066 'exif-gpsdop-excellent' => 'Excellent ($1)',
40584067 'exif-gpsdop-good' => 'Good ($1)',
40594068 'exif-gpsdop-moderate' => 'Moderate ($1)',
@@ -4063,12 +4072,13 @@
40644073 'exif-objectcycle-p' => 'Evening only',
40654074 'exif-objectcycle-b' => 'Both morning and evening',
40664075
 4076+# Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
 4077+'exif-gpsdirection-t' => 'True direction',
 4078+'exif-gpsdirection-m' => 'Magnetic direction',
 4079+
40674080 'exif-ycbcrpositioning-1' => 'Centered',
40684081 'exif-ycbcrpositioning-2' => 'Co-sited',
40694082
4070 -'exif-identifier' => 'Identifier',
4071 -# dc stuff
4072 -
40734083 'exif-dc-contributor' => 'Contributors',
40744084 'exif-dc-coverage' => 'Spatial or temporal scope of media',
40754085 'exif-dc-date' => 'Date(s)',
@@ -4078,25 +4088,12 @@
40794089 'exif-dc-source' => 'Source media',
40804090 'exif-dc-type' => 'Type of media',
40814091
4082 -'exif-copyrighted-true' => 'Copyrighted',
4083 -'exif-copyrighted-false' => 'Public domain',
4084 -
40854092 'exif-rating-rejected' => 'Rejected',
40864093
40874094 'exif-isospeedratings-overflow' => 'Greater than 65535',
40884095
4089 -'exif-maxaperturevalue-value' => '$1 APEX (f/$2)',
 4096+'exif-maxaperturevalue-value' => '$1 APEX (f/$2)', # only translate this message to other languages if you have to change it
40904097
4091 -'exif-contact-value' => '$1
4092 -
4093 -$2
4094 -<div class="adr">
4095 -$3
4096 -
4097 -$4, $5, $6 $7
4098 -</div>
4099 -$8',
4100 -
41014098 'exif-iimcategory-ace' => 'Arts, culture and enterntainment',
41024099 'exif-iimcategory-clj' => 'Crime and law',
41034100 'exif-iimcategory-dis' => 'Disasters and accidents',
@@ -4115,14 +4112,11 @@
41164113 'exif-iimcategory-war' => 'War, conflict and unrest',
41174114 'exif-iimcategory-wea' => 'Weather',
41184115
4119 -'exif-subjectnewscode-value' => '$2 ($1)',
4120 -
41214116 'exif-urgency-normal' => 'Normal ($1)',
41224117 'exif-urgency-low' => 'Low ($1)',
41234118 'exif-urgency-high' => 'High ($1)',
41244119 'exif-urgency-other' => 'User-defined priority ($1)',
41254120
4126 -
41274121 # External editor support
41284122 'edit-externally' => 'Edit this file using an external application',
41294123 'edit-externally-help' => '(See the [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] for more information)',
@@ -4538,4 +4532,5 @@
45394533 # SQLite database support
45404534 'sqlite-has-fts' => '$1 with full-text search support',
45414535 'sqlite-no-fts' => '$1 without full-text search support',
 4536+
45424537 );

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r86169Merge to trunk everything in img_metadata branch....bawolff01:23, 16 April 2011

Status & tagging log