from TRUNK

- Solaris build fixes
- typos fixed


git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@11021 67ed7778-7388-44ab-90cf-0a291f65f57c

4 files changed, 59 insertions, 67 deletions

diff --git a/camlibs/sierra/epson-desc.c b/camlibs/sierra/epson-desc.c
index 4123a7c68..cf8343163 100644
--- a/camlibs/sierra/epson-desc.c
+++ b/camlibs/sierra/epson-desc.c
@@ -42,7 +42,7 @@
  * the name/value union, and so it is the default value initialized.
  *
  * To init to a range, use:
- *	{ range: { 100.1, 2000.0, 10 } }, NULL 
+ *	{ .range = { 100.1, 2000.0, 10 } }, NULL 
  *
  * Casts are used to avoid warnings about using a const.
  *
@@ -185,7 +185,7 @@ static const RegisterDescriptorType ep3000z_reg_20[] = {
  * I have previously set 0,255,1 is old camera_get_config_epson()
  */
 static const ValueNameType ep3000z_reg_23_val_names[] = {
-	{ { range: { 30, 600, 30  } }, NULL },
+	{ { .range = { 30, 600, 30  } }, NULL },
 };
 static const RegisterDescriptorType ep3000z_reg_23[] = { 
 	{
@@ -201,7 +201,7 @@ static const RegisterDescriptorType ep3000z_reg_23[] = {
  * I have previously set 0,255,1 is old camera_get_config_epson()
  */
 static const ValueNameType ep3000z_reg_24_val_names[] = {
-	{ { range: { 30, 600, 30  } }, NULL },
+	{ { .range = { 30, 600, 30  } }, NULL },
 };
 static const RegisterDescriptorType ep3000z_reg_24[] = { 
 	{
diff --git a/camlibs/sierra/nikon-desc.c b/camlibs/sierra/nikon-desc.c
index 1e0bdf653..6dd2273a7 100644
--- a/camlibs/sierra/nikon-desc.c
+++ b/camlibs/sierra/nikon-desc.c
@@ -38,7 +38,7 @@
  * the name/value union, and so it is the default value initialized.
  *
  * To init to a range, use:
- *	{ range: { 100.1, 2000.0, 10 } }, NULL 
+ *	{ .range = { 100.1, 2000.0, 10 } }, NULL 
  *
  * Casts are used to avoid warnings about using a const.
  *
@@ -153,7 +153,7 @@ static const RegisterDescriptorType cp880_reg_02[] = {
 #ifdef RANGE_FOR_SHUTTER
 static const ValueNameType cp880_reg_03_val_names[] = { 
 	{
-		{ range: { 0, 8000000 } }, NULL 
+		{ .range = { 0, 8000000 } }, NULL 
 	}
 };
 static const RegisterDescriptorType cp880_reg_03[] = { 
@@ -384,7 +384,7 @@ static const RegisterDescriptorType cp880_reg_34[] = {
  * Register 35: lcd brightness.
  */
 static const ValueNameType cp880_reg_35_val_names[] = {
-	{ { range: { 0, 7 } }, NULL },
+	{ { .range = { 0, 7 } }, NULL },
 };
 static const RegisterDescriptorType cp880_reg_35[] = { 
 	{
@@ -399,7 +399,7 @@ static const RegisterDescriptorType cp880_reg_35[] = {
  * what the maximum range should be.
  */
 static const ValueNameType cp880_reg_38_val_names[] = {
-	{ { range: { 0, 255 /* XXX? */ } }, NULL },
+	{ { .range = { 0, 255 /* XXX? */ } }, NULL },
 };
 static const RegisterDescriptorType cp880_reg_38[] = { 
 	{
@@ -450,7 +450,7 @@ static const RegisterDescriptorType cp880_reg_53[] = {
 #ifdef RANGE_FOR_EXPOSURE
 static const ValueNameType cp880_reg_69_val_names[] = {
 	{
-		{ range: { -2.0, 2.0, .1 } }, NULL,
+		{ .range = { -2.0, 2.0, .1 } }, NULL,
 	}
 };
 static const RegisterDescriptorType cp880_reg_69[] = { 
@@ -508,7 +508,7 @@ static const RegisterDescriptorType cp880_reg_70[] = {
  */
 static const ValueNameType cp880_reg_71_val_names[] = {
 	{
-		{ range: { 8.0, 20.0, .1 } }, NULL
+		{ .range = { 8.0, 20.0, .1 } }, NULL
 	}
 };
 static const RegisterDescriptorType cp880_reg_71[] = { 
@@ -555,7 +555,7 @@ static const RegisterDescriptorType cp880_reg_72[] = {
 	},
 	{ 
 		GP_WIDGET_RADIO, 0x00ff, 
-		"misc-exp-lenses", N_("Misc exposure/lense settings"), 
+		"misc-exp-lenses", N_("Misc exposure/lens settings"), 
 		VAL_NAME_INIT (cp880_reg_72_mask_lo_val_names)
 	},
 };
diff --git a/camlibs/sierra/olympus-desc.c b/camlibs/sierra/olympus-desc.c
index b5633192b..507b8f9ee 100644
--- a/camlibs/sierra/olympus-desc.c
+++ b/camlibs/sierra/olympus-desc.c
@@ -43,7 +43,7 @@
  * the name/value union, and so it is the default value initialized.
  *
  * To init to a range, use:
- *	{ range: { 100.1, 2000.0, 10 } }, NULL 
+ *	{ .range = { 100.1, 2000.0, 10 } }, NULL 
  *
  * Casts are used to avoid warnings about using a const.
  *
@@ -352,7 +352,7 @@ static const RegisterDescriptorType olysp500uz_reg_03[] = {
  */
 static const ValueNameType olyrange_reg_03_val_names[] = { 
 	{
-		{ range: { 0, 16000000, 100 } }, NULL 
+		{ .range = { 0, 16000000, 100 } }, NULL 
 	}
 };
 static const RegisterDescriptorType olyrange_reg_03[] = { 
@@ -593,9 +593,9 @@ static const ValueNameType oly750uz_reg_20_val_names[] = {
 	{ { 0x00 }, N_("Auto") },
 	{ { 0x01 }, N_("Daylight") },
 	{ { 0x03 }, N_("Tungsten") },
-	{ { 0x04 }, N_("Flourescent-1-home-6700K") },
-	{ { 0x05 }, N_("Flourescent-2-desk-5000K") },
-	{ { 0x06 }, N_("Flourescent-3-office-4200K") },
+	{ { 0x04 }, N_("Fluorescent-1-home-6700K") },
+	{ { 0x05 }, N_("Fluorescent-2-desk-5000K") },
+	{ { 0x06 }, N_("Fluorescent-3-office-4200K") },
 	{ { 0xff }, N_("Cloudy") },
 };
 static const RegisterDescriptorType oly750uz_reg_20[] = { 
@@ -672,7 +672,7 @@ static const RegisterDescriptorType oly3040_reg_34[] = {
  * Register 35: lcd brightness.
  */
 static const ValueNameType oly3040_reg_35_val_names[] = {
-	{ { range: { 0, 7 } }, NULL },
+	{ { .range = { 0, 7 } }, NULL },
 };
 static const RegisterDescriptorType oly3040_reg_35[] = { 
 	{
@@ -686,7 +686,7 @@ static const RegisterDescriptorType oly3040_reg_35[] = {
  * Register 24: camera power save (idle time before entering power save mode)
  */
 static const ValueNameType oly3040_reg_24_val_names[] = {
-	{ { range: { 30, 600, 30  } }, NULL },
+	{ { .range = { 30, 600, 30  } }, NULL },
 };
 static const RegisterDescriptorType oly3040_reg_24[] = { 
 	{
@@ -701,7 +701,7 @@ static const RegisterDescriptorType oly3040_reg_24[] = {
  * (idle time before entering power save mode)
  */
 static const ValueNameType oly3040_reg_23_val_names[] = {
-	{ { range: { 30, 600, 30  } }, NULL },
+	{ { .range = { 30, 600, 30  } }, NULL },
 };
 static const RegisterDescriptorType oly3040_reg_23[] = { 
 	{
@@ -714,7 +714,7 @@ static const RegisterDescriptorType oly3040_reg_23[] = {
  * Register 38: lcd auto shut off time
  */
 static const ValueNameType oly3040_reg_38_val_names[] = {
-	{ { range: { 30, 600, 30  } }, NULL },
+	{ { .range = { 30, 600, 30  } }, NULL },
 };
 static const RegisterDescriptorType oly3040_reg_38[] = { 
 	{
@@ -806,7 +806,7 @@ static const RegisterDescriptorType olysp500uz_reg_70[] = {
  */
 static const ValueNameType oly750uz_reg_71_val_names[] = {
 	{
-		{ range: { 6.3, 63.0, .1 } }, NULL
+		{ .range = { 6.3, 63.0, .1 } }, NULL
 	}
 };
 static const RegisterDescriptorType oly750uz_reg_71[] = { 
@@ -822,7 +822,7 @@ static const RegisterDescriptorType oly750uz_reg_71[] = {
  */
 static const ValueNameType olysp500uz_reg_71_val_names[] = {
 	{
-		{ range: { 6.3, 63.0, .3 } }, NULL
+		{ .range = { 6.3, 63.0, .3 } }, NULL
 	}
 };
 static const RegisterDescriptorType olysp500uz_reg_71[] = { 
@@ -838,7 +838,7 @@ static const RegisterDescriptorType olysp500uz_reg_71[] = {
  */
 static const ValueNameType oly3040_reg_71_val_names[] = {
 	{
-		{ range: { 7.3, 21.0, .1 } }, NULL
+		{ .range = { 7.3, 21.0, .1 } }, NULL
 	}
 };
 static const RegisterDescriptorType oly3040_reg_71[] = { 
@@ -907,7 +907,7 @@ static const RegisterDescriptorType oly750uz_reg_85[] = {
  *   121 to 240: normal positions
  */
 static const ValueNameType oly3040_reg_103_val_names[] = {
-	{ { range: { 1, 240, 1 } }, NULL },
+	{ { .range = { 1, 240, 1 } }, NULL },
 };
 static const RegisterDescriptorType oly3040_reg_103[] = { 
 	{
@@ -923,7 +923,7 @@ static const RegisterDescriptorType oly3040_reg_103[] = {
  *      0 to 120: non-macro mode
  */
 static const ValueNameType oly750uz_reg_103_val_names[] = {
-	{ { range: { 1, 120, 1 } }, NULL },
+	{ { .range = { 1, 120, 1 } }, NULL },
 };
 static const RegisterDescriptorType oly750uz_reg_103[] = { 
 	{
@@ -1146,39 +1146,35 @@ static const char oly3040_manual[] =
 N_(
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
-"    A value of 0 will take the default one (auto).\n"
+"    A zero value will take the default one (auto).\n"
 "(2) Olympus C-3040Z (and possibly also the C-2040Z\n"
-"    and others) have a USB PC Control mode. In order\n"
-"    to use this mode, the camera must be switched\n"
-"    into 'USB PC control mode'. To get to the menu\n"
-"    for switching modes, turn on the camera, open\n"
+"    and others) have a USB PC Control mode. To switch\n"
+"    into 'USB PC control mode', turn on the camera, open\n"
 "    the memory card access door and then press and\n"
 "    hold both of the menu and LCD buttons until the\n"
 "    camera control menu appears. Set it to ON.\n"
 "(3) If you switch the 'LCD mode' to 'Monitor' or\n"
 "    'Normal', don't forget to switch it back to 'Off'\n"
-"    before disconnecting. Otherwise you cannot use\n"
-"    the camera's buttons. If you end up with this\n"
+"    before disconnecting. Otherwise you can't use\n"
+"    the camera buttons. If you end up in this\n"
 "    state, you should reconnect the camera to the\n"
-"    PC and switch LCD to 'Off'."
+"    PC, then switch LCD to 'Off'."
 );
 
 static const char oly750uz_manual[] =
 N_(
 "Olympus 750 Ultra Zoom:\n"
-"(1) Olympus 750UZ has a USB PC Control mode. In order\n"
-"    to use this mode, the camera must be switched\n"
-"    into 'USB PC control mode'. To get to the menu\n"
-"    for switching modes, turn on the camera, open\n"
+"(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
+"    into 'USB PC control mode', turn on the camera, open\n"
 "    the memory card access door and then press and\n"
 "    hold both the 'OK' and 'quickview' buttons until the\n"
 "    camera control menu appears. Set it to control mode.\n"
 "(2) If you switch the 'LCD mode' to 'Monitor' or\n"
 "    'Normal', don't forget to switch it back to 'Off'\n"
-"    before disconnecting. Otherwise you cannot use\n"
-"    the camera's buttons. If you end up with this\n"
+"    before disconnecting. Otherwise you can't use\n"
+"    the camera buttons. If you end up in this\n"
 "    state, you should reconnect the camera to the\n"
-"    PC and switch LCD to 'Off'."
+"    PC, then switch LCD to 'Off'."
 );
 
 static const char default_manual[] = 
diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c
index cebb97aff..bdf87ebc9 100644
--- a/camlibs/sierra/sierra.c
+++ b/camlibs/sierra/sierra.c
@@ -1590,17 +1590,17 @@ camera_get_config_epson (Camera *camera, CameraWidget **window, GPContext *conte
 	ret = sierra_get_int_register (camera, 1, &value, context);
         if (ret >= 0) {
 		gp_widget_new (GP_WIDGET_RADIO, _("Resolution"), &child);
-		gp_widget_add_choice (child, _("Standard"));
-		gp_widget_add_choice (child, _("Fine"));
-		gp_widget_add_choice (child, _("SuperFine"));
+		gp_widget_add_choice (child, _("standard"));
+		gp_widget_add_choice (child, _("fine"));
+		gp_widget_add_choice (child, _("superfine"));
 		gp_widget_add_choice (child, _("HyPict"));
 		
                 switch (value) {
-		case 1: strcpy (t, _("Standard"));
+		case 1: strcpy (t, _("standard"));
 			break;
-                case 2: strcpy (t, _("Fine"));
+                case 2: strcpy (t, _("fine"));
 			break;
-                case 3: strcpy (t, _("SuperFine"));
+                case 3: strcpy (t, _("superfine"));
 			break;
                 case 34: strcpy (t, _("HyPict"));
 			break;
@@ -1801,11 +1801,11 @@ camera_set_config_epson (Camera *camera, CameraWidget *window, GPContext *contex
 	if ((gp_widget_get_child_by_label (window, _("Resolution"), &child)
 	     >= 0) && gp_widget_changed (child)) {
 		gp_widget_get_value (child, &value);
-		if (strcmp (value, _("Standard")) == 0) {
+		if (strcmp (value, _("standard")) == 0) {
 			i = 1;
-		} else if (strcmp (value, _("Fine")) == 0) {
+		} else if (strcmp (value, _("fine")) == 0) {
 			i = 2;
-		} else if (strcmp (value, _("SuperFine")) == 0) {
+		} else if (strcmp (value, _("superfine")) == 0) {
 			i = 3;
 		} else if (strcmp (value, _("HyPict")) == 0) {
 			i = 34;
@@ -1931,39 +1931,37 @@ camera_summary (Camera *camera, CameraText *summary, GPContext *c)
 	/* Get all the string-related info */
 
 	if (sierra_get_string_register (camera, 27, 0, NULL, t, &v, c) >= 0)
-		sprintf (buf, _("%sCamera Model: %s\n"), buf, t);
+		sprintf (buf+strlen(buf), _("Camera Model: %s\n"), t);
 	if (sierra_get_string_register (camera, 48, 0, NULL, t, &v, c) >= 0)
-		sprintf (buf, _("%sManufacturer: %s\n"), buf, t);
+		sprintf (buf+strlen(buf), _("Manufacturer: %s\n"), t);
 	if (sierra_get_string_register (camera, 22, 0, NULL, t, &v, c) >= 0)
-		sprintf (buf, _("%sCamera ID: %s\n"), buf, t);
+		sprintf (buf+strlen(buf), _("Camera ID: %s\n"), t);
 	if (sierra_get_string_register (camera, 25, 0, NULL, t, &v, c) >= 0)
-		sprintf (buf, _("%sSerial Number: %s\n"), buf, t);
+		sprintf (buf+strlen(buf), _("Serial Number: %s\n"), t);
 	if (sierra_get_string_register (camera, 26, 0, NULL, t, &v, c) >= 0)
-		sprintf (buf, _("%sSoftware Rev.: %s\n"), buf, t);
+		sprintf (buf+strlen(buf), _("Software Rev.: %s\n"), t);
 
 	/* Get all the integer information */
 	if (camera->pl->flags & SIERRA_NO_REGISTER_40) {
 		if (sierra_get_int_register(camera, 10, &v, c) >= 0)
-			sprintf (buf, _("%sFrames Taken: %i\n"), buf, v);
+			sprintf (buf+strlen(buf), _("Frames Taken: %i\n"), v);
 	} else {
 		if (sierra_get_int_register(camera, 40, &v, c) >= 0)
-			sprintf (buf, _("%sFrames Taken: %i\n"), buf, v);
+			sprintf (buf+strlen(buf), _("Frames Taken: %i\n"), v);
 	}
 	if (sierra_get_int_register(camera, 11, &v, c) >= 0)
-		sprintf (buf, _("%sFrames Left: %i\n"), buf, v);
+		sprintf (buf+strlen(buf), _("Frames Left: %i\n"), v);
 	if (sierra_get_int_register(camera, 16, &v, c) >= 0)
-		sprintf (buf, _("%sBattery Life: %i\n"), buf, v);
+		sprintf (buf+strlen(buf), _("Battery Life: %i\n"), v);
 	if (sierra_get_int_register(camera, 28, &v, c) >= 0)
-		sprintf (buf, _("%sMemory Left: %i bytes\n"), buf, v);
+		sprintf (buf+strlen(buf), _("Memory Left: %i bytes\n"), v);
 
 	/* Get date */
 	if (sierra_get_int_register (camera, 2, &v, c) >= 0) {
 		time_t vtime = v;
-		sprintf (buf, _("%sDate: %s"), buf, ctime (&vtime));
+		sprintf (buf+strlen(buf), _("Date: %s"), ctime (&vtime));
 	}
-
 	strcpy (summary->text, buf);
-
 	return (camera_stop (camera, c));
 }
 
@@ -1998,17 +1996,15 @@ camera_manual (Camera *camera, CameraText *manual, GPContext *context)
 		    "(1) Camera Configuration:\n"
 		    "    A value of 0 will take the default one (auto).\n"
 		    "(2) Olympus C-3040Z (and possibly also the C-2040Z\n"
-		    "    and others) have a USB PC Control mode. In order\n"
-		    "    to use this mode, the camera must be switched\n"
-		    "    into 'USB PC control mode'. To get to the menu\n"
-		    "    for switching modes, turn on the camera, open\n"
+		    "    and others) have a USB PC Control mode. To switch\n"
+		    "    to this mode, turn on the camera, open\n"
 		    "    the memory card access door and then press and\n"
 		    "    hold both of the menu and LCD buttons until the\n"
 		    "    camera control menu appears. Set it to ON.\n"
 		    "(3) If you switch the 'LCD mode' to 'Monitor' or\n"
 		    "    'Normal', don't forget to switch it back to 'Off'\n"
 		    "    before disconnecting. Otherwise you cannot use\n"
-		    "    the camera's buttons. If you end up with this\n"
+		    "    the camera's buttons. If you end up in this\n"
 		    "    state, you should reconnect the camera to the\n"
 		    "    PC and switch LCD to 'Off'."));
 		break;
@@ -2026,7 +2022,7 @@ camera_about (Camera *camera, CameraText *about, GPContext *context)
 		_("sierra SPARClite library\n"
 		"Scott Fritzinger <scottf@unr.edu>\n"
 		"Support for sierra-based digital cameras\n"
-		"including Olympus, Nikon, Epson, Pentax, and others.\n"
+		"including Olympus, Nikon, Epson, and Pentax.\n"
 		"\n"
 		"Thanks to Data Engines (www.dataengines.com)\n"
 		"for the use of their Olympus C-3030Z for USB\n"