Make a few format strings untranslatable. Made some Canon MakerNote

entries translatable.

diff --git a/libexif/canon/mnote-canon-entry.c b/libexif/canon/mnote-canon-entry.c
index 6cd5c30..d14fcc4 100644 (file)
--- a/libexif/canon/mnote-canon-entry.c
+++ b/libexif/canon/mnote-canon-entry.c
@@ -486,9 +486,9 @@ canon_search_table_bitfield (const struct canon_entry_table_t table[],
                for (i = j; table[i].name && (table[i].subtag == t); i++) {
                        bit = table[i].value;
                        if ((vs >> bit) & 1) {
-                               strncat(val, table[i].name, maxlen - strlen (val));
+                               strncat(val, _(table[i].name), maxlen - strlen (val));
                                if (bit != lastbit) 
-                                       strncat (val, N_(", "), maxlen - strlen (val));
+                                       strncat (val, _(", "), maxlen - strlen (val));
                        }
                }
        } else {
@@ -579,7 +579,7 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
                case 15:
                        if (((vs & 0xC000) == 0x4000) && (vs != 0x7FFF)) {
                                /* Canon S3 IS - directly specified value */
-                               snprintf (val, maxlen, _("%i"), vs & ~0x4000);
+                               snprintf (val, maxlen, "%i", vs & ~0x4000);
                        } else {
                                /* Standard Canon - index into lookup table */
                                canon_search_table_value (entries_settings_1, t, vs, val, maxlen);
@@ -652,9 +652,9 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
                case 21:
                        d = apex_value_to_shutter_speed ((ExifSShort)vs / 32.0);
                        if (d < 1)
-                               snprintf (val, maxlen, _("1/%d"),(int)(1.0 / d));
+                               snprintf (val, maxlen, _("1/%i"),(int)(1.0 / d));
                        else
-                               snprintf (val, maxlen, _("%d"), (int) d);
+                               snprintf (val, maxlen, "%i", (int) d);
                        break;
                case 8:
                        snprintf (val, maxlen, "%u", vs);

diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index f137108..fecbbb2 100644 (file)
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -1045,9 +1045,9 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
                }
                d = (double) v_rat.numerator / (double) v_rat.denominator;
                if (d < 1)
-                       snprintf (val, maxlen, _("1/%d"), (int) (0.5 + 1. / d));
+                       snprintf (val, maxlen, _("1/%i"), (int) (0.5 + 1. / d));
                else
-                       snprintf (val, maxlen, _("%d"), (int) d);
+                       snprintf (val, maxlen, "%i", (int) d);
                if (maxlen > strlen (val) + strlen (_(" sec.")))
                        strncat (val, _(" sec."), maxlen - strlen (val) - 1);
                break;

diff --git a/libexif/exif-format.c b/libexif/exif-format.c
index d432e9e..4d77aeb 100644 (file)
--- a/libexif/exif-format.c
+++ b/libexif/exif-format.c
@@ -31,7 +31,7 @@ static const struct {
         unsigned char size;
 } ExifFormatTable[] = {
         {EXIF_FORMAT_BYTE,      N_("Byte"),      1},
-        {EXIF_FORMAT_ASCII,     N_("Ascii"),     1},
+        {EXIF_FORMAT_ASCII,     N_("ASCII"),     1},
         {EXIF_FORMAT_SHORT,     N_("Short"),     2},
         {EXIF_FORMAT_LONG,      N_("Long"),      4},
         {EXIF_FORMAT_RATIONAL,  N_("Rational"),  8},

diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index a743ba1..62ac0b8 100644 (file)
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -594,7 +594,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                        strncpy (v, _("panorama"), maxlen);
                        break;
                default:
-                       snprintf (v, maxlen, _("%li"), (long int) vl);
+                       snprintf (v, maxlen, "%li", (long int) vl);
                }
                vl = exif_get_long (entry->data + 4, entry->order);
                snprintf (buf, sizeof (buf), "/%li/", (long int) vl);
@@ -614,7 +614,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                        strncat (v, _("top to bottom"), maxlen - strlen (v));
                        break;
                default:
-                       snprintf (buf, sizeof (buf), _("%li"),
+                       snprintf (buf, sizeof (buf), "%li",
                                  (long int) vl);
                        strncat (v, buf, maxlen - strlen (v));
                }