--- libexif-0.6.12/libexif/olympus/mnote-olympus-entry.c.orig 2005-03-13 03:27:13.000000000 +0100 +++ libexif-0.6.12/libexif/olympus/mnote-olympus-entry.c 2005-03-21 17:00:54.723676032 +0100 @@ -248,7 +248,7 @@ vr = exif_get_rational (entry->data+8, entry->order); b = (double)vr.numerator / vr.denominator; //printf("numerator %li, denominator %li\n", 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); @@ -256,7 +256,7 @@ vr = exif_get_rational (entry->data, entry->order); if (vr.numerator) { r = (double)vr.numerator / vr.denominator; - snprintf (v, maxlen, "%2.2f meters", r); + snprintf (v, maxlen, _("%2.2f meters"), r); } else { strncpy (v, _("No manual focus selection"), maxlen); } @@ -273,12 +273,12 @@ 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; - 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; + default: strncpy (v, _("Unknown AF Position"), maxlen); } break; case MNOTE_OLYMPUS_TAG_DIGIZOOM: @@ -311,7 +311,7 @@ /* search the tag */ for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++); if (!items[i].tag) { - strncpy (v, "Internal error", maxlen); + strncpy (v, _("Internal error"), maxlen); break; } CF (entry->format, items[i].fmt, v, maxlen); @@ -332,7 +332,7 @@ for (j = 0; items[i].elem[j].string && (items[i].elem[j].index < vs); j++); if (items[i].elem[j].index != vs) { - snprintf (v, maxlen, "Unknown value %hi", vs); + snprintf (v, maxlen, _("Unknown value %hi"), vs); break; } strncpy (v, items[i].elem[j].string, maxlen); --- libexif-0.6.12/libexif/exif-entry.c.orig 2005-03-13 03:27:13.000000000 +0100 +++ libexif-0.6.12/libexif/exif-entry.c 2005-03-21 11:43:48.354123856 +0100 @@ -199,9 +199,9 @@ exif_format_get_size (e->format); e->data = exif_entry_realloc (e, e->data, e->size); exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag '%s' was of format '%s' (which is " + _("Tag '%s' was of format '%s' (which is " "against specification) and has been " - "changed to format '%s'.", + "changed to format '%s'."), exif_tag_get_name (e->tag), exif_format_get_name (EXIF_FORMAT_LONG), exif_format_get_name (EXIF_FORMAT_SHORT)); @@ -233,9 +233,9 @@ } e->format = EXIF_FORMAT_RATIONAL; exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag '%s' was of format '%s' (which is " + _("Tag '%s' was of format '%s' (which is " "against specification) and has been " - "changed to format '%s'.", + "changed to format '%s'."), exif_tag_get_name (e->tag), exif_format_get_name (EXIF_FORMAT_SRATIONAL), exif_format_get_name (EXIF_FORMAT_RATIONAL)); @@ -250,8 +250,8 @@ /* Format needs to be UNDEFINED. */ if (e->format != EXIF_FORMAT_UNDEFINED) { exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag 'UserComment' had invalid format '%s'. " - "Format has been set to 'undefined'.", + _("Tag 'UserComment' had invalid format '%s'. " + "Format has been set to 'undefined'."), exif_format_get_name (e->format)); e->format = EXIF_FORMAT_UNDEFINED; } @@ -266,8 +266,8 @@ (!e->data[i] || (e->data[i] == ' ')); i++); if (i && (i == e->size)) { exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag 'UserComment' contained unnecessary " - "data which has been removed."); + _("Tag 'UserComment' contained unnecessary " + "data which has been removed.")); exif_mem_free (e->priv->mem, e->data); e->data = NULL; e->size = 0; @@ -288,9 +288,9 @@ memcpy (e->data, "ASCII\0\0\0", 8); e->size += 8; exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag 'UserComment' has been expanded to at " + _("Tag 'UserComment' has been expanded to at " "least 8 bytes in order to follow the " - "specification."); + "specification.")); break; } @@ -301,8 +301,8 @@ */ if (i >= 8) { exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag 'UserComment' did not start with " - "format identifyer. This has been fixed."); + _("Tag 'UserComment' did not start with " + "format identifier. This has been fixed.")); memcpy (e->data, "ASCII\0\0\0", 8); } @@ -323,8 +323,8 @@ memcpy (e->data, "ASCII\0\0\0", 8); e->size += 8; exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag 'UserComment' did not start with " - "format identifyer. This has been fixed."); + _("Tag 'UserComment' did not start with " + "format identifier. This has been fixed.")); break; } @@ -479,7 +479,7 @@ {4, {N_("Shutter priority"),N_("Shutter"), NULL}}, {5, {N_("Creative program (biased toward depth of field)"), N_("Creative"), NULL}}, - {6, {N_("Creative program (biased toward fast shutter speed"), + {6, {N_("Creative program (biased toward fast shutter speed)"), N_("Action"), NULL}}, {7, {N_("Portrait mode (for closeup photos with the background out " "of focus)"), N_("Portrait"), NULL}}, @@ -628,11 +628,11 @@ * Print as much as possible. */ exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag UserComment does not comply " - "with standard but contains data."); + _("Tag UserComment does not comply " + "with standard but contains data.")); for (; (i < e->size) && (strlen (val) < maxlen - 1); i++) { exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Byte at position %i: 0x%02x", i, e->data[i]); + _("Byte at position %i: 0x%02x"), i, e->data[i]); val[strlen (val)] = isprint (e->data[i]) ? e->data[i] : '.'; } @@ -763,8 +763,8 @@ (int) (1. / d)); else snprintf (val, maxlen, _("%d"), (int) d); - if (maxlen > strlen (val) + strlen (" sec.")) - strncat (val, " sec.", maxlen - strlen (val) - 1); + if (maxlen > strlen (val) + strlen (_(" sec."))) + strncat (val, _(" sec."), maxlen - strlen (val) - 1); break; case EXIF_TAG_SHUTTER_SPEED_VALUE: CF (e, EXIF_FORMAT_SRATIONAL, val, maxlen); @@ -773,9 +773,9 @@ if (!v_srat.denominator) return NULL; snprintf (val, maxlen, "%.0f/%.0f", (float) v_srat.numerator, (float) v_srat.denominator); - if (maxlen > strlen (val) + strlen (" sec.")) - strncat (val, " sec.", maxlen - strlen (val) - 1); - snprintf (b, sizeof (b), " (APEX: %i)", + if (maxlen > strlen (val) + strlen (_(" sec."))) + strncat (val, _(" sec."), maxlen - strlen (val) - 1); + snprintf (b, sizeof (b), _(" (APEX: %i)"), (int) pow (sqrt(2), (float) v_srat.numerator / (float) v_srat.denominator)); if (maxlen > strlen (val) + strlen (b)) @@ -894,7 +894,7 @@ /* Search the tag */ for (i = 0; list2[i].tag && (list2[i].tag != e->tag); i++); if (!list2[i].tag) { - strncpy (val, "Internal error.", maxlen - 1); + strncpy (val, _("Internal error."), maxlen - 1); break; } @@ -902,8 +902,8 @@ for (j = 0; list2[i].elem[j].values && (list2[i].elem[j].index < v_short); j++); if (list2[i].elem[j].index != v_short) { - snprintf (val, maxlen, "Internal error (unknown " - "value %i).", v_short); + snprintf (val, maxlen, _("Internal error (unknown " + "value %i)."), v_short); break; } @@ -938,7 +938,7 @@ /* Search the tag */ for (i = 0; list[i].tag && (list[i].tag != e->tag); i++); if (!list[i].tag) { - strncpy (val, "Internal error.", maxlen - 1); + strncpy (val, _("Internal error."), maxlen - 1); break; } --- libexif-0.6.12/libexif/exif-tag.c.orig 2005-03-13 03:27:13.000000000 +0100 +++ libexif-0.6.12/libexif/exif-tag.c 2005-03-21 13:52:37.472119320 +0100 @@ -64,7 +64,7 @@ {EXIF_TAG_BITS_PER_SAMPLE, "BitsPerSample", N_("Bits per Sample"), N_("The number of bits per image component. In this standard each " "component of the image is 8 bits, so the value for this " - "tag is 9. See also . In JPEG compressed data " + "tag is 8. See also . In JPEG compressed data " "a JPEG marker is used instead of this tag."), {ESL_MANDATORY, ESL_MANDATORY, ESL_MANDATORY, ESL_NOT_RECORDED}}, {EXIF_TAG_COMPRESSION, "Compression", N_("Compression"), @@ -121,7 +121,7 @@ N_("The number of rows per strip. This is the number of rows " "in the image of one strip when an image is divided into " "strips. With JPEG compressed data this designation is not " - "needed and is omitted. See also and " + "needed and is omitted. See also and " ".")}, {EXIF_TAG_STRIP_BYTE_COUNTS, "StripByteCounts", N_("Strip Byte Count"), N_("The total number of bytes in each strip. With JPEG compressed " @@ -284,7 +284,7 @@ N_("Spectral Sensitivity"), N_("Indicates the spectral sensitivity of each channel of the " "camera used. The tag value is an ASCII string compatible " - "with the standard developed by the ASTM Technical committee.")}, + "with the standard developed by the ASTM Technical Committee.")}, {EXIF_TAG_GPS_INFO_IFD_POINTER, "GPSInfoIFDPointer", "GPSInfoIFDPointer", N_("A pointer to the GPS Info IFD. The " @@ -294,7 +294,7 @@ {EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", "", N_("Indicates the version of . The version is given " "as 2.0.0.0. This tag is mandatory when tag is " - "present. (Note: The tag is given in bytes, " "unlike the tag. When the version is " "2.0.0.0, the tag value is 02000000.H).")}, {EXIF_TAG_GPS_LATITUDE_REF, "GPSLatitudeRef", "" @@ -307,7 +307,7 @@ "respectively. When degrees, minutes and seconds are expressed, " "the format is dd/1,mm/1,ss/1. When degrees and minutes are used " "and, for example, fractions of minutes are given up to two " - "two decimal places, the format is dd/1,mmmm/100,0/1.")}, + "decimal places, the format is dd/1,mmmm/100,0/1.")}, {EXIF_TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef", "" N_("Indicates whether the longitude is east or west longitude. " "ASCII 'E' indicates east longitude, and 'W' is west "