[libexif-cvs] libexif/libexif/canon mnote-canon-entry.c,1.29,1.30

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/canon
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7056/libexif/canon

Modified Files:
	mnote-canon-entry.c 
Log Message:
Make a few format strings untranslatable. Made some Canon MakerNote
entries translatable.


Index: mnote-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- mnote-canon-entry.c	29 May 2009 04:43:41 -0000	1.29
+++ mnote-canon-entry.c	17 Sep 2009 22:33:01 -0000	1.30
@@ -486,9 +486,9 @@ canon_search_table_bitfield (const struc
 		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 Mnote
 		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 Mnote
 		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);