Made the case of text output be more consistent. Now, tag titles
authorDan Fandrich <dan@coneharvesters.com>
Sat, 6 Feb 2010 00:15:22 +0000 (16:15 -0800)
committerDan Fandrich <dan@coneharvesters.com>
Sat, 6 Feb 2010 00:15:22 +0000 (16:15 -0800)
have each word capitalized (like a title) and tag values
are always lower case, except the first word which is capitalized
(more like a sentence).

ChangeLog
NEWS
libexif/canon/mnote-canon-entry.c
libexif/exif-entry.c
libexif/exif-tag.c
libexif/fuji/mnote-fuji-entry.c
libexif/fuji/mnote-fuji-tag.c
libexif/olympus/mnote-olympus-entry.c
libexif/olympus/mnote-olympus-tag.c
libexif/pentax/mnote-pentax-entry.c
libexif/pentax/mnote-pentax-tag.c

index 13b5d91..7be8ac0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-05  Dan Fandrich <dan@coneharvesters.com>
+
+       * Made the case of text output be more consistent. Now, tag titles
+         have each word capitalized (like a title) and tag values
+         are always lower case, except the first word which is capitalized
+         (more like a sentence).
+
 2010-01-25  Dan Fandrich <dan@coneharvesters.com>
 
        * configure.ac: Turned on the --enable-silent-rules configure option
diff --git a/NEWS b/NEWS
index 7d93159..cb11aff 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ libexif-0.6.x:
   * Fixed some problems in the write-exif.c example program
   * Stop listing -lm as a required library for dynamic linking in libexif.pc
   * Turned on the --enable-silent-rules configure option
+  * Changed a lot of strings to make the case of the text more consistent
 
 
 libexif-0.6.19 (2009-11-12):
index d566a89..6e3be19 100644 (file)
@@ -85,8 +85,8 @@ static const struct canon_entry_table_t {
   { 3,  2, N_("On")},
   { 3,  3, N_("Red-eye reduction")},
   { 3,  4, N_("Slow synchro")},
-  { 3,  5, N_("Auto + Red-eye reduction")},
-  { 3,  6, N_("On + Red-eye reduction")},
+  { 3,  5, N_("Auto, red-eye reduction")},
+  { 3,  6, N_("On, red-eye reduction")},
   { 3, 16, N_("External flash")},
   { 4,  0, N_("Single")},
   { 4,  1, N_("Continuous")},
@@ -210,7 +210,7 @@ static const struct canon_entry_table_t {
   {21,  11, N_("Canon EF 35mm f/2")},
   {21,  13, N_("Canon EF 15mm f/2.8")},
   {21,  21, N_("Canon EF 80-200mm f/2.8L")},
-  {21,  22, N_("Tokina AT-X280AF PRO 28-80mm F2.8 ASPHERICAL")},
+  {21,  22, N_("Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical")},
   {21,  26, N_("Cosina 100mm f/3.5 Macro AF")},
   {21,  28, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")},
   {21,  29, N_("Canon EF 50mm f/1.8 MkII")},
@@ -296,7 +296,7 @@ static const struct canon_entry_table_t {
   {32, 0, N_("Normal AE")},
   {32, 1, N_("Exposure compensation")},
   {32, 2, N_("AE lock")},
-  {32, 3, N_("AE lock + Exposure compensation")},
+  {32, 3, N_("AE lock + exposure compensation")},
   {32, 4, N_("No AE")},
   {33, 0, N_("Off")},
   {33, 1, N_("On")},
@@ -349,10 +349,10 @@ entries_settings_2 [] = {
   { 13,  0x3000, N_("None (MF)")},
   { 13,  0x3001, N_("Right")},
   { 13,  0x3002, N_("Center")},
-  { 13,  0x3003, N_("Center + Right")},
+  { 13,  0x3003, N_("Center-right")},
   { 13,  0x3004, N_("Left")},
-  { 13,  0x3005, N_("Left + Right")},
-  { 13,  0x3006, N_("Left + Center")},
+  { 13,  0x3005, N_("Left-right")},
+  { 13,  0x3006, N_("Left-center")},
   { 13,  0x3007, N_("All")},
   { 15,  0, N_("Off")},
   { 15,  1, N_("On (shot 1)")},
@@ -404,13 +404,13 @@ color_information [] = {
   {7,  4, N_("Fluorescent")},
   {7,  5, N_("Flash")},
   {7,  6, N_("Custom")},
-  {7,  7, N_("Black & White")},
+  {7,  7, N_("Black & white")},
   {7,  8, N_("Shade")},
-  {7,  9, N_("Manual Temperature (Kelvin)")},
-  {7, 10, N_("PC Set1")},
-  {7, 11, N_("PC Set2")},
-  {7, 12, N_("PC Set3")},
-  {7, 14, N_("Daylight Fluorescent")},
+  {7,  9, N_("Manual temperature (Kelvin)")},
+  {7, 10, N_("PC set 1")},
+  {7, 11, N_("PC set 2")},
+  {7, 12, N_("PC set 3")},
+  {7, 14, N_("Daylight fluorescent")},
   {7, 15, N_("Custom 1")},
   {7, 16, N_("Custom 2")},
   {7, 17, N_("Underwater")},
@@ -419,9 +419,9 @@ color_information [] = {
   {9, 0x02, N_("Set 1")},
   {9, 0x03, N_("Set 2")},
   {9, 0x04, N_("Set 3")},
-  {9, 0x21, N_("User Def. 1")},
-  {9, 0x22, N_("User Def. 2")},
-  {9, 0x23, N_("User Def. 3")},
+  {9, 0x21, N_("User def. 1")},
+  {9, 0x22, N_("User def. 2")},
+  {9, 0x23, N_("User def. 3")},
   {9, 0x41, N_("External 1")},
   {9, 0x42, N_("External 2")},
   {9, 0x43, N_("External 3")},
index e36f099..409df51 100644 (file)
@@ -647,18 +647,18 @@ static const struct {
 } list[] = {
 #ifndef NO_VERBOSE_TAG_DATA
   { EXIF_TAG_PLANAR_CONFIGURATION,
-    { N_("chunky format"), N_("planar format"), NULL}},
+    { N_("Chunky format"), N_("Planar format"), NULL}},
   { EXIF_TAG_SENSING_METHOD,
     { "", N_("Not defined"), N_("One-chip color area sensor"),
       N_("Two-chip color area sensor"), N_("Three-chip color area sensor"),
       N_("Color sequential area sensor"), "", N_("Trilinear sensor"),
       N_("Color sequential linear sensor"), NULL}},
   { EXIF_TAG_ORIENTATION,
-    { "", N_("top - left"), N_("top - right"), N_("bottom - right"),
-      N_("bottom - left"), N_("left - top"), N_("right - top"),
-      N_("right - bottom"), N_("left - bottom"), NULL}},
+    { "", N_("Top-left"), N_("Top-right"), N_("Bottom-right"),
+      N_("Bottom-left"), N_("Left-top"), N_("Right-top"),
+      N_("Right-bottom"), N_("Left-bottom"), NULL}},
   { EXIF_TAG_YCBCR_POSITIONING,
-    { "", N_("centered"), N_("co-sited"), NULL}},
+    { "", N_("Centered"), N_("Co-sited"), NULL}},
   { EXIF_TAG_PHOTOMETRIC_INTERPRETATION,
     { N_("Reversed mono"), N_("Normal mono"), N_("RGB"), N_("Palette"), "",
       N_("CMYK"), N_("YCbCr"), "", N_("CieLAB"), NULL}},
@@ -686,16 +686,18 @@ static const struct {
   ExifTag tag;
   struct {
     int index;
-    const char *values[4];
+    const char *values[4]; /*!< list of progressively shorter string
+                           descriptions; the longest one that fits will be
+                           selected */
   } elem[25];
 } list2[] = {
 #ifndef NO_VERBOSE_TAG_DATA
   { EXIF_TAG_METERING_MODE,
     { {  0, {N_("Unknown"), NULL}},
-      {  1, {N_("Average"), N_("avg"), NULL}},
-      {  2, {N_("Center-Weighted Average"), N_("Center-Weight"), NULL}},
+      {  1, {N_("Average"), N_("Avg"), NULL}},
+      {  2, {N_("Center-weighted average"), N_("Center-weight"), NULL}},
       {  3, {N_("Spot"), NULL}},
-      {  4, {N_("Multi Spot"), NULL}},
+      {  4, {N_("Multi spot"), NULL}},
       {  5, {N_("Pattern"), NULL}},
       {  6, {N_("Partial"), NULL}},
       {255, {N_("Other"), NULL}},
@@ -754,11 +756,11 @@ static const struct {
              "in focus)"), N_("Landscape"), NULL}},
       {0, {NULL}}}},
   { EXIF_TAG_FLASH,
-    { {0x0000, {N_("Flash did not fire"), N_("no flash"), NULL}},
-      {0x0001, {N_("Flash fired"), N_("flash"), N_("Yes"), NULL}},
-      {0x0005, {N_("Strobe return light not detected"), N_("W/o strobe"),
+    { {0x0000, {N_("Flash did not fire"), N_("No flash"), NULL}},
+      {0x0001, {N_("Flash fired"), N_("Flash"), N_("Yes"), NULL}},
+      {0x0005, {N_("Strobe return light not detected"), N_("Without strobe"),
                NULL}},
-      {0x0007, {N_("Strobe return light detected"), N_("W. strobe"), NULL}},
+      {0x0007, {N_("Strobe return light detected"), N_("With strobe"), NULL}},
       {0x0008, {N_("Flash did not fire"), NULL}}, /* Olympus E-330 */
       {0x0009, {N_("Flash fired, compulsory flash mode"), NULL}},
       {0x000d, {N_("Flash fired, compulsory flash mode, return light "
@@ -1120,7 +1122,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
                        case 4: c = _("R"); break;
                        case 5: c = _("G"); break;
                        case 6: c = _("B"); break;
-                       default: c = _("reserved"); break;
+                       default: c = _("Reserved"); break;
                        }
                        strncat (val, c, maxlen - strlen (val));
                        if (i < 3)
index bde586a..89cd0f7 100644 (file)
@@ -59,7 +59,7 @@ static const struct TagEntry {
        ExifSupportLevel esl[EXIF_IFD_COUNT][EXIF_DATA_TYPE_COUNT];
 } ExifTagTable[] = {
 #ifndef NO_VERBOSE_TAG_STRINGS
-       {EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", N_("GPS tag version"),
+       {EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", N_("GPS Tag Version"),
         N_("Indicates the version of <GPSInfoIFD>. The version is given "
            "as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is "
            "present. (Note: The <GPSVersionID> tag is given in bytes, "
@@ -100,7 +100,7 @@ static const struct TagEntry {
            "used and, for example, fractions of minutes are given up to "
            "two decimal places, the format is ddd/1,mmmm/100,0/1."),
         ESL_GPS},
-       {EXIF_TAG_GPS_ALTITUDE_REF, "GPSAltitudeRef", N_("Altitude reference"),
+       {EXIF_TAG_GPS_ALTITUDE_REF, "GPSAltitudeRef", N_("Altitude Reference"),
         N_("Indicates the altitude used as the reference altitude. If the "
            "reference is sea level and the altitude is above sea level, 0 "
            "is given. If the altitude is below sea level, a value of 1 is given "
@@ -111,58 +111,58 @@ static const struct TagEntry {
         N_("Indicates the altitude based on the reference in GPSAltitudeRef. "
            "Altitude is expressed as one RATIONAL value. The reference unit "
            "is meters."), ESL_GPS},
-       {EXIF_TAG_GPS_TIME_STAMP, "GPSTimeStamp", N_("GPS time (atomic clock)"),
+       {EXIF_TAG_GPS_TIME_STAMP, "GPSTimeStamp", N_("GPS Time (Atomic Clock)"),
          N_("Indicates the time as UTC (Coordinated Universal Time). "
            "TimeStamp is expressed as three RATIONAL values giving "
             "the hour, minute, and second."), ESL_GPS},
-       {EXIF_TAG_GPS_SATELLITES, "GPSSatellites", N_("GPS satellites used for measurement"),
+       {EXIF_TAG_GPS_SATELLITES, "GPSSatellites", N_("GPS Satellites"),
          N_("Indicates the GPS satellites used for measurements. This "
             "tag can be used to describe the number of satellites, their ID "
             "number, angle of elevation, azimuth, SNR and other information "
             "in ASCII notation. The format is not specified. If the GPS "
             "receiver is incapable of taking measurements, value of the tag "
             "shall be set to NULL."), ESL_GPS},
-       {EXIF_TAG_GPS_STATUS, "GPSStatus", N_("GPS receiver status"),
+       {EXIF_TAG_GPS_STATUS, "GPSStatus", N_("GPS Receiver Status"),
          N_("Indicates the status of the GPS receiver when the image is "
             "recorded. 'A' means measurement is in progress, and 'V' means "
             "the measurement is Interoperability."), ESL_GPS},
-       {EXIF_TAG_GPS_MEASURE_MODE, "GPSMeasureMode", N_("GPS measurement mode"),
+       {EXIF_TAG_GPS_MEASURE_MODE, "GPSMeasureMode", N_("GPS Measurement Mode"),
          N_("Indicates the GPS measurement mode. '2' means "
             "two-dimensional measurement and '3' means three-dimensional "
             "measurement is in progress."), ESL_GPS},
-       {EXIF_TAG_GPS_DOP, "GPSDOP", N_("Measurement precision"),
+       {EXIF_TAG_GPS_DOP, "GPSDOP", N_("Measurement Precision"),
          N_("Indicates the GPS DOP (data degree of precision). An HDOP "
             "value is written during two-dimensional measurement, and PDOP "
             "during three-dimensional measurement."), ESL_GPS},
-       {EXIF_TAG_GPS_SPEED_REF, "GPSSpeedRef", N_("Speed unit"),
+       {EXIF_TAG_GPS_SPEED_REF, "GPSSpeedRef", N_("Speed Unit"),
          N_("Indicates the unit used to express the GPS receiver speed "
             "of movement. 'K', 'M' and 'N' represent kilometers per hour, "
             "miles per hour, and knots."), ESL_GPS},
-       {EXIF_TAG_GPS_SPEED, "GPSSpeed", N_("Speed of GPS receiver"),
+       {EXIF_TAG_GPS_SPEED, "GPSSpeed", N_("Speed of GPS Receiver"),
         N_("Indicates the speed of GPS receiver movement."), ESL_GPS},
        {EXIF_TAG_GPS_TRACK_REF, "GPSTrackRef", N_("Reference for direction of movement"),
          N_("Indicates the reference for giving the direction of GPS "
             "receiver movement. 'T' denotes true direction and 'M' is "
             "magnetic direction."), ESL_GPS},
-       {EXIF_TAG_GPS_TRACK, "GPSTrack", N_("Direction of movement"),
+       {EXIF_TAG_GPS_TRACK, "GPSTrack", N_("Direction of Movement"),
          N_("Indicates the direction of GPS receiver movement. The range "
             "of values is from 0.00 to 359.99."), ESL_GPS},
-       {EXIF_TAG_GPS_IMG_DIRECTION_REF, "GPSImgDirectionRef", N_("GPS Img Direction Reference"),
+       {EXIF_TAG_GPS_IMG_DIRECTION_REF, "GPSImgDirectionRef", N_("GPS Image Direction Reference"),
         N_("Indicates the reference for giving the direction of the image when it is captured. "
            "'T' denotes true direction and 'M' is magnetic direction."), ESL_GPS},
-       {EXIF_TAG_GPS_IMG_DIRECTION, "GPSImgDirection", N_("GPS Img Direction"),
+       {EXIF_TAG_GPS_IMG_DIRECTION, "GPSImgDirection", N_("GPS Image Direction"),
         N_("Indicates the direction of the image when it was captured. The range of values is "
            "from 0.00 to 359.99."), ESL_GPS},
-       {EXIF_TAG_GPS_MAP_DATUM, "GPSMapDatum", N_("Geodetic survey data used"),
+       {EXIF_TAG_GPS_MAP_DATUM, "GPSMapDatum", N_("Geodetic Survey Data Used"),
          N_("Indicates the geodetic survey data used by the GPS "
             "receiver. If the survey data is restricted to Japan, the value "
             "of this tag is 'TOKYO' or 'WGS-84'. If a GPS Info tag is "
             "recorded, it is strongly recommended that this tag be recorded."), ESL_GPS},
-       {EXIF_TAG_GPS_DEST_LATITUDE_REF, "GPSDestLatitudeRef", N_("Reference for latitude of destination"),
+       {EXIF_TAG_GPS_DEST_LATITUDE_REF, "GPSDestLatitudeRef", N_("Reference For Latitude of Destination"),
          N_("Indicates whether the latitude of the destination point is "
             "north or south latitude. The ASCII value 'N' indicates north "
             "latitude, and 'S' is south latitude."), ESL_GPS},
-       {EXIF_TAG_GPS_DEST_LATITUDE, "GPSDestLatitude", N_("Latitude of destination"),
+       {EXIF_TAG_GPS_DEST_LATITUDE, "GPSDestLatitude", N_("Latitude of Destination"),
          N_("Indicates the latitude of the destination point. The "
             "latitude is expressed as three RATIONAL values giving the "
             "degrees, minutes, and seconds, respectively. If latitude is "
@@ -170,11 +170,11 @@ static const struct TagEntry {
             "would be dd/1,mm/1,ss/1. When degrees and minutes are used and, "
             "for example, fractions of minutes are given up to two decimal "
             "places, the format would be dd/1,mmmm/100,0/1."), ESL_GPS},
-       {EXIF_TAG_GPS_DEST_LONGITUDE_REF, "GPSDestLongitudeRef", N_("Reference for longitude of destination"),
+       {EXIF_TAG_GPS_DEST_LONGITUDE_REF, "GPSDestLongitudeRef", N_("Reference for Longitude of Destination"),
          N_("Indicates whether the longitude of the destination point is "
             "east or west longitude. ASCII 'E' indicates east longitude, and "
             "'W' is west longitude."), ESL_GPS},
-       {EXIF_TAG_GPS_DEST_LONGITUDE, "GPSDestLongitude", N_("Longitude of destination"),
+       {EXIF_TAG_GPS_DEST_LONGITUDE, "GPSDestLongitude", N_("Longitude of Destination"),
          N_("Indicates the longitude of the destination point. The "
             "longitude is expressed as three RATIONAL values giving the "
             "degrees, minutes, and seconds, respectively. If longitude is "
@@ -183,36 +183,36 @@ static const struct TagEntry {
             "and, for example, fractions of minutes are given up to two "
             "decimal places, the format would be ddd/1,mmmm/100,0/1."),
          ESL_GPS},
-       {EXIF_TAG_GPS_DEST_BEARING_REF, "GPSDestBearingRef", N_("Reference for bearing of destination"),
+       {EXIF_TAG_GPS_DEST_BEARING_REF, "GPSDestBearingRef", N_("Reference for Bearing of Destination"),
          N_("Indicates the reference used for giving the bearing to "
             "the destination point. 'T' denotes true direction and 'M' is "
             "magnetic direction."), ESL_GPS},
-       {EXIF_TAG_GPS_DEST_BEARING, "GPSDestBearing", N_("Bearing of destination"),
+       {EXIF_TAG_GPS_DEST_BEARING, "GPSDestBearing", N_("Bearing of Destination"),
          N_("Indicates the bearing to the destination point. The range "
             "of values is from 0.00 to 359.99."), ESL_GPS},
-       {EXIF_TAG_GPS_DEST_DISTANCE_REF, "GPSDestDistanceRef", N_("Reference for distance to destination"),
+       {EXIF_TAG_GPS_DEST_DISTANCE_REF, "GPSDestDistanceRef", N_("Reference for Distance to Destination"),
          N_("Indicates the unit used to express the distance to the "
             "destination point. 'K', 'M' and 'N' represent kilometers, miles "
             "and knots."), ESL_GPS},
-       {EXIF_TAG_GPS_DEST_DISTANCE, "GPSDestDistance", N_("Distance to destination"),
+       {EXIF_TAG_GPS_DEST_DISTANCE, "GPSDestDistance", N_("Distance to Destination"),
         N_("Indicates the distance to the destination point."), ESL_GPS},
-       {EXIF_TAG_GPS_PROCESSING_METHOD, "GPSProcessingMethod", N_("Name of GPS processing method"),
+       {EXIF_TAG_GPS_PROCESSING_METHOD, "GPSProcessingMethod", N_("Name of GPS Processing Method"),
          N_("A character string recording the name of the method used "
             "for location finding. The first byte indicates the character "
             "code used, and this is followed by the name "
             "of the method. Since the Type is not ASCII, NULL termination is "
             "not necessary."), ESL_GPS},
-       {EXIF_TAG_GPS_AREA_INFORMATION, "GPSAreaInformation", N_("Name of GPS area"),
+       {EXIF_TAG_GPS_AREA_INFORMATION, "GPSAreaInformation", N_("Name of GPS Area"),
          N_("A character string recording the name of the GPS area. The "
             "first byte indicates the character code used, "
             "and this is followed by the name of the GPS area. Since "
             "the Type is not ASCII, NULL termination is not necessary."), ESL_GPS},
-       {EXIF_TAG_GPS_DATE_STAMP, "GPSDateStamp", N_("GPS date"),
+       {EXIF_TAG_GPS_DATE_STAMP, "GPSDateStamp", N_("GPS Date"),
          N_("A character string recording date and time information "
             "relative to UTC (Coordinated Universal Time). The format is "
             "\"YYYY:MM:DD\". The length of the string is 11 bytes including "
             "NULL."), ESL_GPS},
-       {EXIF_TAG_GPS_DIFFERENTIAL, "GPSDifferential", N_("GPS differential correction"),
+       {EXIF_TAG_GPS_DIFFERENTIAL, "GPSDifferential", N_("GPS Differential Correction"),
          N_("Indicates whether differential correction is applied to the "
             "GPS receiver."), ESL_GPS},
        /* Not in EXIF 2.2 */
@@ -298,12 +298,12 @@ static const struct TagEntry {
         N_("The total number of bytes in each strip. With JPEG compressed "
            "data this designation is not needed and is omitted."),
         { ESL_MMMN, ESL_MMMN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
-       {EXIF_TAG_X_RESOLUTION, "XResolution", N_("x-Resolution"),
+       {EXIF_TAG_X_RESOLUTION, "XResolution", N_("X-Resolution"),
         N_("The number of pixels per <ResolutionUnit> in the <ImageWidth> "
            "direction. When the image resolution is unknown, 72 [dpi] "
            "is designated."),
         { ESL_MMMM, ESL_MMMM, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
-       {EXIF_TAG_Y_RESOLUTION, "YResolution", N_("y-Resolution"),
+       {EXIF_TAG_Y_RESOLUTION, "YResolution", N_("Y-Resolution"),
         N_("The number of pixels per <ResolutionUnit> in the <ImageLength> "
            "direction. The same value as <XResolution> is designated."),
         { ESL_MMMM, ESL_MMMM, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
@@ -466,7 +466,7 @@ static const struct TagEntry {
        {EXIF_TAG_EXPOSURE_TIME, "ExposureTime", N_("Exposure Time"),
         N_("Exposure time, given in seconds (sec)."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
-       {EXIF_TAG_FNUMBER, "FNumber", N_("FNumber"),
+       {EXIF_TAG_FNUMBER, "FNumber", N_("F-Number"),
         N_("The F number."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        /* Not in EXIF 2.2 */
@@ -493,7 +493,7 @@ static const struct TagEntry {
            "with the standard developed by the ASTM Technical Committee."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_GPS_INFO_IFD_POINTER, "GPSInfoIFDPointer", 
-        "GPSInfoIFDPointer",
+        N_("GPS Info IFD Pointer"),
         N_("A pointer to the GPS Info IFD. The "
            "Interoperability structure of the GPS Info IFD, like that of "
            "Exif IFD, has no image data."),
@@ -517,13 +517,13 @@ static const struct TagEntry {
            "field is taken to mean nonconformance to the standard."),
         { ESL_NNNN, ESL_NNNN, ESL_MMMM, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_DATE_TIME_ORIGINAL, "DateTimeOriginal",
-        N_("Date and Time (original)"),
+        N_("Date and Time (Original)"),
         N_("The date and time when the original image data was generated. "
            "For a digital still camera "
            "the date and time the picture was taken are recorded."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_DATE_TIME_DIGITIZED, "DateTimeDigitized",
-        N_("Date and Time (digitized)"),
+        N_("Date and Time (Digitized)"),
         N_("The date and time when the image was stored as digital data."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_COMPONENTS_CONFIGURATION, "ComponentsConfiguration",
@@ -543,7 +543,7 @@ static const struct TagEntry {
            "used for a compressed image is indicated in unit bits "
            "per pixel."),
         { ESL_NNNN, ESL_NNNN, ESL_NNNO, ESL_NNNN, ESL_NNNN } },
-       {EXIF_TAG_SHUTTER_SPEED_VALUE, "ShutterSpeedValue", N_("Shutter speed"),
+       {EXIF_TAG_SHUTTER_SPEED_VALUE, "ShutterSpeedValue", N_("Shutter Speed"),
         N_("Shutter speed. The unit is the APEX (Additive System of "
            "Photographic Exposure) setting."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
@@ -616,17 +616,17 @@ static const struct TagEntry {
            "the ID code be ASCII and that the following user comment "
            "part be filled with blank characters [20.H]."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
-       {EXIF_TAG_SUB_SEC_TIME, "SubsecTime", "SubsecTime",
+       {EXIF_TAG_SUB_SEC_TIME, "SubsecTime", N_("Sub-second Time"),
         N_("A tag used to record fractions of seconds for the "
            "<DateTime> tag."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_SUB_SEC_TIME_ORIGINAL, "SubSecTimeOriginal",
-        "SubSecTimeOriginal",
+        N_("Sub-second Time (Original)"),
         N_("A tag used to record fractions of seconds for the "
            "<DateTimeOriginal> tag."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_SUB_SEC_TIME_DIGITIZED, "SubSecTimeDigitized",
-        "SubSecTimeDigitized",
+        N_("Sub-second Time (Digitized)"),
         N_("A tag used to record fractions of seconds for the "
            "<DateTimeDigitized> tag."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
@@ -667,14 +667,14 @@ static const struct TagEntry {
            "recorded as Uncalibrated can be treated as sRGB when it is "
            "converted to FlashPix."),
         { ESL_NNNN, ESL_NNNN, ESL_MMMM, ESL_NNNN, ESL_NNNN } },
-       {EXIF_TAG_PIXEL_X_DIMENSION, "PixelXDimension", "PixelXDimension",
+       {EXIF_TAG_PIXEL_X_DIMENSION, "PixelXDimension", N_("Pixel X Dimension"),
         N_("Information specific to compressed data. When a "
            "compressed file is recorded, the valid width of the "
            "meaningful image must be recorded in this tag, whether or "
            "not there is padding data or a restart marker. This tag "
            "should not exist in an uncompressed file."),
         { ESL_NNNN, ESL_NNNN, ESL_NNNM, ESL_NNNN, ESL_NNNN } },
-       {EXIF_TAG_PIXEL_Y_DIMENSION, "PixelYDimension", "PixelYDimension",
+       {EXIF_TAG_PIXEL_Y_DIMENSION, "PixelYDimension", N_("Pixel Y Dimension"),
         N_("Information specific to compressed data. When a compressed "
            "file is recorded, the valid height of the meaningful image "
            "must be recorded in this tag, whether or not there is padding "
@@ -685,7 +685,7 @@ static const struct TagEntry {
            "will in fact be the same as that recorded in the SOF."),
         { ESL_NNNN, ESL_NNNN, ESL_NNNM, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_RELATED_SOUND_FILE, "RelatedSoundFile",
-        "RelatedSoundFile",
+        N_("Related Sound File"),
         N_("This tag is used to record the name of an audio file related "
            "to the image data. The only relational information "
            "recorded here is the Exif audio file name and extension (an "
@@ -717,7 +717,7 @@ static const struct TagEntry {
            "audio file end."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_INTEROPERABILITY_IFD_POINTER, "InteroperabilityIFDPointer",
-        "InteroperabilityIFDPointer",
+        N_("Interoperability IFD Pointer"),
         N_("Interoperability IFD is composed of tags which stores the "
            "information to ensure the Interoperability and pointed "
            "by the following tag located in Exif IFD. "
@@ -739,12 +739,12 @@ static const struct TagEntry {
            "12233."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_FOCAL_PLANE_X_RESOLUTION, "FocalPlaneXResolution",
-        N_("Focal Plane x-Resolution"),
+        N_("Focal Plane X-Resolution"),
         N_("Indicates the number of pixels in the image width (X) direction "
            "per <FocalPlaneResolutionUnit> on the camera focal plane."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION, "FocalPlaneYResolution",
-        N_("Focal Plane y-Resolution"),
+        N_("Focal Plane Y-Resolution"),
         N_("Indicates the number of pixels in the image height (V) direction "
            "per <FocalPlaneResolutionUnit> on the camera focal plane."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
@@ -809,7 +809,7 @@ static const struct TagEntry {
            "indicates that digital zoom was not used."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM, "FocalLengthIn35mmFilm",
-        N_("Focal Length In 35mm Film"),
+        N_("Focal Length in 35mm Film"),
         N_("This tag indicates the equivalent focal length assuming a "
            "35mm film camera, in mm. A value of 0 means the focal "
            "length is unknown. Note that this tag differs from the "
index 9c43d18..0ca1634 100644 (file)
@@ -73,8 +73,8 @@ static const struct {
     { {0, N_("Auto")},
       {0x100, N_("Daylight")},
       {0x200, N_("Cloudy")},
-      {0x300, N_("Daylight-color fluorescent")},
-      {0x301, N_("DayWhite-color fluorescent")},
+      {0x300, N_("Daylight fluorescent")},
+      {0x301, N_("Day white fluorescent")},
       {0x302, N_("White fluorescent")},
       {0x400, N_("Incandescent")},
       {0x500, N_("Flash")},
index eba3777..3200eb6 100644 (file)
@@ -34,7 +34,7 @@ static const struct {
 } table[] = {
 #ifndef NO_VERBOSE_TAG_STRINGS
        {MNOTE_FUJI_TAG_VERSION, "Version", N_("Maker Note Version"), ""},
-       {MNOTE_FUJI_TAG_SERIAL_NUMBER, "SerialNumber", N_("Serial Number"), N_("This number is unique, it contains the date of manufacture.")},
+       {MNOTE_FUJI_TAG_SERIAL_NUMBER, "SerialNumber", N_("Serial Number"), N_("This number is unique and based on the date of manufacture.")},
        {MNOTE_FUJI_TAG_QUALITY, "Quality", N_("Quality"), ""},
        {MNOTE_FUJI_TAG_SHARPNESS, "Sharpness", N_("Sharpness"), ""},
        {MNOTE_FUJI_TAG_WHITE_BALANCE, "WhiteBalance", N_("White Balance"), ""},
@@ -42,7 +42,7 @@ static const struct {
        {MNOTE_FUJI_TAG_TONE, "Contrast", N_("Contrast"), ""},
        {MNOTE_FUJI_TAG_FLASH_MODE, "FlashMode", N_("Flash Mode"), ""},
        {MNOTE_FUJI_TAG_FLASH_STRENGTH, "FlashStrength", N_("Flash Firing Strength Compensation"), ""},
-       {MNOTE_FUJI_TAG_MACRO, "MacroMode", N_("Macro mode"), ""},
+       {MNOTE_FUJI_TAG_MACRO, "MacroMode", N_("Macro Mode"), ""},
        {MNOTE_FUJI_TAG_FOCUS_MODE, "FocusingMode", N_("Focusing Mode"), ""},
        {MNOTE_FUJI_TAG_FOCUS_POINT, "FocusPoint", N_("Focus Point"), ""},
        {MNOTE_FUJI_TAG_SLOW_SYNC, "SlowSynchro", N_("Slow Synchro Mode"), ""},
index 828d776..9db5224 100644 (file)
@@ -86,29 +86,29 @@ static const struct {
 } items[] = {
 #ifndef NO_VERBOSE_TAG_DATA
   { MNOTE_NIKON_TAG_LENSTYPE, EXIF_FORMAT_BYTE,
-    { {0, N_("AF non D Lens")},
+    { {0, N_("AF non D lens")},
       {1, N_("Manual")},
-      {2, N_("AF-D or AF-S Lens")},
-      {6, N_("AF-D G Lens")},
-      {10, N_("AF-D VR Lens")},
-      {14, N_("AF-D G VR Lens")},
+      {2, N_("AF-D or AF-S lens")},
+      {6, N_("AF-D G lens")},
+      {10, N_("AF-D VR lens")},
+      {14, N_("AF-D G VR lens")},
       {0, NULL}}},
   { MNOTE_NIKON_TAG_FLASHUSED, EXIF_FORMAT_BYTE,
     { {0, N_("Flash did not fire")},
       {4, N_("Flash unit unknown")},
       {7, N_("Flash is external")},
-      {9, N_("Flash is on Camera")},
+      {9, N_("Flash is on camera")},
       {0, NULL}}},
   { MNOTE_NIKON1_TAG_QUALITY, EXIF_FORMAT_SHORT,
-    { {1, N_("VGA Basic")},
-      {2, N_("VGA Normal")},
-      {3, N_("VGA Fine")},
-      {4, N_("SXGA Basic")},
-      {5, N_("SXGA Normal")},
-      {6, N_("SXGA Fine")},
-      {10, N_("2 MPixel Basic")},
-      {11, N_("2 MPixel Normal")},
-      {12, N_("2 MPixel Fine")},
+    { {1, N_("VGA basic")},
+      {2, N_("VGA normal")},
+      {3, N_("VGA fine")},
+      {4, N_("SXGA basic")},
+      {5, N_("SXGA normal")},
+      {6, N_("SXGA fine")},
+      {10, N_("2 Mpixel basic")},
+      {11, N_("2 Mpixel normal")},
+      {12, N_("2 Mpixel fine")},
       {0, NULL}}},
   { MNOTE_NIKON1_TAG_COLORMODE, EXIF_FORMAT_SHORT,
     { {1, N_("Color")},
@@ -137,8 +137,8 @@ static const struct {
       {6, N_("SpeedLight")},
       {0, NULL}}},
   { MNOTE_NIKON1_TAG_CONVERTER, EXIF_FORMAT_SHORT,
-    { {0, N_("No Fisheye")},
-      {1, N_("Fisheye On")},
+    { {0, N_("No fisheye")},
+      {1, N_("Fisheye on")},
       {0, NULL}}},
   { MNOTE_OLYMPUS_TAG_QUALITY, EXIF_FORMAT_SHORT,
     { {1, N_("Normal, SQ")},
@@ -168,7 +168,7 @@ static const struct {
   { MNOTE_OLYMPUS_TAG_MACRO, EXIF_FORMAT_SHORT,
     { {0, N_("No")},
       {1, N_("Yes")},
-      {2, N_("Super Macro")},
+      {2, N_("Super macro")},
       {0, NULL}}},
   { MNOTE_OLYMPUS_TAG_BWMODE, EXIF_FORMAT_SHORT,
     { {0, N_("No")},
@@ -189,7 +189,7 @@ static const struct {
     { {0, N_("None")},
       {1, N_("Internal")},
       {4, N_("External")},
-      {5, N_("Internal + External")},
+      {5, N_("Internal + external")},
       {0, NULL}}},
   { MNOTE_OLYMPUS_TAG_FOCUSRANGE, EXIF_FORMAT_SHORT,
     { {0, N_("Normal")},
@@ -226,11 +226,11 @@ static const struct {
     { {0, N_("None")},
       {1, N_("Standard")},
       {2, N_("Best")},
-      {3, N_("Adjust Exposure")},
+      {3, N_("Adjust exposure")},
       {0, NULL}}},
   { MNOTE_SANYO_TAG_FOCUSMODE, EXIF_FORMAT_SHORT,
-    { {1, N_("Spot Focus")},
-      {2, N_("Normal Focus")},
+    { {1, N_("Spot focus")},
+      {2, N_("Normal focus")},
       {0, NULL}}},
   { MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE, EXIF_FORMAT_SHORT,
     { {0, N_("Record while down")},
@@ -372,7 +372,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                r = (double)vr.numerator / vr.denominator;
                vr = exif_get_rational (entry->data+8, entry->order);
                b = (double)vr.numerator / vr.denominator;
-               snprintf (v, maxlen, _("Red Correction %f, Blue Correction %f"), r,b);
+               snprintf (v, maxlen, _("Red Correction %f, blue Correction %f"), r,b);
                break;
        case MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE:
                CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
@@ -408,18 +408,18 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
                CC (entry->components, 4, v, maxlen);
                switch (  *( entry->data+1)  ) {
-                       case  0: strncpy (v, _("AF Position: Center"), maxlen); break;
-                       case  1: strncpy (v, _("AF Position: Top"), maxlen); break;
-                       case  2: strncpy (v, _("AF Position: Bottom"), maxlen); break;
-                       case  3: strncpy (v, _("AF Position: Left"), maxlen); break;
-                       case  4: strncpy (v, _("AF Position: Right"), maxlen); break;
-                       case  5: strncpy (v, _("AF Position: Upper-left"), maxlen); break;
-                       case  6: strncpy (v, _("AF Position: Upper-right"), maxlen); break;
-                       case  7: strncpy (v, _("AF Position: Lower-left"), maxlen); break;
-                       case  8: strncpy (v, _("AF Position: Lower-right"), maxlen); break;
-                       case  9: strncpy (v, _("AF Position: Far Left"), maxlen); break;
-                       case  10: strncpy (v, _("AF Position: Far Right"), maxlen); break;
-                       default: strncpy (v, _("Unknown AF Position"), maxlen);
+                       case  0: strncpy (v, _("AF position: center"), maxlen); break;
+                       case  1: strncpy (v, _("AF position: top"), maxlen); break;
+                       case  2: strncpy (v, _("AF position: bottom"), maxlen); break;
+                       case  3: strncpy (v, _("AF position: left"), maxlen); break;
+                       case  4: strncpy (v, _("AF position: right"), maxlen); break;
+                       case  5: strncpy (v, _("AF position: upper-left"), maxlen); break;
+                       case  6: strncpy (v, _("AF position: upper-right"), maxlen); break;
+                       case  7: strncpy (v, _("AF position: lower-left"), maxlen); break;
+                       case  8: strncpy (v, _("AF position: lower-right"), maxlen); break;
+                       case  9: strncpy (v, _("AF position: far left"), maxlen); break;
+                       case  10: strncpy (v, _("AF position: far right"), maxlen); break;
+                       default: strncpy (v, _("Unknown AF position"), maxlen);
                }     
                break;
        case MNOTE_OLYMPUS_TAG_FLASHDEVICE:
@@ -583,16 +583,16 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                vl = exif_get_long (entry->data, entry->order);
                switch (vl) {
                case 0:
-                       strncpy (v, _("normal"), maxlen);
+                       strncpy (v, _("Normal"), maxlen);
                        break;
                case 1:
-                       strncpy (v, _("unknown"), maxlen);
+                       strncpy (v, _("Unknown"), maxlen);
                        break;
                case 2:
-                       strncpy (v, _("fast"), maxlen);
+                       strncpy (v, _("Fast"), maxlen);
                        break;
                case 3:
-                       strncpy (v, _("panorama"), maxlen);
+                       strncpy (v, _("Panorama"), maxlen);
                        break;
                default:
                        snprintf (v, maxlen, "%li", (long int) vl);
@@ -603,16 +603,16 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                vl = exif_get_long (entry->data + 8, entry->order);
                switch (vl) {
                case 1:
-                       strncat (v, _("left to right"), maxlen - strlen (v));
+                       strncat (v, _("Left to right"), maxlen - strlen (v));
                        break;
                case 2:
-                       strncat (v, _("right to left"), maxlen - strlen (v));
+                       strncat (v, _("Right to left"), maxlen - strlen (v));
                        break;
                case 3:
-                       strncat (v, _("bottom to top"), maxlen - strlen (v));
+                       strncat (v, _("Bottom to top"), maxlen - strlen (v));
                        break;
                case 4:
-                       strncat (v, _("top to bottom"), maxlen - strlen (v));
+                       strncat (v, _("Top to bottom"), maxlen - strlen (v));
                        break;
                default:
                        snprintf (buf, sizeof (buf), "%li",
@@ -726,7 +726,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                                        snprintf (v, maxlen, _("Manual: %liK"), colorTemp);
                                }
                                else {
-                                       strncpy (v, _("Manual: Unknown"), maxlen);
+                                       strncpy (v, _("Manual: unknown"), maxlen);
                                }
 
                        }
index 1250d24..6e811b5 100644 (file)
@@ -36,63 +36,63 @@ static const struct {
        /* Nikon v2 */
        {MNOTE_NIKON_TAG_FIRMWARE,     "Firmware", N_("Firmware Version"), ""},
        {MNOTE_NIKON_TAG_ISO,          "ISO", N_("ISO Setting"), ""},
-       {MNOTE_NIKON_TAG_COLORMODE1,   "COLORMODE1", N_("Color Mode (?)"), ""},
-       {MNOTE_NIKON_TAG_QUALITY,      "QUALITY", N_("Quality"), ""},
-       {MNOTE_NIKON_TAG_WHITEBALANCE, "WHITEBALANCE", N_("White Balance"), ""},
-       {MNOTE_NIKON_TAG_SHARPENING,   "SHARPENING",   N_("Image Sharpening"), ""},
-       {MNOTE_NIKON_TAG_FOCUSMODE,    "FOCUSMODE",   N_("Focus Mode"), ""},
-       {MNOTE_NIKON_TAG_FLASHSETTING, "FLASHSETTING",   N_("Flash Setting"), ""},
-       {MNOTE_NIKON_TAG_FLASHMODE,    "FLASHMODE",    N_("Flash Mode"), ""},
-       {MNOTE_NIKON_TAG_WHITEBALANCEFINE,"WHITEBALANCEFINE",N_("White Balance Fine Adjustment"), ""},
-       {MNOTE_NIKON_TAG_WHITEBALANCERB,  "WHITEBALANCERB", N_("White Balance RB"), ""},
+       {MNOTE_NIKON_TAG_COLORMODE1,   "ColorMode1", N_("Color Mode (?)"), ""},
+       {MNOTE_NIKON_TAG_QUALITY,      "Quality", N_("Quality"), ""},
+       {MNOTE_NIKON_TAG_WHITEBALANCE, "WhiteBalance", N_("White Balance"), ""},
+       {MNOTE_NIKON_TAG_SHARPENING,   "Sharpening",   N_("Image Sharpening"), ""},
+       {MNOTE_NIKON_TAG_FOCUSMODE,    "FocusMode",   N_("Focus Mode"), ""},
+       {MNOTE_NIKON_TAG_FLASHSETTING, "FlashSetting",   N_("Flash Setting"), ""},
+       {MNOTE_NIKON_TAG_FLASHMODE,    "FlashMode",    N_("Flash Mode"), ""},
+       {MNOTE_NIKON_TAG_WHITEBALANCEFINE,"WhiteBalanceFine",N_("White Balance Fine Adjustment"), ""},
+       {MNOTE_NIKON_TAG_WHITEBALANCERB,  "WhiteBalanceRB", N_("White Balance RB"), ""},
        {MNOTE_NIKON_TAG_UNKNOWN_0X000D,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_ISOSELECTION,    "ISOSELECTION", N_("ISO Selection"), ""},
-       {MNOTE_NIKON_TAG_PREVIEWIMAGE_IFD_POINTER, "PREVIEWIMAGE", N_("Preview Image IFD"), ""},
-       {MNOTE_NIKON_TAG_EXPOSUREDIFF,    "EXPOSUREDIFF", N_("Exposurediff ?"), ""},
-       {MNOTE_NIKON_TAG_FLASHEXPCOMPENSATION, "FLASHEXPCOMPENSATION", N_("Flash Exposure Compensation"), ""},
+       {MNOTE_NIKON_TAG_ISOSELECTION,    "ISOSelection", N_("ISO Selection"), ""},
+       {MNOTE_NIKON_TAG_PREVIEWIMAGE_IFD_POINTER, "PreviewImage", N_("Preview Image IFD"), ""},
+       {MNOTE_NIKON_TAG_EXPOSUREDIFF,    "ExposureDiff", N_("Exposurediff ?"), ""},
+       {MNOTE_NIKON_TAG_FLASHEXPCOMPENSATION, "FlashExpCompensation", N_("Flash Exposure Compensation"), ""},
        {MNOTE_NIKON_TAG_ISO2,            "ISO", N_("ISO Setting"), ""},
-       {MNOTE_NIKON_TAG_IMAGEBOUNDARY,   "IMAGEBOUNDARY", N_("Image Boundary"), ""},
+       {MNOTE_NIKON_TAG_IMAGEBOUNDARY,   "ImageBoundary", N_("Image Boundary"), ""},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0017,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_FLASHEXPOSUREBRACKETVAL,  "FLASHEXPOSUREBRACKETVAL", N_("Flash Exposure Bracket Value"), ""},
-       {MNOTE_NIKON_TAG_EXPOSUREBRACKETVAL,  "EXPOSUREBRACKETVAL", N_("Exposure Bracket Value"), ""},
+       {MNOTE_NIKON_TAG_FLASHEXPOSUREBRACKETVAL,  "FlashExposureBracketVal", N_("Flash Exposure Bracket Value"), ""},
+       {MNOTE_NIKON_TAG_EXPOSUREBRACKETVAL,  "ExposureBracketVal", N_("Exposure Bracket Value"), ""},
        {MNOTE_NIKON_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), ""},
-       {MNOTE_NIKON_TAG_TONECOMPENSATION, "TONECOMPENSATION", N_("Tone Compensation"), ""},
-       {MNOTE_NIKON_TAG_ADAPTER,         "ADAPTER", N_("Adapter"), ""},
-       {MNOTE_NIKON_TAG_LENSTYPE,        "LENSTYPE", N_("Lens Type"), ""},
-       {MNOTE_NIKON_TAG_LENS,            "LENS", N_("Lens"), ""},
-       {MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE, "MANUALFOCUSDISTANCE", N_("Manual Focus Distance"), ""},
+       {MNOTE_NIKON_TAG_TONECOMPENSATION, "ToneCompensation", N_("Tone Compensation"), ""},
+       {MNOTE_NIKON_TAG_ADAPTER,         "Adapter", N_("Adapter"), ""},
+       {MNOTE_NIKON_TAG_LENSTYPE,        "LensType", N_("Lens Type"), ""},
+       {MNOTE_NIKON_TAG_LENS,            "Lens", N_("Lens"), ""},
+       {MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE, "ManualFocusDistance", N_("Manual Focus Distance"), ""},
        {MNOTE_NIKON_TAG_DIGITALZOOM,     "DigitalZoom", N_("Digital Zoom"), ""},
-       {MNOTE_NIKON_TAG_FLASHUSED,       "FLASHUSED", N_("Flash Used"), ""},
-       {MNOTE_NIKON_TAG_AFFOCUSPOSITION, "AFFOCUSPOSITION", N_("AF Focus Position"), ""},
-       {MNOTE_NIKON_TAG_BRACKETING,      "BRACKETING", N_("Bracketing"), ""},
+       {MNOTE_NIKON_TAG_FLASHUSED,       "FlashUsed", N_("Flash Used"), ""},
+       {MNOTE_NIKON_TAG_AFFOCUSPOSITION, "AFFocusPosition", N_("AF Focus Position"), ""},
+       {MNOTE_NIKON_TAG_BRACKETING,      "Bracketing", N_("Bracketing"), ""},
        {MNOTE_NIKON_TAG_UNKNOWN_0X008A,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_LENS_FSTOPS,     "LENSFSTOPS", N_("Lens F Stops"), ""},
-       {MNOTE_NIKON_TAG_CURVE,           "CURVE,", N_("Contrast Curve"), ""},
-       {MNOTE_NIKON_TAG_COLORMODE,       "COLORMODE,", N_("Color Mode"), ""},
-       {MNOTE_NIKON_TAG_LIGHTTYPE,       "LIGHTTYPE,", N_("Light Type"), ""},
+       {MNOTE_NIKON_TAG_LENS_FSTOPS,     "LensFStops", N_("Lens F Stops"), ""},
+       {MNOTE_NIKON_TAG_CURVE,           "Curve,", N_("Contrast Curve"), ""},
+       {MNOTE_NIKON_TAG_COLORMODE,       "ColorMode,", N_("Color Mode"), ""},
+       {MNOTE_NIKON_TAG_LIGHTTYPE,       "LightType,", N_("Light Type"), ""},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0091,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_HUE,             "HUE", N_("Hue Adjustment"), ""},
-       {MNOTE_NIKON_TAG_SATURATION,      "SATURATION", N_("Saturation"), ""},
-       {MNOTE_NIKON_TAG_NOISEREDUCTION,  "NOISEREDUCTION,", N_("Noisereduction"), ""},
+       {MNOTE_NIKON_TAG_HUE,             "Hue", N_("Hue Adjustment"), ""},
+       {MNOTE_NIKON_TAG_SATURATION,      "Saturation", N_("Saturation"), ""},
+       {MNOTE_NIKON_TAG_NOISEREDUCTION,  "NoiseReduction,", N_("Noise Reduction"), ""},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0097,  NULL, NULL, NULL},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0098,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_SENSORPIXELSIZE, "SENSORPIXELSIZE", N_("Sensor Pixel Size"), ""},
+       {MNOTE_NIKON_TAG_SENSORPIXELSIZE, "SensorPixelSize", N_("Sensor Pixel Size"), ""},
        {MNOTE_NIKON_TAG_UNKNOWN_0X009B,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_SERIALNUMBER,    "SERIALNUMBER", N_("Serial Number"), ""},
-       {MNOTE_NIKON_TAG_IMAGE_DATASIZE,  "IMAGEDATASIZE", N_("Image Datasize"), N_("Size of compressed image data in bytes.")},
+       {MNOTE_NIKON_TAG_SERIALNUMBER,    "SerialNumber", N_("Serial Number"), ""},
+       {MNOTE_NIKON_TAG_IMAGE_DATASIZE,  "ImageDataSize", N_("Image Data Size"), N_("Size of compressed image data in bytes.")},
        {MNOTE_NIKON_TAG_UNKNOWN_0X00A3,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_TOTALPICTURES,   "TOTALPICTURES,", N_("Total Number of Pictures Taken"), ""},
+       {MNOTE_NIKON_TAG_TOTALPICTURES,   "TotalPictures,", N_("Total Number of Pictures Taken"), ""},
        {MNOTE_NIKON_TAG_UNKNOWN_0X00A8,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_OPTIMIZATION,    "OPTIMIZATION,", N_("Optimize Image"), ""},
-       {MNOTE_NIKON_TAG_SATURATION,      "SATURATION", N_("Saturation"), ""},
-       {MNOTE_NIKON_TAG_VARIPROGRAM,     "VARIPROGRAM", N_("Vari Program"), ""},
-       {MNOTE_NIKON_TAG_CAPTUREEDITORDATA, "CAPTUREEDITORDATA", N_("Capture Editor Data"), ""},
-       {MNOTE_NIKON_TAG_CAPTUREEDITORVER, "CAPTUREEDITORVER", N_("Capture Editor Version"), ""},
+       {MNOTE_NIKON_TAG_OPTIMIZATION,    "Optimization,", N_("Optimize Image"), ""},
+       {MNOTE_NIKON_TAG_SATURATION,      "Saturation", N_("Saturation"), ""},
+       {MNOTE_NIKON_TAG_VARIPROGRAM,     "VariProgram", N_("Vari Program"), ""},
+       {MNOTE_NIKON_TAG_CAPTUREEDITORDATA, "CaptureEditorData", N_("Capture Editor Data"), ""},
+       {MNOTE_NIKON_TAG_CAPTUREEDITORVER, "CaptureEditorVer", N_("Capture Editor Version"), ""},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0E0E,  NULL, NULL, NULL},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0E10,  NULL, NULL, NULL},
        {MNOTE_NIKON1_TAG_UNKNOWN_0X0002, NULL, NULL, NULL},
-       {MNOTE_NIKON1_TAG_QUALITY,        "QUALITY", N_("Quality"), ""},
-       {MNOTE_NIKON1_TAG_COLORMODE,      "COLORMODE,", N_("Color Mode"), ""},
+       {MNOTE_NIKON1_TAG_QUALITY,        "Quality", N_("Quality"), ""},
+       {MNOTE_NIKON1_TAG_COLORMODE,      "ColorMode,", N_("Color Mode"), ""},
        {MNOTE_NIKON1_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), ""},
        {MNOTE_NIKON1_TAG_CCDSENSITIVITY, "CCDSensitivity", N_("CCD Sensitivity"), ""},
        {MNOTE_NIKON1_TAG_WHITEBALANCE,   "WhiteBalance", N_("White Balance"), ""},
@@ -106,7 +106,7 @@ static const struct {
        {MNOTE_OLYMPUS_TAG_MODE, "Mode", N_("Speed/Sequence/Panorama Direction"), ""},
        {MNOTE_OLYMPUS_TAG_QUALITY, "Quality", N_("Quality"), ""},
        {MNOTE_OLYMPUS_TAG_MACRO, "Macro", N_("Macro"), ""},
-       {MNOTE_OLYMPUS_TAG_BWMODE, "BWMode", N_("B&W Mode"), ""},
+       {MNOTE_OLYMPUS_TAG_BWMODE, "BWMode", N_("Black & White Mode"), ""},
        {MNOTE_OLYMPUS_TAG_DIGIZOOM, "DigiZoom", N_("Digital Zoom"), ""},
        {MNOTE_OLYMPUS_TAG_FOCALPLANEDIAGONAL, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"), ""},
        {MNOTE_OLYMPUS_TAG_LENSDISTORTION, "LensDistortionParams", N_("Lens Distortion Parameters"), ""},
@@ -172,7 +172,7 @@ static const struct {
        {MNOTE_SANYO_TAG_COLORADJUSTMENTMODE, "ColorAdjustmentMode", N_("Color Adjustment Mode"), ""},
        {MNOTE_SANYO_TAG_FOCUSMODE, "FocusMode", N_("Focus Mode"), ""},
        {MNOTE_SANYO_TAG_QUICKSHOT, "QuickShot", N_("Quick Shot"), ""},
-       {MNOTE_SANYO_TAG_SELFTIMER, "SelfTimer", N_("Self Timer"), ""},
+       {MNOTE_SANYO_TAG_SELFTIMER, "SelfTimer", N_("Self-timer"), ""},
        {MNOTE_SANYO_TAG_VOICEMEMO, "VoiceMemo", N_("Voice Memo"), ""},
        {MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE, "RecordShutterRelease", N_("Record Shutter Release"), ""},
        {MNOTE_SANYO_TAG_FLICKERREDUCE, "FlickerReduce", N_("Flicker Reduce"), ""},
index 1a2c1ae..7e97c2c 100644 (file)
@@ -75,7 +75,7 @@ static const struct {
 #ifndef NO_VERBOSE_TAG_DATA
   { MNOTE_PENTAX_TAG_MODE,
     { {0, N_("Auto")},
-      {1, N_("Night-scene")},
+      {1, N_("Night scene")},
       {2, N_("Manual")},
       {4, N_("Multi-exposure")},
       {0, NULL}}},
@@ -91,7 +91,7 @@ static const struct {
     { {1, N_("Auto")},
       {2, N_("Flash on")},
       {4, N_("Flash off")},
-      {6, N_("Red-eye Reduction")},
+      {6, N_("Red-eye reduction")},
       {0, NULL}}},
   { MNOTE_PENTAX_TAG_WHITE_BALANCE,
     { {0, N_("Auto")},
@@ -124,12 +124,12 @@ static const struct {
       { 0,  NULL}}},
   { MNOTE_PENTAX_TAG_COLOR,
     { {1, N_("Full")},
-      {2, N_("Black & White")},
+      {2, N_("Black & white")},
       {3, N_("Sepia")},
       {0, NULL}}},
   { MNOTE_PENTAX2_TAG_MODE,
     { {0, N_("Auto")},
-      {1, N_("Night-scene")},
+      {1, N_("Night scene")},
       {2, N_("Manual")},
       {4, N_("Multi-exposure")},
       {0, NULL}}},
@@ -166,50 +166,50 @@ static const struct {
       {5, N_("Portrait")},
       {6, N_("Landscape")},
       {8, N_("Sport")},
-      {9, N_("Night Scene")},
+      {9, N_("Night scene")},
       {11, N_("Soft")},
-      {12, N_("Surf & Snow")},
-      {13, N_("Sunset or Candlelight")},
+      {12, N_("Surf & snow")},
+      {13, N_("Sunset or candlelight")},
       {14, N_("Autumn")},
       {15, N_("Macro")},
       {17, N_("Fireworks")},
       {18, N_("Text")},
       {19, N_("Panorama")},
-      {30, N_("Self Portrait")},
+      {30, N_("Self portrait")},
       {31, N_("Illustrations")},
-      {33, N_("Digital Filter")},
+      {33, N_("Digital filter")},
       {37, N_("Museum")},
       {38, N_("Food")},
-      {40, N_("Green Mode")},
-      {49, N_("Light Pet")},
-      {50, N_("Dark Pet")},
-      {51, N_("Medium Pet")},
+      {40, N_("Green mode")},
+      {49, N_("Light pet")},
+      {50, N_("Dark pet")},
+      {51, N_("Medium pet")},
       {53, N_("Underwater")},
       {54, N_("Candlelight")},
-      {55, N_("Natural Skin Tone")},
-      {56, N_("Synchro Sound Record")},
-      {58, N_("Frame Composite")},
+      {55, N_("Natural skin tone")},
+      {56, N_("Synchro sound record")},
+      {58, N_("Frame composite")},
       {0, NULL}}},
   { MNOTE_PENTAX2_TAG_FLASH_MODE,
-    { {0x0000, N_("Auto, Did not fire")},
+    { {0x0000, N_("Auto, did not fire")},
       {0x0001, N_("Off")},
-      {0x0003, N_("Auto, Did not fire, Red-eye reduction")},
-      {0x0100, N_("Auto, Fired")},
+      {0x0003, N_("Auto, did not fire, red-eye reduction")},
+      {0x0100, N_("Auto, fired")},
       {0x0102, N_("On")},
-      {0x0103, N_("Auto, Fired, Red-eye reduction")},
-      {0x0104, N_("On, Red-eye reduction")},
-      {0x0105, N_("On, Wireless")},
-      {0x0108, N_("On, Soft")},
-      {0x0109, N_("On, Slow-sync")},
-      {0x010a, N_("On, Slow-sync, Red-eye reduction")},
-      {0x010b, N_("On, Trailing-curtain Sync")},
+      {0x0103, N_("Auto, fired, red-eye reduction")},
+      {0x0104, N_("On, red-eye reduction")},
+      {0x0105, N_("On, wireless")},
+      {0x0108, N_("On, soft")},
+      {0x0109, N_("On, slow-sync")},
+      {0x010a, N_("On, slow-sync, red-eye reduction")},
+      {0x010b, N_("On, trailing-curtain sync")},
       {0, NULL}}},
   { MNOTE_PENTAX2_TAG_FOCUS_MODE,
     { {0, N_("Normal")},
       {1, N_("Macro")},
       {2, N_("Infinity")},
       {3, N_("Manual")},
-      {5, N_("Pan Focus")},
+      {5, N_("Pan focus")},
       {16, N_("AF-S")},
       {17, N_("AF-C")},
       {0, NULL}}},
@@ -225,7 +225,7 @@ static const struct {
       {9, N_("Lower-left")},
       {10, N_("Bottom")},
       {11, N_("Lower-right")},
-      {0xfffe, N_("Fixed Center")},
+      {0xfffe, N_("Fixed center")},
       {0xffff, N_("Auto")},
       {0, NULL}}},
   { MNOTE_PENTAX2_TAG_AUTO_AFPOINT,
@@ -248,13 +248,13 @@ static const struct {
       {3, N_("Fluorescent")},
       {4, N_("Tungsten")},
       {5, N_("Manual")},
-      {6, N_("Daylight Fluorescent")},
-      {7, N_("Daywhite Fluorescent")},
-      {8, N_("White Fluorescent")},
+      {6, N_("Daylight fluorescent")},
+      {7, N_("Day white fluorescent")},
+      {8, N_("White fluorescent")},
       {9, N_("Flash")},
       {10, N_("Cloudy")},
       {0xfffe, N_("Unknown")},
-      {0xffff, N_("User Selected")},
+      {0xffff, N_("User selected")},
       {0, NULL}}},
   {MNOTE_CASIO2_TAG_BESTSHOT_MODE, 
     { {0, N_("Off")},
@@ -290,9 +290,9 @@ static const struct {
     { {0,   0, N_("Auto")},
       {5,   0, N_("Portrait")},
       {53,  0, N_("Underwater")},
-      {255, 0, N_("Digital Filter?")},
+      {255, 0, N_("Digital filter?")},
       {5,   1, N_("Portrait")},
-      {9,   1, N_("Night Scene")},
+      {9,   1, N_("Night scene")},
       {13,  1, N_("Candlelight")},
       {15,  1, N_("Macro")},
       {53,  1, N_("Underwater")},
index 20afbbe..740f135 100644 (file)
@@ -51,7 +51,7 @@ static const struct {
        {MNOTE_PENTAX_TAG_UNKNOWN_17, NULL, NULL, NULL},
        {MNOTE_PENTAX_TAG_UNKNOWN_18, NULL, NULL, NULL},
        {MNOTE_PENTAX_TAG_UNKNOWN_19, NULL, NULL, NULL},
-       {MNOTE_PENTAX_TAG_ISO_SPEED, "ISOSpeed", N_("ISOSpeed"), ""},
+       {MNOTE_PENTAX_TAG_ISO_SPEED, "ISOSpeed", N_("ISO Speed"), ""},
        {MNOTE_PENTAX_TAG_UNKNOWN_21, NULL, NULL, NULL},
        {MNOTE_PENTAX_TAG_COLOR, "Color", N_("Colors"), ""},
        {MNOTE_PENTAX_TAG_UNKNOWN_24, NULL, NULL, NULL},
@@ -69,7 +69,7 @@ static const struct {
        {MNOTE_PENTAX2_TAG_TIME, "Time", N_("Time"), ""},
        {MNOTE_PENTAX2_TAG_QUALITY, "Quality", N_("Quality Level"), ""},
        {MNOTE_PENTAX2_TAG_IMAGE_SIZE, "ImageSize", N_("Image Size"), ""},
-       {MNOTE_PENTAX2_TAG_PICTURE_MODE, "PictureMode", N_("PictureMode"), ""},
+       {MNOTE_PENTAX2_TAG_PICTURE_MODE, "PictureMode", N_("Picture Mode"), ""},
        {MNOTE_PENTAX2_TAG_FLASH_MODE, "FlashMode", N_("Flash Mode"), ""},
        {MNOTE_PENTAX2_TAG_FOCUS_MODE, "FocusMode", N_("Focus Mode"), ""},
        {MNOTE_PENTAX2_TAG_AFPOINT_SELECTED, "AFPointSelected", N_("AF Point Selected"), ""},
@@ -125,7 +125,7 @@ static const struct {
        {MNOTE_CASIO2_TAG_OBJECT_DISTANCE, "ObjectDistance", N_("Object Distance"), N_("Distance of photographed object in millimeters.")},
        {MNOTE_CASIO2_TAG_FLASH_DISTANCE, "FlashDistance", N_("Flash Distance"), ""},
        {MNOTE_CASIO2_TAG_RECORD_MODE, "RecordMode", N_("Record Mode"), ""},
-       {MNOTE_CASIO2_TAG_SELF_TIMER, "SelfTimer", N_("Self Timer"), ""},
+       {MNOTE_CASIO2_TAG_SELF_TIMER, "SelfTimer", N_("Self-timer"), ""},
        {MNOTE_CASIO2_TAG_QUALITY, "CasioQuality", N_("Quality Level"), ""},
        {MNOTE_CASIO2_TAG_FOCUS_MODE, "CasioFocusMode", N_("Focus Mode"), ""},
        {MNOTE_CASIO2_TAG_TIME_ZONE, "TimeZone", N_("Time Zone"), ""},