From 734bcddfcfbb6f802aa0975a8423b3be5b874ca6 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 12 Sep 2009 11:15:47 +0200 Subject: [PATCH] Canonicalise some printed strings, to make translators' lives easier --- src/language/command.c | 4 ++-- src/language/data-io/combine-files.c | 4 ++-- src/language/dictionary/modify-variables.c | 8 ++++---- src/language/dictionary/sys-file-info.c | 10 +++++----- src/language/stats/descriptives.c | 6 +++--- src/language/stats/t-test.q | 6 +++--- src/language/utilities/set.q | 2 +- src/ui/gui/recode.glade | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/language/command.c b/src/language/command.c index c00d94b9..32dba0b4 100644 --- a/src/language/command.c +++ b/src/language/command.c @@ -689,9 +689,9 @@ report_state_mismatch (const struct command *command, enum cmd_state state) } } else if (state == CMD_STATE_INPUT_PROGRAM) - msg (SE, _("%s is not allowed inside INPUT PROGRAM."), command->name); + msg (SE, _("%s is not allowed inside %s."), command->name, "INPUT PROGRAM" ); else if (state == CMD_STATE_FILE_TYPE) - msg (SE, _("%s is not allowed inside FILE TYPE."), command->name); + msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE"); return false; } diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c index 64405180..d4b9bf58 100644 --- a/src/language/data-io/combine-files.c +++ b/src/language/data-io/combine-files.c @@ -378,12 +378,12 @@ combine_files (enum comb_command_type command, } if (n_tables) { - msg (SE, _("BY is required when TABLE is specified.")); + msg (SE, _("BY is required when %s is specified."), "TABLE"); goto error; } if (saw_sort) { - msg (SE, _("BY is required when SORT is specified.")); + msg (SE, _("BY is required when %s is specified."), "SORT"); goto error; } } diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c index cd501691..64204b78 100644 --- a/src/language/dictionary/modify-variables.c +++ b/src/language/dictionary/modify-variables.c @@ -111,7 +111,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) if (already_encountered & 1) { - msg (SE, _("REORDER subcommand may be given at most once.")); + msg (SE, _("%s subcommand may be given at most once."), "REORDER"); goto done; } already_encountered |= 1; @@ -144,7 +144,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) { if (!lex_match (lexer, '(')) { - msg (SE, _("`(' expected on REORDER subcommand.")); + msg (SE, _("`(' expected on %s subcommand."), "REORDER"); free (v); goto done; } @@ -174,7 +174,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) { if (already_encountered & 2) { - msg (SE, _("RENAME subcommand may be given at most once.")); + msg (SE, _("%s subcommand may be given at most once."), "RENAME"); goto done; } already_encountered |= 2; @@ -187,7 +187,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) if (!lex_match (lexer, '(')) { - msg (SE, _("`(' expected on RENAME subcommand.")); + msg (SE, _("`(' expected on %s subcommand."), "RENAME"); goto done; } if (!parse_variables (lexer, dataset_dict (ds), diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 6a0c81ac..f68a830b 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -124,9 +124,9 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) info.creation_date, info.creation_time, info.product); tab_text (t, 0, 3, TAB_LEFT, _("Integer Format:")); tab_text (t, 1, 3, TAB_LEFT, - info.integer_format == INTEGER_MSB_FIRST ? _("Big Endian.") - : info.integer_format == INTEGER_LSB_FIRST ? _("Little Endian.") - : _("Unknown.")); + info.integer_format == INTEGER_MSB_FIRST ? _("Big Endian") + : info.integer_format == INTEGER_LSB_FIRST ? _("Little Endian") + : _("Unknown")); tab_text (t, 0, 4, TAB_LEFT, _("Real Format:")); tab_text (t, 1, 4, TAB_LEFT, info.float_format == FLOAT_IEEE_DOUBLE_LE ? _("IEEE 754 LE.") @@ -134,7 +134,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) : info.float_format == FLOAT_VAX_D ? _("VAX D.") : info.float_format == FLOAT_VAX_G ? _("VAX G.") : info.float_format == FLOAT_Z_LONG ? _("IBM 390 Hex Long.") - : _("Unknown.")); + : _("Unknown")); tab_text (t, 0, 5, TAB_LEFT, _("Variables:")); tab_text_format (t, 1, 5, TAB_LEFT, "%zu", dict_get_var_cnt (d)); tab_text (t, 0, 6, TAB_LEFT, _("Cases:")); @@ -142,7 +142,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) info.case_cnt == -1 ? _("Unknown") : "%ld", (long int) info.case_cnt); tab_text (t, 0, 7, TAB_LEFT, _("Type:")); - tab_text (t, 1, 7, TAB_LEFT, _("System File.")); + tab_text (t, 1, 7, TAB_LEFT, _("System File")); tab_text (t, 0, 8, TAB_LEFT, _("Weight:")); { struct variable *weight_var = dict_get_weight (d); diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index 7b30a601..6b57fd29 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -100,13 +100,13 @@ struct dsc_statistic_info static const struct dsc_statistic_info dsc_info[DSC_N_STATS] = { {"MEAN", N_("Mean"), MOMENT_MEAN}, - {"SEMEAN", N_("S E Mean"), MOMENT_VARIANCE}, + {"SEMEAN", N_("S.E. Mean"), MOMENT_VARIANCE}, {"STDDEV", N_("Std Dev"), MOMENT_VARIANCE}, {"VARIANCE", N_("Variance"), MOMENT_VARIANCE}, {"KURTOSIS", N_("Kurtosis"), MOMENT_KURTOSIS}, - {"SEKURTOSIS", N_("S E Kurt"), MOMENT_NONE}, + {"SEKURTOSIS", N_("S.E. Kurt"), MOMENT_NONE}, {"SKEWNESS", N_("Skewness"), MOMENT_SKEWNESS}, - {"SESKEWNESS", N_("S E Skew"), MOMENT_NONE}, + {"SESKEWNESS", N_("S.E. Skew"), MOMENT_NONE}, {"RANGE", N_("Range"), MOMENT_NONE}, {"MINIMUM", N_("Minimum"), MOMENT_NONE}, {"MAXIMUM", N_("Maximum"), MOMENT_NONE}, diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q index d02cdb28..d25477cd 100644 --- a/src/language/stats/t-test.q +++ b/src/language/stats/t-test.q @@ -506,7 +506,7 @@ ssbox_one_sample_init (struct ssbox *this, struct t_test_proc *proc) tab_text (this->t, 1, 0, TAB_CENTER | TAT_TITLE, _("N")); tab_text (this->t, 2, 0, TAB_CENTER | TAT_TITLE, _("Mean")); tab_text (this->t, 3, 0, TAB_CENTER | TAT_TITLE, _("Std. Deviation")); - tab_text (this->t, 4, 0, TAB_CENTER | TAT_TITLE, _("SE. Mean")); + tab_text (this->t, 4, 0, TAB_CENTER | TAT_TITLE, _("S.E. Mean")); } /* Initialize the independent samples ssbox */ @@ -526,7 +526,7 @@ ssbox_independent_samples_init (struct ssbox *this, struct t_test_proc *proc) tab_text (this->t, 2, 0, TAB_CENTER | TAT_TITLE, _("N")); tab_text (this->t, 3, 0, TAB_CENTER | TAT_TITLE, _("Mean")); tab_text (this->t, 4, 0, TAB_CENTER | TAT_TITLE, _("Std. Deviation")); - tab_text (this->t, 5, 0, TAB_CENTER | TAT_TITLE, _("SE. Mean")); + tab_text (this->t, 5, 0, TAB_CENTER | TAT_TITLE, _("S.E. Mean")); } /* Populate the ssbox for independent samples */ @@ -625,7 +625,7 @@ ssbox_paired_init (struct ssbox *this, struct t_test_proc *proc) tab_text (this->t, 2, 0, TAB_CENTER | TAT_TITLE, _("Mean")); tab_text (this->t, 3, 0, TAB_CENTER | TAT_TITLE, _("N")); tab_text (this->t, 4, 0, TAB_CENTER | TAT_TITLE, _("Std. Deviation")); - tab_text (this->t, 5, 0, TAB_CENTER | TAT_TITLE, _("SE. Mean")); + tab_text (this->t, 5, 0, TAB_CENTER | TAT_TITLE, _("S.E. Mean")); } /* Populate the ssbox for paired values */ diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index fd4e1a93..5c2b571e 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -224,7 +224,7 @@ cmd_set (struct lexer *lexer, struct dataset *ds) msg (SW, _("%s is obsolete."), "TB1"); if (cmd.sbc_case) - msg (SW, _("%s is not implemented."), "CASE"); + msg (SW, _("%s is not yet implemented."), "CASE"); if (cmd.sbc_compression) msg (SW, _("Active file compression is not implemented.")); diff --git a/src/ui/gui/recode.glade b/src/ui/gui/recode.glade index 6edcc0ab..a643b9da 100644 --- a/src/ui/gui/recode.glade +++ b/src/ui/gui/recode.glade @@ -194,7 +194,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - System-Missing + System Missing 1 @@ -208,7 +208,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - System-or user-missing + System or User Missing 1 -- 2.30.2