summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog18
-rw-r--r--camlibs/canon/usb.c14
-rw-r--r--camlibs/gsmart300/library.c6
-rw-r--r--camlibs/konica/qm150.c4
-rw-r--r--camlibs/minolta/dimagev/dimagev.c2
-rw-r--r--camlibs/ptp2/library.c2
-rw-r--r--camlibs/ptp2/ptp.c4
-rw-r--r--camlibs/ptp2/ptp.h2
-rw-r--r--camlibs/sierra/olympus-desc.c8
-rw-r--r--camlibs/spca50x/library.c2
-rw-r--r--camlibs/stv0680/bayer.c2
-rw-r--r--libgphoto2/gphoto2-camera.c2
12 files changed, 42 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 681402117..1c3852a33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-09-19 Hubert Figuiere <hub@figuiere.net>
+
+ * camlibs/gsmart300/library.c (delete_file_func): Fixed typo
+
+ * camlibs/ptp2/ptp.h (PTP_DPC_NIKON_WhiteBalanceFluorescentBias):
+ Change typo in the const name
+
+ * camlibs/stv0680/bayer.c (light_enhance),
+ camlibs/minolta/dimagev/dimagev.c,
+ camlibs/konica/qm150.c (camera_manual),
+ camlibs/spca50x/library.c (delete_file_func),
+ camlibs/canon/usb.c (canon_usb_camera_init),
+ camlibs/sierra/olympus-desc.c,
+ camlibs/ptp2/ptp.c (ptp_get_property_description),
+ libgphoto2/gphoto2-camera.c (gp_camera_init),
+ camlibs/ptp2/library.c (camera_canon_capture): Fix typos
+ https://launchpad.net/products/libgphoto/+bug/61163
+
2006-06-07 Hubert Figuiere <hub@figuiere.net>
* AUTHORS: added credits for 5D capture support.
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c
index aa9cfc8b5..758b260b6 100644
--- a/camlibs/canon/usb.c
+++ b/camlibs/canon/usb.c
@@ -258,16 +258,16 @@ canon_usb_camera_init (Camera *camera, GPContext *context)
i = gp_port_usb_msg_read (camera->port, 0x04, 0x1, 0, (char *)msg, 0x58);
if (i != 0x58) {
if ( i < 0 ) {
- gp_context_error (context,
- _("Step #2 of initialization failed: \"%s\" on read of %i) "
- "Camera not operational"), gp_result_as_string(i), 0x58);
+ gp_context_error (context,
+ _("Step #2 of initialization failed: (\"%s\" on read of %i) "
+ "Camera not operational"), gp_result_as_string(i), 0x58);
return GP_ERROR_OS_FAILURE;
}
else {
- gp_context_error (context,
- _("Step #2 of initialization failed! (returned %i bytes, expected %i) "
- "Camera not operational"), i, 0x58);
- return GP_ERROR_CORRUPTED_DATA;
+ gp_context_error (context,
+ _("Step #2 of initialization failed! (returned %i bytes, expected %i) "
+ "Camera not operational"), i, 0x58);
+ return GP_ERROR_CORRUPTED_DATA;
}
}
/* Get maximum download transfer length from camera, if
diff --git a/camlibs/gsmart300/library.c b/camlibs/gsmart300/library.c
index 7e03a2bf7..3404aec2a 100644
--- a/camlibs/gsmart300/library.c
+++ b/camlibs/gsmart300/library.c
@@ -340,9 +340,9 @@ delete_file_func (CameraFilesystem *fs, const char *folder,
gp_filesystem_name (fs, "/", c - 1, &name, context);
gp_context_error (context,
- _("Your camera does only support deleting "
- "the last file on the camera. In this "
- "case, this is file '%s'."), name);
+ _("Your camera only supports deleting "
+ "the last file on the camera. In this "
+ "case, this is file '%s'."), name);
return (GP_ERROR);
}
CHECK (gsmart300_delete_file (camera->pl, n));
diff --git a/camlibs/konica/qm150.c b/camlibs/konica/qm150.c
index 84e11da17..b9721ae92 100644
--- a/camlibs/konica/qm150.c
+++ b/camlibs/konica/qm150.c
@@ -1206,8 +1206,8 @@ camera_manual (Camera *camera, CameraText *manual, GPContext *context)
{
snprintf(manual->text,sizeof(manual->text),
_("About Konica Q-M150:\n"
- "This camera does not support to do any changes\n"
- "from the outside. So in the configuration, you could\n"
+ "This camera does not allow any changes\n"
+ "from the outside. So in the configuration, you can\n"
"just see what it is configured on the camera\n"
"but you can't change anything.\n\n"
"If you have some issues with this driver, please\n"
diff --git a/camlibs/minolta/dimagev/dimagev.c b/camlibs/minolta/dimagev/dimagev.c
index 12c69ca8a..407396d53 100644
--- a/camlibs/minolta/dimagev/dimagev.c
+++ b/camlibs/minolta/dimagev/dimagev.c
@@ -409,7 +409,7 @@ static int camera_summary (Camera *camera, CameraText *summary, GPContext *conte
i = snprintf(&(summary->text[count]), sizeof(summary->text) - count, _("Unsuitable card"));
break;
default:
- i = snprintf(&(summary->text[count]), sizeof(summary->text) - count, _("Bade value for card status %d"), camera->pl->status->card_status);
+ i = snprintf(&(summary->text[count]), sizeof(summary->text) - count, _("Bad value for card status %d"), camera->pl->status->card_status);
break;
}
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 77c36f93c..39c1aabc5 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -1361,7 +1361,7 @@ camera_canon_capture (Camera *camera, CameraCaptureType type, CameraFilePath *pa
if (!ptp_operation_issupported(params, PTP_OC_CANON_InitiateCaptureInMemory)) {
gp_context_error (context,
- _("Sorry, your Canon camera does not support Canon Captureinitiation"));
+ _("Sorry, your Canon camera does not support Canon Capture initiation"));
return GP_ERROR_NOT_SUPPORTED;
}
propval.u16=3; /* 3 */
diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c
index a1f7d67af..645e1b347 100644
--- a/camlibs/ptp2/ptp.c
+++ b/camlibs/ptp2/ptp.c
@@ -2634,8 +2634,8 @@ ptp_get_property_description(PTPParams* params, uint16_t dpc)
N_("Auto White Balance Bias")},
{PTP_DPC_NIKON_WhiteBalanceTungstenBias, /* 0xD018 */
N_("Tungsten White Balance Bias")},
- {PTP_DPC_NIKON_WhiteBalanceFlourescentBias, /* 0xD019 */
- N_("Flourescent White Balance Bias")},
+ {PTP_DPC_NIKON_WhiteBalanceFluorescentBias, /* 0xD019 */
+ N_("Fluorescent White Balance Bias")},
{PTP_DPC_NIKON_WhiteBalanceDaylightBias, /* 0xD01a */
N_("Daylight White Balance Bias")},
{PTP_DPC_NIKON_WhiteBalanceFlashBias, /* 0xD01b */
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h
index 665d61f89..c7fed0cb1 100644
--- a/camlibs/ptp2/ptp.h
+++ b/camlibs/ptp2/ptp.h
@@ -813,7 +813,7 @@ typedef struct _PTPNIKONWifiProfile PTPNIKONWifiProfile;
#define PTP_DPC_NIKON_RawCompression 0xD016
#define PTP_DPC_NIKON_WhiteBalanceAutoBias 0xD017
#define PTP_DPC_NIKON_WhiteBalanceTungstenBias 0xD018
-#define PTP_DPC_NIKON_WhiteBalanceFlourescentBias 0xD019
+#define PTP_DPC_NIKON_WhiteBalanceFluorescentBias 0xD019
#define PTP_DPC_NIKON_WhiteBalanceDaylightBias 0xD01A
#define PTP_DPC_NIKON_WhiteBalanceFlashBias 0xD01B
#define PTP_DPC_NIKON_WhiteBalanceCloudyBias 0xD01C
diff --git a/camlibs/sierra/olympus-desc.c b/camlibs/sierra/olympus-desc.c
index 9db8f950d..a2d4fd518 100644
--- a/camlibs/sierra/olympus-desc.c
+++ b/camlibs/sierra/olympus-desc.c
@@ -462,15 +462,15 @@ static const RegisterDescriptorType oly3000z_reg_20[] = {
/*
* Olympus 750uz: Register 20: white balance. The main difference is that
- * we have the flourescent 1 2 and 3:
+ * we have the fluorescent 1 2 and 3:
*/
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[] = {
diff --git a/camlibs/spca50x/library.c b/camlibs/spca50x/library.c
index 65ba11298..dac1fff7b 100644
--- a/camlibs/spca50x/library.c
+++ b/camlibs/spca50x/library.c
@@ -513,7 +513,7 @@ delete_file_func (CameraFilesystem *fs, const char *folder,
gp_filesystem_name (fs, "/", c - 1, &name, context);
gp_context_error (context,
- _("Your camera does only support deleting the "
+ _("Your camera only supports deleting the "
"last file on the camera. In this case, this "
"is file '%s'."), name);
return (GP_ERROR);
diff --git a/camlibs/stv0680/bayer.c b/camlibs/stv0680/bayer.c
index f08d060f8..c30c90ec0 100644
--- a/camlibs/stv0680/bayer.c
+++ b/camlibs/stv0680/bayer.c
@@ -121,7 +121,7 @@ void light_enhance(int vw, int vh, int coarse, int fine,
/* fprintf(stderr, "fluorescent)\n"); */
}
wb[0][0] = 1.08 * x; wb[0][1] = 1.00 * x; wb[0][2] = 0.95 * x; /* natural */
- wb[1][0] = 1.00 * x; wb[1][1] = 1.00 * x; wb[1][2] = 1.00 * x; /* flourescent */
+ wb[1][0] = 1.00 * x; wb[1][1] = 1.00 * x; wb[1][2] = 1.00 * x; /* fluorescent */
wb[2][0] = 0.90 * x; wb[2][1] = 1.00 * x; wb[2][2] = 1.11 * x; /* incandescent */
#else
if (fine > coarse) {
diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c
index c41a9b55b..bd7916003 100644
--- a/libgphoto2/gphoto2-camera.c
+++ b/libgphoto2/gphoto2-camera.c
@@ -715,7 +715,7 @@ gp_camera_init (Camera *camera, GPContext *context)
switch (camera->port->type) {
case GP_PORT_NONE:
gp_context_error (context, _("You have to set the "
- "port prior initialization of the camera."));
+ "port prior to initialization of the camera."));
return (GP_ERROR_UNKNOWN_PORT);
case GP_PORT_USB:
if (gp_port_usb_find_device (camera->port,
View Lorry Controller Status