projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
770f21f
)
Canonicalise some printed strings, to make translators' lives easier
author
John Darrington
<john@darrington.wattle.id.au>
Sat, 12 Sep 2009 09:15:47 +0000
(11:15 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Sat, 12 Sep 2009 09:15:47 +0000
(11:15 +0200)
src/language/command.c
patch
|
blob
|
history
src/language/data-io/combine-files.c
patch
|
blob
|
history
src/language/dictionary/modify-variables.c
patch
|
blob
|
history
src/language/dictionary/sys-file-info.c
patch
|
blob
|
history
src/language/stats/descriptives.c
patch
|
blob
|
history
src/language/stats/t-test.q
patch
|
blob
|
history
src/language/utilities/set.q
patch
|
blob
|
history
src/ui/gui/recode.glade
patch
|
blob
|
history
diff --git
a/src/language/command.c
b/src/language/command.c
index c00d94b9c4b3597bcc2416ae0e29fd56018b229f..32dba0b4f7cd0ca7760f18315e13ae0b845069a0 100644
(file)
--- 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)
}
}
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)
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;
}
return false;
}
diff --git
a/src/language/data-io/combine-files.c
b/src/language/data-io/combine-files.c
index 644051804e40f3932c9dd2065b38f587d4bd0b2b..d4b9bf58905cde762b12510d4506f797630918cb 100644
(file)
--- 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)
{
}
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)
{
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;
}
}
goto error;
}
}
diff --git
a/src/language/dictionary/modify-variables.c
b/src/language/dictionary/modify-variables.c
index cd5016910d61242c0c6afa8698a8f43553d38308..64204b78ec374cd0ef3477e0157b9a3883e994bf 100644
(file)
--- 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)
{
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;
goto done;
}
already_encountered |= 1;
@@
-144,7
+144,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
{
if (!lex_match (lexer, '('))
{
{
if (!lex_match (lexer, '('))
{
- msg (SE, _("`(' expected on
REORDER subcommand.")
);
+ msg (SE, _("`(' expected on
%s subcommand."), "REORDER"
);
free (v);
goto done;
}
free (v);
goto done;
}
@@
-174,7
+174,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
{
if (already_encountered & 2)
{
{
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;
goto done;
}
already_encountered |= 2;
@@
-187,7
+187,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (!lex_match (lexer, '('))
{
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),
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 6a0c81acac768b50ee782a3ef979ff96db57f615..f68a830b83810ba6eec7d4e73b42ab40b041ca91 100644
(file)
--- 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.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.")
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.")
: 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:"));
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:"));
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);
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 7b30a6013908c6692a5ba0b6977b3046a534f33c..6b57fd297d8475ad63bcecc320a8c0c1b2d9201f 100644
(file)
--- 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},
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},
{"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},
{"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},
{"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 d02cdb28d21597a087f51640762de88573c33a3b..d25477cdd153f27a55b8170f89bdf75e6020b75a 100644
(file)
--- 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, 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 */
}
/* 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, 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 */
}
/* 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, 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 */
}
/* Populate the ssbox for paired values */
diff --git
a/src/language/utilities/set.q
b/src/language/utilities/set.q
index fd4e1a93839e27b453abdc9298a559f3b1b8ce6d..5c2b571ec57a7df2a7f9203abe2d23d244e083c9 100644
(file)
--- 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 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."));
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 6edcc0ab719f22c9ac753d72f89de85f3c3cc924..a643b9da95a9f0922ac64818144b09360e93be05 100644
(file)
--- a/
src/ui/gui/recode.glade
+++ b/
src/ui/gui/recode.glade
@@
-194,7
+194,7
@@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">System
-
Missing</property>
+ <property name="label" translatable="yes">System
Missing</property>
</widget>
<packing>
<property name="left_attach">1</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@
-208,7
+208,7
@@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">System
-or user-m
issing</property>
+ <property name="label" translatable="yes">System
or User M
issing</property>
</widget>
<packing>
<property name="left_attach">1</property>
</widget>
<packing>
<property name="left_attach">1</property>