Merge branch 'text_corrections' into 'master'

Some fixes to US messages in source.

See merge request sane-project/backends!91
merge-requests/93/head
Ralph Little 2019-08-08 16:44:19 +00:00
commit eae96342d8
16 zmienionych plików z 32 dodań i 51 usunięć

Wyświetl plik

@ -2956,7 +2956,7 @@ init_options (Artec48U_Scanner * s)
SANE_I18N ("If enabled, only the shading correction is "
"performed during calibration. The default values "
"for gain, offset and exposure time, "
"either build-in or from the configuration file, "
"either built-in or from the configuration file, "
"are used.");
s->opt[OPT_CALIBRATE_SHADING].type = SANE_TYPE_BOOL;
s->opt[OPT_CALIBRATE_SHADING].unit = SANE_UNIT_NONE;

Wyświetl plik

@ -780,7 +780,7 @@ typedef struct acceleration_info
#define SANE_NAME_DUPLEX "duplex"
#define SANE_TITLE_DUPLEX SANE_I18N("Duplex scan")
#define SANE_DESC_DUPLEX SANE_I18N("Duplex scan provide a scan of the front and back side of the document")
#define SANE_DESC_DUPLEX SANE_I18N("Duplex scan provides a scan of the front and back side of the document")
#ifdef AVISION_ENHANCED_SANE
#warning "Compiled Avision backend will violate the SANE standard"

Wyświetl plik

@ -457,7 +457,7 @@ sense_handler (int scsi_fd, u_char * result, void *arg)
status = SANE_STATUS_UNSUPPORTED;
break;
case 0x8002:
sense_str = SANE_I18N("option not connect");
sense_str = SANE_I18N("option not correct");
status = SANE_STATUS_UNSUPPORTED;
break;
default:

Wyświetl plik

@ -4377,7 +4377,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
if(option==OPT_TOP){
opt->name = "top-edge";
opt->title = SANE_I18N ("Top edge");
opt->desc = SANE_I18N ("Paper is pulled partly into adf");
opt->desc = SANE_I18N ("Paper is pulled partly into ADF");
opt->type = SANE_TYPE_BOOL;
opt->unit = SANE_UNIT_NONE;
if (s->has_cmd_hw_status || s->ghs_in_rs)
@ -6935,7 +6935,7 @@ sane_start (SANE_Handle handle)
else{
ret = scanner_control(s, SC_function_adf);
if (ret != SANE_STATUS_GOOD) {
DBG (5, "sane_start: ERROR: cannot control adf, ignoring\n");
DBG (5, "sane_start: ERROR: cannot control ADF, ignoring\n");
}
}

Wyświetl plik

@ -5721,7 +5721,7 @@ init_options (Genesys_Scanner * s)
/* calibration needed */
s->opt[OPT_NEED_CALIBRATION_SW].name = "need-calibration";
s->opt[OPT_NEED_CALIBRATION_SW].title = SANE_I18N ("Need calibration");
s->opt[OPT_NEED_CALIBRATION_SW].title = SANE_I18N ("Needs calibration");
s->opt[OPT_NEED_CALIBRATION_SW].desc = SANE_I18N ("The scanner needs calibration for the current settings");
s->opt[OPT_NEED_CALIBRATION_SW].type = SANE_TYPE_BOOL;
s->opt[OPT_NEED_CALIBRATION_SW].unit = SANE_UNIT_NONE;

Wyświetl plik

@ -752,7 +752,7 @@ init_options (GT68xx_Scanner * s)
/* calibration needed */
s->opt[OPT_NEED_CALIBRATION_SW].name = "need-calibration";
s->opt[OPT_NEED_CALIBRATION_SW].title = SANE_I18N ("Need calibration");
s->opt[OPT_NEED_CALIBRATION_SW].title = SANE_I18N ("Needs calibration");
s->opt[OPT_NEED_CALIBRATION_SW].desc = SANE_I18N ("The scanner needs calibration for the current settings");
s->opt[OPT_NEED_CALIBRATION_SW].type = SANE_TYPE_BOOL;
s->opt[OPT_NEED_CALIBRATION_SW].unit = SANE_UNIT_NONE;

Wyświetl plik

@ -118,7 +118,7 @@
# define SANE_NAME_MATRIX_TYPE "matrix-type"
# define SANE_TITLE_MATRIX_TYPE SANE_I18N("Color Matrix")
/* FIXME: better description */
# define SANE_DESC_MATRIX_TYPE SANE_I18N("Set the scanners color matrix.")
# define SANE_DESC_MATRIX_TYPE SANE_I18N("Set the scanner's color matrix.")
#endif
#ifndef SANE_NAME_MATRIX_RGB

Wyświetl plik

@ -1405,7 +1405,7 @@ options_init (TScanner * scanner)
pDesc->title = SANE_I18N ("Scanner model");
pDesc->desc =
SANE_I18N
("Allows one to test device behaviour with other supported models");
("Allows one to test device behavior with other supported models");
pDesc->type = SANE_TYPE_STRING;
pDesc->size = max_string_size (scanner->list_models);
pDesc->constraint_type = SANE_CONSTRAINT_STRING_LIST;
@ -1419,7 +1419,7 @@ options_init (TScanner * scanner)
case opt_negative:
pDesc->name = "opt_negative";
pDesc->title = SANE_I18N ("Negative");
pDesc->desc = SANE_I18N ("Image colours will be inverted");
pDesc->desc = SANE_I18N ("Image colors will be inverted");
pDesc->type = SANE_TYPE_BOOL;
pDesc->unit = SANE_UNIT_NONE;
pDesc->size = sizeof (SANE_Word);

Wyświetl plik

@ -226,7 +226,7 @@ static const int go_image_emphasis_val[] = {
static SANE_String_Const go_gamma_list[] = {
SANE_I18N ("normal"),
SANE_I18N ("crt"),
SANE_I18N ("linier"),
SANE_I18N ("linear"),
NULL
};
static const int go_gamma_val[] = {

Wyświetl plik

@ -230,7 +230,7 @@ kvs20xx_init_options (struct scanner *s)
o->title = SANE_I18N ("Length control mode");
o->desc =
SANE_I18N
("Length Control Mode is a mode that the scanner reads up to the shorter length of actual"
("Length Control Mode causes the scanner to read the shorter of either the length of the actual"
" paper or logical document length.");
o->type = SANE_TYPE_BOOL;
o->unit = SANE_UNIT_NONE;

Wyświetl plik

@ -228,8 +228,8 @@ static SANE_String_Const lamp_list[] = {
};
static SANE_String_Const dfeed_sence_list[] = {
SANE_I18N ("Normal"),
SANE_I18N ("High sensivity"),
SANE_I18N ("Low sensivity"),
SANE_I18N ("High sensitivity"),
SANE_I18N ("Low sensitivity"),
NULL
};
@ -393,8 +393,8 @@ kvs40xx_init_options (struct scanner *s)
o->title = SANE_I18N ("Length control mode");
o->desc =
SANE_I18N
("Length Control Mode is a mode that the scanner reads up to the shorter length of actual"
" paper or logical document length.");
("Length Control Mode causes the scanner to read the shorter of either the length of the actual"
" paper or logical document length");
o->type = SANE_TYPE_BOOL;
o->unit = SANE_UNIT_NONE;
s->val[LENGTHCTL].w = SANE_FALSE;
@ -715,7 +715,7 @@ kvs40xx_init_options (struct scanner *s)
o->title = SANE_I18N ("JPEG compression");
o->desc =
SANE_I18N
("JPEG compression (yours application must be able to uncompress)");
("JPEG compression (your application must be able to uncompress)");
o->type = SANE_TYPE_BOOL;
o->unit = SANE_UNIT_NONE;
@ -805,8 +805,8 @@ kvs40xx_init_options (struct scanner *s)
o = &s->opt[STOP_SKEW];
o->name = "stop-skew";
o->title = SANE_I18N ("Stop scanner when a paper have been skewed");
o->desc = SANE_I18N ("Scanner will be stop when a paper have been skewed");
o->title = SANE_I18N ("Stop scanner if a sheet is skewed");
o->desc = SANE_I18N ("Scanner will stop if a sheet is skewed");
o->type = SANE_TYPE_BOOL;
o->unit = SANE_UNIT_NONE;
s->val[STOP_SKEW].w = SANE_FALSE;
@ -814,7 +814,7 @@ kvs40xx_init_options (struct scanner *s)
o = &s->opt[CROP];
o->name = "crop";
o->title = SANE_I18N ("Crop actual image area");
o->desc = SANE_I18N ("Scanner automatically detect image area and crop it");
o->desc = SANE_I18N ("Scanner will automatically detect image area and crop to it");
o->type = SANE_TYPE_BOOL;
o->unit = SANE_UNIT_NONE;
s->val[CROP].w = SANE_FALSE;
@ -824,7 +824,7 @@ kvs40xx_init_options (struct scanner *s)
o = &s->opt[MIRROR];
o->name = "mirror";
o->title = SANE_I18N ("Mirror image");
o->desc = SANE_I18N ("It is right and left reversing");
o->desc = SANE_I18N ("Left/right mirror image");
o->type = SANE_TYPE_BOOL;
o->unit = SANE_UNIT_NONE;
s->val[MIRROR].w = SANE_FALSE;

Wyświetl plik

@ -346,7 +346,7 @@ int build_option_descriptors(struct pixma_sane_t *ss)
sod = &opt->sod;
sod->type = SANE_TYPE_INT;
sod->title = SANE_I18N("ADF Waiting Time");
sod->desc = SANE_I18N("When set, the scanner searches the waiting time in seconds for a new document inserted into the automatic document feeder.");
sod->desc = SANE_I18N("When set, the scanner waits upto the specified time in seconds for a new document inserted into the automatic document feeder.");
sod->name = "adf-wait";
sod->unit = SANE_UNIT_NONE;
sod->size = 1 * sizeof(SANE_Word);

Wyświetl plik

@ -62,7 +62,7 @@ sane_strstatus (SANE_Status status)
return SANE_I18N("Operation not supported");
case SANE_STATUS_CANCELLED:
return SANE_I18N("Operation was cancelled");
return SANE_I18N("Operation was canceled");
case SANE_STATUS_DEVICE_BUSY:
return SANE_I18N("Device busy");

Wyświetl plik

@ -927,7 +927,7 @@ static void init_options (SnapScan_Scanner * ps)
po[OPT_ADVANCED_GROUP].constraint_type = SANE_CONSTRAINT_NONE;
po[OPT_RGB_LPR].name = "rgb-lpr";
po[OPT_RGB_LPR].title = SANE_I18N("Colour lines per read");
po[OPT_RGB_LPR].title = SANE_I18N("Color lines per read");
po[OPT_RGB_LPR].desc = lpr_desc;
po[OPT_RGB_LPR].type = SANE_TYPE_INT;
po[OPT_RGB_LPR].unit = SANE_UNIT_NONE;
@ -939,7 +939,7 @@ static void init_options (SnapScan_Scanner * ps)
ps->rgb_lpr = def_rgb_lpr;
po[OPT_GS_LPR].name = "gs-lpr";
po[OPT_GS_LPR].title = SANE_I18N("Greyscale lines per read");
po[OPT_GS_LPR].title = SANE_I18N("Grayscale lines per read");
po[OPT_GS_LPR].desc = lpr_desc;
po[OPT_GS_LPR].type = SANE_TYPE_INT;
po[OPT_GS_LPR].unit = SANE_UNIT_NONE;

Wyświetl plik

@ -243,7 +243,7 @@
/* Descriptive/help strings for above options: */
#define SANE_DESC_NUM_OPTIONS \
SANE_I18N("Read-only option that specifies how many options a specific " \
"devices supports.")
"device supports.")
#define SANE_DESC_STANDARD SANE_I18N("Source, mode and resolution options")
#define SANE_DESC_GEOMETRY SANE_I18N("Scan area and media size options")
@ -412,7 +412,7 @@ SANE_I18N("Analog gamma-correction for blue")
#define SANE_DESC_ANALOG_GAMMA_BIND \
SANE_I18N("In RGB-mode use same values for each color")
#define SANE_DESC_WARMUP \
SANE_I18N("Warmup lamp before scanning")
SANE_I18N("Warm up lamp before scanning")
#define SANE_DESC_CAL_EXPOS_TIME \
SANE_I18N("Define exposure-time for calibration")
#define SANE_DESC_CAL_EXPOS_TIME_R \

Wyświetl plik

@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n"
"POT-Creation-Date: 2019-07-23 12:14+0000\n"
"PO-Revision-Date: 2019-07-26 09:45-0700\n"
"PO-Revision-Date: 2019-08-05 18:15-0700\n"
"Last-Translator: Ralph Little <littlesincanada@yahoo.co.uk>\n"
"Language-Team: British English <kde-i18n-doc@kde.org>\n"
"Language: en_GB\n"
@ -345,7 +345,6 @@ msgstr "Analogue gamma blue"
msgid "Bind analog gamma"
msgstr "Bind analogue gamma"
# Warm->Warm up?
#: include/sane/saneopts.h:216
#, no-c-format
msgid "Warmup lamp"
@ -989,7 +988,6 @@ msgstr ""
msgid "Only perform shading-correction"
msgstr "Only perform shading-correction"
# "build" should really be "built" in original text
#: backend/artec_eplus48u.c:2956
#, no-c-format
msgid ""
@ -1021,7 +1019,6 @@ msgstr "Selects the number of the frame to scan"
msgid "Duplex scan"
msgstr "Duplex scan"
# Original should be "Duplex scan provides..."
#: backend/avision.h:783
#, no-c-format
msgid ""
@ -1237,7 +1234,7 @@ msgstr "invalid bit IDENTIFY message"
#: backend/canon.c:460
#, no-c-format
msgid "option not connect"
msgstr "option not connect"
msgstr "option not correct"
#: backend/canon.c:474
#, no-c-format
@ -2862,7 +2859,6 @@ msgstr ""
msgid "Top edge"
msgstr "Top edge"
# Shouldn't we standardise on ADF? i.e. not adf
#: backend/fujitsu.c:4380
#, no-c-format
msgid "Paper is pulled partly into adf"
@ -3149,11 +3145,10 @@ msgstr "Power button"
msgid "Extra button"
msgstr "Extra button"
# Need->Needs?
#: backend/genesys.cc:5724 backend/gt68xx.c:755
#, no-c-format
msgid "Need calibration"
msgstr "Need calibration"
msgstr "Needs calibration"
#: backend/genesys.cc:5725 backend/gt68xx.c:756
#, no-c-format
@ -3328,13 +3323,11 @@ msgstr "Slide"
msgid "Scanner model"
msgstr "Scanner model"
# US spelling of behaviour is incorrect
#: backend/hp3900_sane.c:1408
#, no-c-format
msgid "Allows one to test device behaviour with other supported models"
msgstr "Allows one to test device behaviour with other supported models"
# US spelling of colour is incorrect
#: backend/hp3900_sane.c:1422
#, no-c-format
msgid "Image colours will be inverted"
@ -3858,7 +3851,6 @@ msgstr ""
msgid "Color Matrix"
msgstr "Colour Matrix"
# Requires apostrophe
#: backend/hp-option.h:121
#, no-c-format
msgid "Set the scanners color matrix."
@ -4205,7 +4197,6 @@ msgstr "high"
msgid "crt"
msgstr "crt"
# Linear?
#: backend/kvs1025_opt.c:229
#, no-c-format
msgid "linier"
@ -4411,8 +4402,8 @@ msgid ""
"Length Control Mode is a mode that the scanner reads up to the shorter "
"length of actual paper or logical document length."
msgstr ""
"Length Control Mode is a mode that the scanner reads up to the shorter "
"length of actual paper or logical document length."
"Length Control Mode causes the scanner to read the shorter of either the "
"length of the actual paper or logical document length."
#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
@ -4441,13 +4432,11 @@ msgstr "Double letter 11x17 in"
msgid "B4"
msgstr "B4"
# sensivity->sensitivity
#: backend/kvs40xx_opt.c:231
#, no-c-format
msgid "High sensivity"
msgstr "High sensitivity"
# sensivity->sensitivity
#: backend/kvs40xx_opt.c:232
#, no-c-format
msgid "Low sensivity"
@ -4533,7 +4522,6 @@ msgstr "Inverse image in B/W mode"
msgid "JPEG compression"
msgstr "JPEG compression"
# yours->your
#: backend/kvs40xx_opt.c:718
#, no-c-format
msgid "JPEG compression (yours application must be able to uncompress)"
@ -4569,13 +4557,11 @@ msgstr "Set chroma of blue"
msgid "Skew adjustment"
msgstr "Skew adjustment"
# Grammar?
#: backend/kvs40xx_opt.c:808
#, no-c-format
msgid "Stop scanner when a paper have been skewed"
msgstr "Stop scanner if a sheet is skewed"
# stop->stopped
#: backend/kvs40xx_opt.c:809
#, no-c-format
msgid "Scanner will be stop when a paper have been skewed"
@ -4586,13 +4572,11 @@ msgstr "Scanner will be stopped if sheet is skewed"
msgid "Crop actual image area"
msgstr "Crop actual image area"
# detect->detects; crop->crops
#: backend/kvs40xx_opt.c:817
#, no-c-format
msgid "Scanner automatically detect image area and crop it"
msgstr "Scanner automatically detects image area and crops it"
# Grammar?
#: backend/kvs40xx_opt.c:827
#, no-c-format
msgid "It is right and left reversing"
@ -5341,7 +5325,6 @@ msgstr "Target operation type"
msgid "ADF Waiting Time"
msgstr "ADF Waiting Time"
# Grammar could be improved.
#: backend/pixma_sane_options.c:349
#, no-c-format
msgid ""
@ -5869,13 +5852,11 @@ msgstr "Focus-point"
msgid "Focus point"
msgstr "Focus point"
# Original should specify "color" not colour.
#: backend/snapscan-options.c:930
#, no-c-format
msgid "Colour lines per read"
msgstr "Colour lines per read"
# Original should specify gray
#: backend/snapscan-options.c:942
#, no-c-format
msgid "Greyscale lines per read"