From a4181636f85cb2c3ad9721014280cfe59866de9b Mon Sep 17 00:00:00 2001 From: Jan Patera Date: Sun, 18 Jan 2009 10:38:29 +0100 Subject: [PATCH] Consistency: all tag titles are capitalized --- libexif/canon/mnote-canon-tag.c | 136 +++++++++++++++++----------------- libexif/fuji/mnote-fuji-tag.c | 2 +- libexif/olympus/mnote-olympus-entry.c | 48 ++++++------ libexif/olympus/mnote-olympus-tag.c | 48 ++++++------ libexif/olympus/mnote-olympus-tag.h | 2 +- 5 files changed, 118 insertions(+), 118 deletions(-) diff --git a/libexif/canon/mnote-canon-tag.c b/libexif/canon/mnote-canon-tag.c index 447caab..da95ad2 100644 --- a/libexif/canon/mnote-canon-tag.c +++ b/libexif/canon/mnote-canon-tag.c @@ -32,17 +32,17 @@ static const struct { const char *description; } table[] = { #ifndef NO_VERBOSE_TAG_STRINGS - {MNOTE_CANON_TAG_SETTINGS_1, "Settings1", N_("Settings (first part)"), ""}, - {MNOTE_CANON_TAG_FOCAL_LENGTH, "FocalLength", N_("Focal length"), ""}, - {MNOTE_CANON_TAG_SETTINGS_2, "Settings2", N_("Settings (second part)"), ""}, + {MNOTE_CANON_TAG_SETTINGS_1, "Settings1", N_("Settings (First Part)"), ""}, + {MNOTE_CANON_TAG_FOCAL_LENGTH, "FocalLength", N_("Focal Length"), ""}, + {MNOTE_CANON_TAG_SETTINGS_2, "Settings2", N_("Settings (Second Part)"), ""}, {MNOTE_CANON_TAG_PANORAMA, "Panorama", N_("Panorama"), ""}, - {MNOTE_CANON_TAG_IMAGE_TYPE, "ImageType", N_("Image type"), ""}, - {MNOTE_CANON_TAG_FIRMWARE, "FirmwareVersion", N_("Firmware version"), ""}, - {MNOTE_CANON_TAG_IMAGE_NUMBER, "ImageNumber", N_("Image number"), ""}, - {MNOTE_CANON_TAG_OWNER, "OwnerName", N_("Owner name"), ""}, - {MNOTE_CANON_TAG_COLOR_INFORMATION, "ColorInformation", N_("Color information"), ""}, - {MNOTE_CANON_TAG_SERIAL_NUMBER, "SerialNumber", N_("Serial number"), ""}, - {MNOTE_CANON_TAG_CUSTOM_FUNCS, "CustomFunctions", N_("Custom functions"), ""}, + {MNOTE_CANON_TAG_IMAGE_TYPE, "ImageType", N_("Image Type"), ""}, + {MNOTE_CANON_TAG_FIRMWARE, "FirmwareVersion", N_("Firmware Version"), ""}, + {MNOTE_CANON_TAG_IMAGE_NUMBER, "ImageNumber", N_("Image Number"), ""}, + {MNOTE_CANON_TAG_OWNER, "OwnerName", N_("Owner Name"), ""}, + {MNOTE_CANON_TAG_COLOR_INFORMATION, "ColorInformation", N_("Color Information"), ""}, + {MNOTE_CANON_TAG_SERIAL_NUMBER, "SerialNumber", N_("Serial Number"), ""}, + {MNOTE_CANON_TAG_CUSTOM_FUNCS, "CustomFunctions", N_("Custom Functions"), ""}, #endif {0, NULL, NULL, NULL} }; @@ -53,75 +53,75 @@ static const struct { const char *name; } table_sub[] = { #ifndef NO_VERBOSE_TAG_STRINGS - {MNOTE_CANON_TAG_SETTINGS_1, 0, N_("Macro mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 0, N_("Macro Mode")}, {MNOTE_CANON_TAG_SETTINGS_1, 1, N_("Self-timer")}, {MNOTE_CANON_TAG_SETTINGS_1, 2, N_("Quality")}, - {MNOTE_CANON_TAG_SETTINGS_1, 3, N_("Flash mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 4, N_("Drive mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 6, N_("Focus mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 8, N_("Record mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 9, N_("Image size")}, - {MNOTE_CANON_TAG_SETTINGS_1, 10, N_("Easy shooting mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 11, N_("Digital zoom")}, + {MNOTE_CANON_TAG_SETTINGS_1, 3, N_("Flash Mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 4, N_("Drive Mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 6, N_("Focus Mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 8, N_("Record Mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 9, N_("Image Size")}, + {MNOTE_CANON_TAG_SETTINGS_1, 10, N_("Easy Shooting Mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 11, N_("Digital Zoom")}, {MNOTE_CANON_TAG_SETTINGS_1, 12, N_("Contrast")}, {MNOTE_CANON_TAG_SETTINGS_1, 13, N_("Saturation")}, {MNOTE_CANON_TAG_SETTINGS_1, 14, N_("Sharpness")}, {MNOTE_CANON_TAG_SETTINGS_1, 15, N_("ISO")}, - {MNOTE_CANON_TAG_SETTINGS_1, 16, N_("Metering mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 17, N_("Focus range")}, - {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("AF point")}, - {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("Exposure mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 21, N_("Lens type")}, - {MNOTE_CANON_TAG_SETTINGS_1, 22, N_("Long focal length of lens")}, - {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Short focal length of lens")}, - {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Focal units per mm")}, - {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Maximal aperture")}, - {MNOTE_CANON_TAG_SETTINGS_1, 26, N_("Minimal aperture")}, - {MNOTE_CANON_TAG_SETTINGS_1, 27, N_("Flash activity")}, - {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash details")}, - {MNOTE_CANON_TAG_SETTINGS_1, 31, N_("Focus mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 32, N_("AE setting")}, - {MNOTE_CANON_TAG_SETTINGS_1, 33, N_("Image stabilization")}, - {MNOTE_CANON_TAG_SETTINGS_1, 34, N_("Display aperture")}, - {MNOTE_CANON_TAG_SETTINGS_1, 35, N_("Zoom source width")}, - {MNOTE_CANON_TAG_SETTINGS_1, 36, N_("Zoom target width")}, - {MNOTE_CANON_TAG_SETTINGS_1, 39, N_("Photo effect")}, - {MNOTE_CANON_TAG_SETTINGS_1, 40, N_("Manual flash output")}, - {MNOTE_CANON_TAG_SETTINGS_1, 41, N_("Color tone")}, - {MNOTE_CANON_TAG_FOCAL_LENGTH, 0, N_("Focal type")}, - {MNOTE_CANON_TAG_FOCAL_LENGTH, 1, N_("Focal length")}, - {MNOTE_CANON_TAG_FOCAL_LENGTH, 2, N_("Focal plane x size")}, - {MNOTE_CANON_TAG_FOCAL_LENGTH, 3, N_("Focal plane y size")}, + {MNOTE_CANON_TAG_SETTINGS_1, 16, N_("Metering Mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 17, N_("Focus Range")}, + {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("AF Point")}, + {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("Exposure Mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 21, N_("Lens Type")}, + {MNOTE_CANON_TAG_SETTINGS_1, 22, N_("Long Focal Length of Lens")}, + {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Short Focal Length of Lens")}, + {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Focal Units per mm")}, + {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Maximal Aperture")}, + {MNOTE_CANON_TAG_SETTINGS_1, 26, N_("Minimal Aperture")}, + {MNOTE_CANON_TAG_SETTINGS_1, 27, N_("Flash Activity")}, + {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash Details")}, + {MNOTE_CANON_TAG_SETTINGS_1, 31, N_("Focus Mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 32, N_("AE Setting")}, + {MNOTE_CANON_TAG_SETTINGS_1, 33, N_("Image Stabilization")}, + {MNOTE_CANON_TAG_SETTINGS_1, 34, N_("Display Aperture")}, + {MNOTE_CANON_TAG_SETTINGS_1, 35, N_("Zoom Source Width")}, + {MNOTE_CANON_TAG_SETTINGS_1, 36, N_("Zoom Target Width")}, + {MNOTE_CANON_TAG_SETTINGS_1, 39, N_("Photo Effect")}, + {MNOTE_CANON_TAG_SETTINGS_1, 40, N_("Manual Flash Output")}, + {MNOTE_CANON_TAG_SETTINGS_1, 41, N_("Color Tone")}, + {MNOTE_CANON_TAG_FOCAL_LENGTH, 0, N_("Focal Type")}, + {MNOTE_CANON_TAG_FOCAL_LENGTH, 1, N_("Focal Length")}, + {MNOTE_CANON_TAG_FOCAL_LENGTH, 2, N_("Focal Plane X Size")}, + {MNOTE_CANON_TAG_FOCAL_LENGTH, 3, N_("Focal Plane Y Size")}, {MNOTE_CANON_TAG_SETTINGS_2, 0, N_("Auto ISO")}, {MNOTE_CANON_TAG_SETTINGS_2, 1, N_("Shot ISO")}, {MNOTE_CANON_TAG_SETTINGS_2, 2, N_("Measured EV")}, - {MNOTE_CANON_TAG_SETTINGS_2, 3, N_("Target aperture")}, - {MNOTE_CANON_TAG_SETTINGS_2, 4, N_("Target exposure time")}, - {MNOTE_CANON_TAG_SETTINGS_2, 5, N_("Exposure compensation")}, - {MNOTE_CANON_TAG_SETTINGS_2, 6, N_("White balance")}, - {MNOTE_CANON_TAG_SETTINGS_2, 7, N_("Slow shutter")}, - {MNOTE_CANON_TAG_SETTINGS_2, 8, N_("Sequence number")}, - {MNOTE_CANON_TAG_SETTINGS_2, 12, N_("Flash guide number")}, - {MNOTE_CANON_TAG_SETTINGS_2, 13, N_("AF point")}, - {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("Flash exposure compensation")}, - {MNOTE_CANON_TAG_SETTINGS_2, 15, N_("AE bracketing")}, - {MNOTE_CANON_TAG_SETTINGS_2, 16, N_("AE bracket value")}, - {MNOTE_CANON_TAG_SETTINGS_2, 18, N_("Focus distance upper")}, - {MNOTE_CANON_TAG_SETTINGS_2, 19, N_("Focus distance lower")}, + {MNOTE_CANON_TAG_SETTINGS_2, 3, N_("Target Aperture")}, + {MNOTE_CANON_TAG_SETTINGS_2, 4, N_("Target Exposure Time")}, + {MNOTE_CANON_TAG_SETTINGS_2, 5, N_("Exposure Compensation")}, + {MNOTE_CANON_TAG_SETTINGS_2, 6, N_("White Balance")}, + {MNOTE_CANON_TAG_SETTINGS_2, 7, N_("Slow Shutter")}, + {MNOTE_CANON_TAG_SETTINGS_2, 8, N_("Sequence Number")}, + {MNOTE_CANON_TAG_SETTINGS_2, 12, N_("Flash Guide Number")}, + {MNOTE_CANON_TAG_SETTINGS_2, 13, N_("AF Point")}, + {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("Flash Exposure Compensation")}, + {MNOTE_CANON_TAG_SETTINGS_2, 15, N_("AE Bracketing")}, + {MNOTE_CANON_TAG_SETTINGS_2, 16, N_("AE Bracket Value")}, + {MNOTE_CANON_TAG_SETTINGS_2, 18, N_("Focus Distance Upper")}, + {MNOTE_CANON_TAG_SETTINGS_2, 19, N_("Focus Distance Lower")}, {MNOTE_CANON_TAG_SETTINGS_2, 20, N_("FNumber")}, - {MNOTE_CANON_TAG_SETTINGS_2, 21, N_("Exposure time")}, - {MNOTE_CANON_TAG_SETTINGS_2, 23, N_("Bulb duration")}, - {MNOTE_CANON_TAG_SETTINGS_2, 25, N_("Camera type")}, - {MNOTE_CANON_TAG_SETTINGS_2, 26, N_("Auto rotate")}, - {MNOTE_CANON_TAG_SETTINGS_2, 27, N_("ND filter")}, + {MNOTE_CANON_TAG_SETTINGS_2, 21, N_("Exposure Time")}, + {MNOTE_CANON_TAG_SETTINGS_2, 23, N_("Bulb Duration")}, + {MNOTE_CANON_TAG_SETTINGS_2, 25, N_("Camera Type")}, + {MNOTE_CANON_TAG_SETTINGS_2, 26, N_("Auto Rotate")}, + {MNOTE_CANON_TAG_SETTINGS_2, 27, N_("ND Filter")}, {MNOTE_CANON_TAG_SETTINGS_2, 28, N_("Self-timer")}, - {MNOTE_CANON_TAG_SETTINGS_2, 32, N_("Manual flash output")}, - {MNOTE_CANON_TAG_PANORAMA, 2, N_("Panorama frame")}, - {MNOTE_CANON_TAG_PANORAMA, 5, N_("Panorama direction")}, - {MNOTE_CANON_TAG_COLOR_INFORMATION, 0, N_("Tone curve")}, - {MNOTE_CANON_TAG_COLOR_INFORMATION, 2, N_("Sharpness frequency")}, - {MNOTE_CANON_TAG_COLOR_INFORMATION, 7, N_("White balance")}, - {MNOTE_CANON_TAG_COLOR_INFORMATION, 9, N_("Picture style")}, + {MNOTE_CANON_TAG_SETTINGS_2, 32, N_("Manual Flash Output")}, + {MNOTE_CANON_TAG_PANORAMA, 2, N_("Panorama Frame")}, + {MNOTE_CANON_TAG_PANORAMA, 5, N_("Panorama Direction")}, + {MNOTE_CANON_TAG_COLOR_INFORMATION, 0, N_("Tone Curve")}, + {MNOTE_CANON_TAG_COLOR_INFORMATION, 2, N_("Sharpness Frequency")}, + {MNOTE_CANON_TAG_COLOR_INFORMATION, 7, N_("White Balance")}, + {MNOTE_CANON_TAG_COLOR_INFORMATION, 9, N_("Picture Style")}, #endif {0, 0, NULL} }; diff --git a/libexif/fuji/mnote-fuji-tag.c b/libexif/fuji/mnote-fuji-tag.c index e9f315b..d4fd4ab 100644 --- a/libexif/fuji/mnote-fuji-tag.c +++ b/libexif/fuji/mnote-fuji-tag.c @@ -54,7 +54,7 @@ static const struct { {MNOTE_FUJI_TAG_FOCUS_CHECK, "AutoFocusCheck", N_("Auto Focus Check"), ""}, {MNOTE_FUJI_TAG_AUTO_EXPOSURE_CHECK, "AutoExposureCheck", N_("Auto Exposure Check"), ""}, {MNOTE_FUJI_TAG_DYNAMIC_RANGE, "DynamicRange", N_("Dynamic Range"), ""}, - {MNOTE_FUJI_TAG_FILM_MODE, "FilmMode", N_("Film simulation Mode"), ""}, + {MNOTE_FUJI_TAG_FILM_MODE, "FilmMode", N_("Film Simulation Mode"), ""}, {MNOTE_FUJI_TAG_DYNAMIC_RANGE_SETTING, "DRangeMode", N_("Dynamic Range Wide Mode"), ""}, {MNOTE_FUJI_TAG_DEV_DYNAMIC_RANGE_SETTING, "DevDRangeMode", N_("Development Dynamic Range Wide Mode"), ""}, {MNOTE_FUJI_TAG_MIN_FOCAL_LENGTH, "MinFocalLen", N_("Minimum Focal Length"), ""}, diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c index 793f32f..65680e2 100644 --- a/libexif/olympus/mnote-olympus-entry.c +++ b/libexif/olympus/mnote-olympus-entry.c @@ -78,7 +78,7 @@ static const struct { ExifTag tag; - ExifFormat fmt; + ExifFormat fmt; struct { int index; const char *string; @@ -140,29 +140,29 @@ static const struct { {1, N_("Fisheye On")}, {0, NULL}}}, { MNOTE_OLYMPUS_TAG_QUALITY, EXIF_FORMAT_SHORT, - { {1, N_("normal, SQ")}, - {2, N_("normal, HQ")}, - {3, N_("normal, SHQ")}, - {4, N_("normal, RAW")}, - {5, N_("normal, SQ1")}, - {6, N_("normal, SQ2")}, - {7, N_("normal, super high")}, - {17, N_("normal, standard")}, - {0x101, N_("fine, SQ")}, - {0x102, N_("fine, HQ")}, - {0x103, N_("fine, SHQ")}, - {0x104, N_("fine, RAW")}, - {0x105, N_("fine, SQ1")}, - {0x106, N_("fine, SQ2")}, - {0x107, N_("fine, super high")}, - {0x201, N_("super fine, SQ")}, - {0x202, N_("super fine, HQ")}, - {0x203, N_("super fine, SHQ")}, - {0x204, N_("super fine, RAW")}, - {0x205, N_("super fine, SQ1")}, - {0x206, N_("super fine, SQ2")}, - {0x207, N_("super fine, super high")}, - {0x211, N_("super fine, high")}, + { {1, N_("Normal, SQ")}, + {2, N_("Normal, HQ")}, + {3, N_("Normal, SHQ")}, + {4, N_("Normal, RAW")}, + {5, N_("Normal, SQ1")}, + {6, N_("Normal, SQ2")}, + {7, N_("Normal, super high")}, + {17, N_("Normal, standard")}, + {0x101, N_("Fine, SQ")}, + {0x102, N_("Fine, HQ")}, + {0x103, N_("Fine, SHQ")}, + {0x104, N_("Fine, RAW")}, + {0x105, N_("Fine, SQ1")}, + {0x106, N_("Fine, SQ2")}, + {0x107, N_("Fine, super high")}, + {0x201, N_("Super fine, SQ")}, + {0x202, N_("Super fine, HQ")}, + {0x203, N_("Super fine, SHQ")}, + {0x204, N_("Super fine, RAW")}, + {0x205, N_("Super fine, SQ1")}, + {0x206, N_("Super fine, SQ2")}, + {0x207, N_("Super fine, super high")}, + {0x211, N_("Super fine, high")}, {0, NULL}}}, { MNOTE_OLYMPUS_TAG_MACRO, EXIF_FORMAT_SHORT, { {0, N_("No")}, diff --git a/libexif/olympus/mnote-olympus-tag.c b/libexif/olympus/mnote-olympus-tag.c index 881ff5c..bc9c328 100644 --- a/libexif/olympus/mnote-olympus-tag.c +++ b/libexif/olympus/mnote-olympus-tag.c @@ -36,52 +36,52 @@ 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_("Colormode (?)"), ""}, + {MNOTE_NIKON_TAG_COLORMODE1, "COLORMODE1", N_("Color Mode (?)"), ""}, {MNOTE_NIKON_TAG_QUALITY, "QUALITY", N_("Quality"), ""}, - {MNOTE_NIKON_TAG_WHITEBALANCE, "WHITEBALANCE", N_("Whitebalance"), ""}, + {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_("Whitebalance fine adjustment"), ""}, - {MNOTE_NIKON_TAG_WHITEBALANCERB, "WHITEBALANCERB", N_("Whitebalance RB"), ""}, + {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_("Isoselection"), ""}, + {MNOTE_NIKON_TAG_ISOSELECTION, "ISOSELECTION", N_("ISO Selection"), ""}, {MNOTE_NIKON_TAG_PREVIEWIMAGE, "PREVIEWIMAGE", N_("Preview Image"), ""}, {MNOTE_NIKON_TAG_EXPOSUREDIFF, "EXPOSUREDIFF", N_("Exposurediff ?"), ""}, - {MNOTE_NIKON_TAG_FLASHEXPCOMPENSATION, "FLASHEXPCOMPENSATION", N_("Flash exposure compensation"), ""}, + {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_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_("Tonecompensation"), ""}, + {MNOTE_NIKON_TAG_TONECOMPENSATION, "TONECOMPENSATION", N_("Tone Compensation"), ""}, {MNOTE_NIKON_TAG_ADAPTER, "ADAPTER", N_("Adapter"), ""}, - {MNOTE_NIKON_TAG_LENSTYPE, "LENSTYPE", N_("Lenstype"), ""}, + {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_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_("Colormode"), ""}, - {MNOTE_NIKON_TAG_LIGHTTYPE, "LIGHTTYPE,", N_("Lighttype"), ""}, + {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_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 Datasize"), 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"), ""}, @@ -92,10 +92,10 @@ static const struct { {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_("Colormode"), ""}, + {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_("Whitebalance"), ""}, + {MNOTE_NIKON1_TAG_WHITEBALANCE, "WhiteBalance", N_("White Balance"), ""}, {MNOTE_NIKON1_TAG_FOCUS, "Focus", N_("Focus"), ""}, {MNOTE_NIKON1_TAG_UNKNOWN_0X0009, NULL, NULL, NULL}, {MNOTE_NIKON1_TAG_DIGITALZOOM, "DigitalZoom", N_("Digital Zoom"), ""}, @@ -103,14 +103,14 @@ static const struct { /* Olympus & some Sanyo */ {MNOTE_OLYMPUS_TAG_THUMBNAILIMAGE, "ThumbnailImage", N_("Thumbnail Image"), ""}, - {MNOTE_OLYMPUS_TAG_MODE, "Mode", N_("Speed/Sequence/Panorama direction"), ""}, + {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_DIGIZOOM, "DigiZoom", N_("Digital Zoom"), ""}, {MNOTE_OLYMPUS_TAG_FOCALPLANEDIAGONAL, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"), ""}, {MNOTE_OLYMPUS_TAG_LENSDISTORTION, "LensDistortionParams", N_("Lens Distortion Parameters"), ""}, - {MNOTE_OLYMPUS_TAG_VERSION, "FirmwareVersion", N_("Firmware version"), ""}, + {MNOTE_OLYMPUS_TAG_VERSION, "FirmwareVersion", N_("Firmware Version"), ""}, {MNOTE_OLYMPUS_TAG_INFO, "Info", N_("Info"), ""}, {MNOTE_OLYMPUS_TAG_ID, "CameraID", N_("Camera ID"), ""}, {MNOTE_OLYMPUS_TAG_PRECAPTUREFRAMES, "PreCaptureFrames", N_("Precapture Frames"), ""}, diff --git a/libexif/olympus/mnote-olympus-tag.h b/libexif/olympus/mnote-olympus-tag.h index 69badeb..02f23eb 100644 --- a/libexif/olympus/mnote-olympus-tag.h +++ b/libexif/olympus/mnote-olympus-tag.h @@ -174,8 +174,8 @@ enum _MnoteOlympusTag { MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE = 0x0217, MNOTE_SANYO_TAG_FLICKERREDUCE = 0x0218, MNOTE_SANYO_TAG_OPTICALZOOM = 0x0219, - MNOTE_SANYO_TAG_DIGITALZOOM = 0x021b, MNOTE_SANYO_TAG_CCDSENSITIVITY = 0x021a, + MNOTE_SANYO_TAG_DIGITALZOOM = 0x021b, MNOTE_SANYO_TAG_LIGHTSOURCESPECIAL = 0x021d, MNOTE_SANYO_TAG_RESAVED = 0x021e, MNOTE_SANYO_TAG_SCENESELECT = 0x021f, -- 2.7.4