summaryrefslogtreecommitdiff
path: root/camlibs
diff options
context:
space:
mode:
Diffstat (limited to 'camlibs')
-rw-r--r--camlibs/canon/usb.c2
-rw-r--r--camlibs/hp215/hp215.c2
-rw-r--r--camlibs/kodak/dc210/dc210.c2
-rw-r--r--camlibs/ptp2/ChangeLog2
-rw-r--r--camlibs/sierra/MC-EU1-Protocol.txt4
-rw-r--r--camlibs/sonydscf55/TODO2
-rw-r--r--camlibs/sonydscf55/camera.c4
-rw-r--r--camlibs/sonydscf55/sony.c4
8 files changed, 11 insertions, 11 deletions
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c
index 2583932a7..7fda25c47 100644
--- a/camlibs/canon/usb.c
+++ b/camlibs/canon/usb.c
@@ -2173,7 +2173,7 @@ canon_usb_set_file_attributes (Camera *camera, unsigned int attr_bits,
* correctly uploaded, cause the camera to not accept any more uploads.
* Smaller files work fine.
* s10sh (http://www.kyuzz.org/antirez/s10sh.html) has the same problem.
- * The problem only appears when USB deinitialisation and initialisation
+ * The problem only appears when USB deinitialization and initialization
* is performed between uploads. You can call this function more than
* once with big files during one session without encountering the problem
* described. <kramm@quiss.org>
diff --git a/camlibs/hp215/hp215.c b/camlibs/hp215/hp215.c
index f78ccf748..43d740729 100644
--- a/camlibs/hp215/hp215.c
+++ b/camlibs/hp215/hp215.c
@@ -841,7 +841,7 @@ camera_init (Camera *camera, GPContext *context)
settings.usb.inep = 0x83;
settings.usb.outep = 0x04;
gp_port_set_settings (camera->port, settings);
- /* This function does the initialisation sequence.
+ /* This function does the initialization sequence.
* CMD = 0xce, REPLY = 2 byte, 0xe0 0xe0 ... apparently means ok.
*/
gp_log (GP_LOG_DEBUG, "hp215", "Sending init sequence ... ");
diff --git a/camlibs/kodak/dc210/dc210.c b/camlibs/kodak/dc210/dc210.c
index c1a8dec0c..09e7acee0 100644
--- a/camlibs/kodak/dc210/dc210.c
+++ b/camlibs/kodak/dc210/dc210.c
@@ -669,7 +669,7 @@ static CameraFilesystemFuncs fsfuncs = {
int camera_init (Camera *camera, GPContext *context) {
- DC210_DEBUG("Initialising camera.\n");
+ DC210_DEBUG("Initializing camera.\n");
/* First, set up all the function pointers */
camera->functions->get_config = camera_get_config;
diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog
index c4dfb8cf9..613808643 100644
--- a/camlibs/ptp2/ChangeLog
+++ b/camlibs/ptp2/ChangeLog
@@ -1186,7 +1186,7 @@
2006-02-05 Marcus Meissner <marcus@jet.franken.de>
* library.c: Use event_check and event_wait
- functions from params struct. Initialise those
+ functions from params struct. Initialize those
entries.
2006-01-31 Marcus Meissner <marcus@jet.franken.de>
diff --git a/camlibs/sierra/MC-EU1-Protocol.txt b/camlibs/sierra/MC-EU1-Protocol.txt
index 2a94751fb..afd9648a4 100644
--- a/camlibs/sierra/MC-EU1-Protocol.txt
+++ b/camlibs/sierra/MC-EU1-Protocol.txt
@@ -35,7 +35,7 @@ Send Receive Informations
At first connection after Coolpix has been powerup, first 0x00 don't work, coolpix respond 0xFF 0xFF then nothing
A second 0x00 do the job.
-* Initialisations
+* Initializations
Need more informations...
@@ -164,7 +164,7 @@ Send Receive Informations
* "Attention" packet 0xFF from coolpix
Coolpix send 0xFF in many cases :
-- After initialisation in response to 0x00.
+- After initialization in response to 0x00.
- When Coolpix self powerdown (powersave)
- When Coolpix is powerdown
- When a picture has been recorded
diff --git a/camlibs/sonydscf55/TODO b/camlibs/sonydscf55/TODO
index a434b6602..d0fd3755a 100644
--- a/camlibs/sonydscf55/TODO
+++ b/camlibs/sonydscf55/TODO
@@ -4,7 +4,7 @@
* In cases where an error occurs during transfer, the driver can get
out of sync with the device. From that point on, the driver is unable
-to successfully initialise the driver, even for new gPhoto sessions. A
+to successfully initialize the driver, even for new gPhoto sessions. A
reboot (power-off, power-on) of the MSAC-SR1 device helps. See if it
is possible to do a proper init in such a case.
diff --git a/camlibs/sonydscf55/camera.c b/camlibs/sonydscf55/camera.c
index 95099322e..5d9771e97 100644
--- a/camlibs/sonydscf55/camera.c
+++ b/camlibs/sonydscf55/camera.c
@@ -75,7 +75,7 @@ camera_abilities(CameraAbilitiesList * list)
}
/**
- * De-initialises camera
+ * De-initializes camera
*/
static int
camera_exit(Camera * camera, GPContext *context)
@@ -311,7 +311,7 @@ static CameraFilesystemFuncs fsfuncs = {
};
/**
- * Initialises camera
+ * Initializes camera
*/
int
camera_init(Camera * camera, GPContext *context)
diff --git a/camlibs/sonydscf55/sony.c b/camlibs/sonydscf55/sony.c
index 2a15aa201..140b152e5 100644
--- a/camlibs/sonydscf55/sony.c
+++ b/camlibs/sonydscf55/sony.c
@@ -497,7 +497,7 @@ sony_baud_set(Camera * camera, long baud)
}
/**
- * Port initialisation
+ * Port initialization
*/
static int
sony_init_port (Camera *camera)
@@ -559,7 +559,7 @@ sony_is_mpeg_supported (Camera * camera)
}
/**
- * Initialises camera
+ * Initialize camera
*/
int
sony_init (Camera * camera, SonyModel model)