darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* *.c: Made more strngs translatable, actually translate manuals and window names.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6097 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2003-01-14 22:41:15 +00:00
parent 3a641b3dfa
commit 07d473cf24
6 changed files with 124 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camlibs/sierra/ChangeLog
View File

@@ -1,7 +1,15 @@
2002-01-14 Marcus Meissner <marcus@jet.franken.de>
* *.c: enabled more translations, added some missing _().
2002-01-14 Lutz Müller <lutz@users.sourceforge.net>
* sierra.c: Split the model string into manufacturer and model.
2002-01-03 Marcus Meissner <marcus@jet.franken.de>
* sierra.c: Epson PhotoPC 650 at least partially working.
2002-01-03 Marcus Meissner <marcus@jet.franken.de>
* library.c: Replaced stack allocated CameraList by dynamic

60
camlibs/sierra/epson-desc.c
View File

@@ -121,7 +121,7 @@ static const RegisterDescriptorType ep3000z_reg_03[] = {
};
#else
static const ValueNameType ep3000z_reg_03_val_names[] = {
{ { 0 }, "Auto" },
{ { 0 }, N_("Auto") },
{ { 1250 }, "1/800" },
{ { 2000 }, "1/500" },
{ { 2500 }, "1/400" },
@@ -165,7 +165,7 @@ static const RegisterDescriptorType ep3000z_reg_03[] = {
* Register 5: aperature settings.
*/
static const ValueNameType ep3000z_reg_05_val_names[] = {
{ { 6 }, "auto" },
{ { 6 }, N_("auto") },
{ { 0 }, "F2.0" },
{ { 1 }, "F2.3" },
{ { 2 }, "F2.8" },
@@ -185,8 +185,8 @@ static const RegisterDescriptorType ep3000z_reg_05[] = {
* Register 6: color mode
*/
static const ValueNameType ep3000z_reg_06_val_names[] = {
{ { 1 }, "Color" },
{ { 2 }, "Black & White" },
{ { 1 }, N_("Color") },
{ { 2 }, N_("Black & White") },
};
static const RegisterDescriptorType ep3000z_reg_06[] = {
{
@@ -200,11 +200,11 @@ static const RegisterDescriptorType ep3000z_reg_06[] = {
* Register 7: flash settings
*/
static const ValueNameType ep3000z_reg_07_val_names[] = {
{ { 0 }, "Auto" },
{ { 1 }, "Force" },
{ { 2 }, "Off" },
{ { 3 }, "Red-eye Reduction" },
{ { 4 }, "Slow Sync" },
{ { 0 }, N_("Auto") },
{ { 1 }, N_("Force") },
{ { 2 }, N_("Off") },
{ { 3 }, N_("Red-eye Reduction") },
{ { 4 }, N_("Slow Sync") },
};
static const RegisterDescriptorType ep3000z_reg_07[] = {
{
@@ -218,9 +218,9 @@ static const RegisterDescriptorType ep3000z_reg_07[] = {
* Register 20: white balance.
*/
static const ValueNameType ep3000z_reg_20_val_names[] = {
{ { 0x00 }, "Auto" },
{ { 0x01 }, "Fixed" },
{ { 0xFF }, "Custom" },
{ { 0x00 }, N_("Auto") },
{ { 0x01 }, N_("Fixed") },
{ { 0xFF }, N_("Custom") },
};
static const RegisterDescriptorType ep3000z_reg_20[] = {
{
@@ -267,8 +267,8 @@ static const RegisterDescriptorType ep3000z_reg_24[] = {
* Register 33: Lens mode.
*/
static const ValueNameType ep3000z_reg_33_val_names[] = {
{ { 0x01 }, "Macro" },
{ { 0x02 }, "Normal" },
{ { 0x01 }, N_("Macro") },
{ { 0x02 }, N_("Normal") },
};
static const RegisterDescriptorType ep3000z_reg_33[] = {
{
@@ -288,9 +288,9 @@ static const RegisterDescriptorType ep3000z_reg_33[] = {
*/
/*
static const ValueNameType ep3000z_reg_34_val_names[] = {
{ { 0x01 }, "Off" },
{ { 0x02 }, "Monitor" },
{ { 0x03 }, "Normal" },
{ { 0x01 }, N_("Off") },
{ { 0x02 }, N_("Monitor") },
{ { 0x03 }, N_("Normal") },
};
static const RegisterDescriptorType ep3000z_reg_34[] = {
{
@@ -337,7 +337,7 @@ static const RegisterDescriptorType ep3000z_reg_38[] = {
*/
/*
static const ValueNameType ep3000z_reg_41_val_names[] = {
{ { 0 }, "Off" },
{ { 0 }, N("Off") },
{ { 1 }, "yymmdd" },
{ { 2 }, "mmddyy" },
{ { 3 }, "ddmmyy" },
@@ -355,14 +355,14 @@ static const RegisterDescriptorType ep3000z_reg_41[] = {
* Register 53: language setting.
*/
static const ValueNameType ep3000z_reg_53_val_names[] = {
{ { 0x01 }, "Korean" },
{ { 0x03 }, "English" },
{ { 0x04 }, "French" },
{ { 0x05 }, "German" },
{ { 0x06 }, "Italian" },
{ { 0x07 }, "Japanese" },
{ { 0x08 }, "Spanish" },
{ { 0x09 }, "Portugese" },
{ { 0x01 }, N_("Korean") },
{ { 0x03 }, N_("English") },
{ { 0x04 }, N_("French") },
{ { 0x05 }, N_("German") },
{ { 0x06 }, N_("Italian") },
{ { 0x07 }, N_("Japanese") },
{ { 0x08 }, N_("Spanish") },
{ { 0x09 }, N_("Portugese") },
};
static const RegisterDescriptorType ep3000z_reg_53[] = {
@@ -407,8 +407,8 @@ static const RegisterDescriptorType ep3000z_reg_69[] = {
* TOCHECK: was not implemented on ep3000z
*/
/*static const ValueNameType ep3000z_reg_70_val_names[] = {
{ { 0x03 }, "Spot" },
{ { 0x05 }, "Matrix" },
{ { 0x03 }, N_("Spot") },
{ { 0x05 }, N_("Matrix") },
};
static const RegisterDescriptorType ep3000z_reg_70[] = {
{
@@ -443,7 +443,7 @@ static const RegisterDescriptorType ep3000z_reg_71[] = {
*/
/*
static const ValueNameType ep3000z_reg_72_val_names[] = {
{ { 0x0000 }, "Off" },
{ { 0x0000 }, N_("Off") },
{ { 0x0208 }, "1.5x" },
{ { 0x0008 }, "2x" },
{ { 0x0408 }, "2.5x" },
@@ -463,7 +463,7 @@ static const RegisterDescriptorType ep3000z_reg_72[] = {
*/
/*
static const ValueNameType ep3000z_reg_85_val_names[] = {
{ { 0 }, "Auto" },
{ { 0 }, N_("Auto") },
{ { 1 }, "100" },
{ { 2 }, "200" },
{ { 3 }, "400" },

105
camlibs/sierra/nikon-desc.c
View File

@@ -130,7 +130,7 @@ static const RegisterDescriptorType cp880_reg_03[] = {
};
#endif
static const ValueNameType cp880_reg_03_val_names[] = {
{ { 0 }, "Auto" },
{ { 0 }, N_("Auto") },
{ { 1000 }, "1/1000" },
{ { 2000 }, "1/500" },
{ { 4000 }, "1/250" },
@@ -164,10 +164,10 @@ static const RegisterDescriptorType cp880_reg_03[] = {
* Register 5: aperature settings (f-stop)
*/
static const ValueNameType cp880_reg_05_val_names[] = {
{ { 0 }, "Auto" },
{ { 1 }, "Low" },
{ { 2 }, "Medium" },
/* { { 4 }, "High" }, not on a cp880 */
{ { 0 }, N_("Auto") },
{ { 1 }, N_("Low") },
{ { 2 }, N_("Medium") },
/* { { 4 }, N_("High") }, not on a cp880 */
};
static const RegisterDescriptorType cp880_reg_05[] = {
{
@@ -181,8 +181,8 @@ static const RegisterDescriptorType cp880_reg_05[] = {
* Register 6: color mode (not tested on cp880)
*/
static const ValueNameType cp880_reg_06_val_names[] = {
{ { 1 }, "Color" },
{ { 2 }, "B/W" },
{ { 1 }, N_("Color") },
{ { 2 }, N_("B/W") },
};
static const RegisterDescriptorType cp880_reg_06[] = {
{
@@ -196,11 +196,11 @@ static const RegisterDescriptorType cp880_reg_06[] = {
* Register 7: flash settings
*/
static const ValueNameType cp880_reg_07_val_names[] = {
{ { 0 }, "Auto" },
{ { 1 }, "Force" },
{ { 2 }, "Off" },
{ { 3 }, "Anti-redeye" },
{ { 4 }, "Slow-sync" },
{ { 0 }, N_("Auto") },
{ { 1 }, N_("Force") },
{ { 2 }, N_("Off") },
{ { 3 }, N_("Anti-redeye") },
{ { 4 }, N_("Slow-sync") },
};
static const RegisterDescriptorType cp880_reg_07[] = {
{
@@ -214,12 +214,12 @@ static const RegisterDescriptorType cp880_reg_07[] = {
* Register 19: Image adjustment.
*/
static const ValueNameType cp880_reg_19_val_names[] = {
{ { 5 }, "Auto" },
{ { 0 }, "Normal" }, /* also 0 if chose b+w */
{ { 1 }, "Contrast+" }, /* cp880 more contrast */
{ { 2 }, "Contrast-" }, /* cp880 less contrast */
{ { 3 }, "Brightness+" }, /* cp880 lighten image */
{ { 4 }, "Brightness-" }, /* cp880 darken image */
{ { 5 }, N_("Auto") },
{ { 0 }, N_("Normal") }, /* also 0 if chose b+w */
{ { 1 }, N_("Contrast+") }, /* cp880 more contrast */
{ { 2 }, N_("Contrast-") }, /* cp880 less contrast */
{ { 3 }, N_("Brightness+") }, /* cp880 lighten image */
{ { 4 }, N_("Brightness-") }, /* cp880 darken image */
};
static const RegisterDescriptorType cp880_reg_19[] = {
{
@@ -244,13 +244,13 @@ static const RegisterDescriptorType cp880_reg_19[] = {
* It appears this needs the sierra extended protocol to be complete.
*/
static const ValueNameType cp880_reg_20_val_names[] = {
{ { 0x00 }, "Auto" },
{ { 0x01 }, "Fine" }, /* fine +3, +2, ... -3 */
{ { 0x02 }, "Incandescent" }, /* incan +3 ... -3 */
{ { 0x03 }, "Fluorescent" }, /* FL3, FL2, and FL1 */
{ { 0x05 }, "Flash" }, /* speedlight/flash +3 ... -3 */
{ { 0x06 }, "Preset" }, /* preset automatically by camera, prob range */
{ { 0xff }, "Cloudy" }, /* cloudy +3 ... -3 */
{ { 0x00 }, N_("Auto") },
{ { 0x01 }, N_("Fine") }, /* fine +3, +2, ... -3 */
{ { 0x02 }, N_("Incandescent") }, /* incan +3 ... -3 */
{ { 0x03 }, N_("Fluorescent") }, /* FL3, FL2, and FL1 */
{ { 0x05 }, N_("Flash") }, /* speedlight/flash +3 ... -3 */
{ { 0x06 }, N_("Preset") }, /* preset automatically by camera, prob range */
{ { 0xff }, N_("Cloudy") }, /* cloudy +3 ... -3 */
};
static const RegisterDescriptorType cp880_reg_20[] = {
{
@@ -265,9 +265,9 @@ static const RegisterDescriptorType cp880_reg_20[] = {
* Register 30: LED mode, can't even read this on a cp880.
*/
static const ValueNameType cp880_reg_30_val_names[] = {
{ { 0x00 }, "Off" },
{ { 0x01 }, "On" },
{ { 0x02 }, "Blink" },
{ { 0x00 }, N_("Off") },
{ { 0x01 }, N_("On") },
{ { 0x02 }, N_("Blink") },
};
static const RegisterDescriptorType cp880_reg_30[] = {
{
@@ -285,9 +285,9 @@ static const RegisterDescriptorType cp880_reg_30[] = {
* does not turn off the flash.
*/
static const ValueNameType cp880_reg_33_val_names[] = {
{ { 0x01 }, "Macro" },
{ { 0x02 }, "Normal" },
{ { 0x03 }, "Infinity" },
{ { 0x01 }, N_("Macro") },
{ { 0x02 }, N_("Normal") },
{ { 0x03 }, N_("Infinity") },
};
static const RegisterDescriptorType cp880_reg_33[] = {
{
@@ -320,12 +320,12 @@ static const RegisterDescriptorType cp880_reg_33[] = {
* above kluge.
*/
static const ValueNameType cp880_reg_34_val_names[] = {
{ { 0x01 }, "Off" }, /* turn off lcd while waiting to capture */
{ { 0x02 }, "Record" }, /* turn on lcd while waiting to capture */
{ { 0x03 }, "Play" }, /* slide-show like mode */
{ { 0x06 }, "Preview Thumbnail" }, /* slide-show thumbnail */
{ { 0x07 }, "Next" }, /* go to the next image */
{ { 0x08 }, "Previous" }, /* go to previous image */
{ { 0x01 }, N_("Off") }, /* turn off lcd while waiting to capture */
{ { 0x02 }, N_("Record") }, /* turn on lcd while waiting to capture */
{ { 0x03 }, N_("Play") }, /* slide-show like mode */
{ { 0x06 }, N_("Preview Thumbnail") }, /* slide-show thumbnail */
{ { 0x07 }, N_("Next") }, /* go to the next image */
{ { 0x08 }, N_("Previous") }, /* go to previous image */
/*
{ { 0x00 }, "unknown 0x00" },
{ { 0x04 }, "unknown 0x04" },
@@ -380,9 +380,9 @@ static const RegisterDescriptorType cp880_reg_38[] = {
* It appears this needs the sierra extended protocol to be complete.
*/
static const ValueNameType cp880_reg_53_val_names[] = {
{ { 0x03 }, "English" },
{ { 0x04 }, "French" },
{ { 0x05 }, "German" },
{ { 0x03 }, N_("English") },
{ { 0x04 }, N_("French") },
{ { 0x05 }, N_("German") },
/* { { 0x06 }, "Italian" }, not on cp880 */
/* { { 0x08 }, "Spanish" }, not on cp880 */
/* { { 0x0a }, "Dutch" }, not on cp880 */
@@ -452,10 +452,10 @@ static const RegisterDescriptorType cp880_reg_69[] = {
* Register 70: exposure meter.
*/
static const ValueNameType cp880_reg_70_val_names[] = {
{ { 0x02 }, "Center-Weighted" },
{ { 0x03 }, "Spot" },
{ { 0x05 }, "Matrix" },
{ { 0x06 }, "Spot-AF" },
{ { 0x02 }, N_("Center-Weighted") },
{ { 0x03 }, N_("Spot") },
{ { 0x05 }, N_("Matrix") },
{ { 0x06 }, N_("Spot-AF") },
};
static const RegisterDescriptorType cp880_reg_70[] = {
{
@@ -504,13 +504,12 @@ static const ValueNameType cp880_reg_72_mask_hi_val_names[] = {
{ { 0x0200 }, "1.60" },
{ { 0x0300 }, "2.00" },
{ { 0x0400 }, "2.50" },
{ { 0x0500 }, "none" },
{ { 0x0500 }, N_("none") },
};
static const ValueNameType cp880_reg_72_mask_lo_val_names[] = {
{ { 0x0001 }, "AE-lock" },
{ { 0x0002 }, "Fisheye" },
{ { 0x0004 }, "Wide" },
{ { 0x0001 }, N_("AE-lock") },
{ { 0x0002 }, N_("Fisheye") },
{ { 0x0004 }, N_("Wide") },
};
static const RegisterDescriptorType cp880_reg_72[] = {
{
@@ -526,13 +525,13 @@ static const RegisterDescriptorType cp880_reg_72[] = {
};
#endif
static const ValueNameType cp880_reg_72_mask_hi_val_names[] = {
{ { 0x00 }, "off" },
{ { 0x08 }, "on" },
{ { 0x00 }, N_("off") },
{ { 0x08 }, N_("on") },
};
static const ValueNameType cp880_reg_72_mask_lo_val_names[] = {
{ { 0x00 }, "off" },
{ { 0x01 }, "on" },
{ { 0x00 }, N_("off") },
{ { 0x01 }, N_("on") },
};
static const RegisterDescriptorType cp880_reg_72[] = {

60
camlibs/sierra/olympus-desc.c
View File

@@ -143,7 +143,7 @@ static const RegisterDescriptorType oly3040_reg_03[] = {
};
#else
static const ValueNameType oly3040_reg_03_val_names[] = {
{ { 0 }, "Auto" },
{ { 0 }, N_("Auto") },
{ { 1250 }, "1/800" },
{ { 2000 }, "1/500" },
{ { 2500 }, "1/400" },
@@ -187,7 +187,7 @@ static const RegisterDescriptorType oly3040_reg_03[] = {
* In A mode, shutter speed is compensated
*/
static const ValueNameType oly3040_reg_05_val_names[] = {
{ { 0 }, "Auto" },
{ { 0 }, N_("Auto") },
{ { 1 }, "F1.8" },
{ { 2 }, "F2.0" },
{ { 3 }, "F2.3" },
@@ -217,11 +217,11 @@ static const RegisterDescriptorType oly3040_reg_05[] = {
* Register 6: color mode
*/
static const ValueNameType oly3040_reg_06_val_names[] = {
{ { 0 }, "Normal" },
{ { 1 }, "B/W" },
{ { 2 }, "Sepia" },
{ { 3 }, "White board" },
{ { 4 }, "Black board" },
{ { 0 }, N_("Normal") },
{ { 1 }, N_("B/W") },
{ { 2 }, N_("Sepia") },
{ { 3 }, N_("White board") },
{ { 4 }, N_("Black board") },
};
static const RegisterDescriptorType oly3040_reg_06[] = {
{
@@ -235,10 +235,10 @@ static const RegisterDescriptorType oly3040_reg_06[] = {
* Register 7: flash settings
*/
static const ValueNameType oly3040_reg_07_val_names[] = {
{ { 0 }, "Auto" },
{ { 1 }, "Force" },
{ { 2 }, "Off" },
{ { 3 }, "Anti-redeye" },
{ { 0 }, N_("Auto") },
{ { 1 }, N_("Force") },
{ { 2 }, N_("Off") },
{ { 3 }, N_("Anti-redeye") },
};
static const RegisterDescriptorType oly3040_reg_07[] = {
{
@@ -252,11 +252,11 @@ static const RegisterDescriptorType oly3040_reg_07[] = {
* Register 20: white balance.
*/
static const ValueNameType oly3040_reg_20_val_names[] = {
{ { 0x00 }, "Auto" },
{ { 0x01 }, "Daylight" },
{ { 0x02 }, "Fluorescent" },
{ { 0x03 }, "Tungsten" },
{ { 0xff }, "Cloudy" },
{ { 0x00 }, N_("Auto") },
{ { 0x01 }, N_("Daylight") },
{ { 0x02 }, N_("Fluorescent") },
{ { 0x03 }, N_("Tungsten") },
{ { 0xff }, N_("Cloudy") },
};
static const RegisterDescriptorType oly3040_reg_20[] = {
{
@@ -271,9 +271,9 @@ static const RegisterDescriptorType oly3040_reg_20[] = {
* Register 33: focus mode.
*/
static const ValueNameType oly3040_reg_33_val_names[] = {
{ { 0x01 }, "Macro" },
{ { 0x02 }, "Auto" },
{ { 0x03 }, "Manual" },
{ { 0x01 }, N_("Macro") },
{ { 0x02 }, N_("Auto") },
{ { 0x03 }, N_("Manual") },
};
static const RegisterDescriptorType oly3040_reg_33[] = {
{
@@ -292,9 +292,9 @@ static const RegisterDescriptorType oly3040_reg_33[] = {
*/
static const ValueNameType oly3040_reg_34_val_names[] = {
{ { 0x01 }, "Off" },
{ { 0x02 }, "Monitor" },
{ { 0x03 }, "Normal" },
{ { 0x01 }, N_("Off") },
{ { 0x02 }, N_("Monitor") },
{ { 0x03 }, N_("Normal") },
};
static const RegisterDescriptorType oly3040_reg_34[] = {
{
@@ -366,9 +366,9 @@ static const RegisterDescriptorType oly3040_reg_38[] = {
*/
/*
static const ValueNameType oly3040_reg_53_val_names[] = {
{ { 0x03 }, "English" },
{ { 0x04 }, "French" },
{ { 0x05 }, "German" },
{ { 0x03 }, N_("English") },
{ { 0x04 }, N_("French") },
{ { 0x05 }, N_("German") },
};
static const RegisterDescriptorType oly3040_reg_53[] = {
{
@@ -409,8 +409,8 @@ static const RegisterDescriptorType oly3040_reg_69[] = {
* Register 70: exposure meter.
*/
static const ValueNameType oly3040_reg_70_val_names[] = {
{ { 0x03 }, "Spot" },
{ { 0x05 }, "Matrix" },
{ { 0x03 }, N_("Spot") },
{ { 0x05 }, N_("Matrix") },
};
static const RegisterDescriptorType oly3040_reg_70[] = {
{
@@ -440,7 +440,7 @@ static const RegisterDescriptorType oly3040_reg_71[] = {
* Register 72: digital zoom
*/
static const ValueNameType oly3040_reg_72_val_names[] = {
{ { 0x0000 }, "Off" },
{ { 0x0000 }, N_("Off") },
{ { 0x0208 }, "1.5x" },
{ { 0x0008 }, "2x" },
{ { 0x0408 }, "2.5x" },
@@ -457,7 +457,7 @@ static const RegisterDescriptorType oly3040_reg_72[] = {
* Register 85: ISO speed, read only
*/
static const ValueNameType oly3040_reg_85_val_names[] = {
{ { 0 }, "Auto" },
{ { 0 }, N_("Auto") },
{ { 1 }, "100" },
{ { 2 }, "200" },
{ { 3 }, "400" },
@@ -490,7 +490,7 @@ static const RegisterDescriptorType oly3040_reg_103[] = {
* Register 41: time format, read only
*/
static const ValueNameType oly3040_reg_41_val_names[] = {
{ { 0 }, "Off" },
{ { 0 }, N_("Off") },
{ { 1 }, "yymmdd" },
{ { 2 }, "mmddyy" },
{ { 3 }, "ddmmyy" },

2
camlibs/sierra/sierra-desc.c
View File

@@ -194,7 +194,7 @@ camera_get_config_cam_desc (Camera *camera, CameraWidget **window,
for (indw = 0; indw < 2 /* XXX sizeof () */; indw++) {
GP_DEBUG ("%s registers", cam_desc->regset[indw].window_name);
gp_widget_new (GP_WIDGET_SECTION,
cam_desc->regset[indw].window_name, &section);
_(cam_desc->regset[indw].window_name), &section);
gp_widget_append (*window, section);
for (indr = 0; indr < cam_desc->regset[indw].reg_cnt; indr++) {
camera_cam_desc_get_widget (camera,

5
camlibs/sierra/sierra.c
View File

@@ -1808,6 +1808,7 @@ 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);
if (sierra_get_string_register (camera, 48, 0, NULL, t, &v, c) >= 0)
@@ -1848,9 +1849,9 @@ camera_manual (Camera *camera, CameraText *manual, GPContext *context)
switch (camera->pl->model) {
case SIERRA_MODEL_CAM_DESC:
if (camera->pl->cam_desc->manual == NULL) {
strcpy (manual->text, "No camera manual available.\n");
strcpy (manual->text, _("No camera manual available.\n"));
} else {
strcpy (manual->text, camera->pl->cam_desc->manual);
strcpy (manual->text, _(camera->pl->cam_desc->manual));
}
break;
case SIERRA_MODEL_EPSON: