projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-output-window: Factor out output view as psppire-output-view.
[pspp]
/
src
/
language
/
dictionary
/
modify-variables.c
diff --git
a/src/language/dictionary/modify-variables.c
b/src/language/dictionary/modify-variables.c
index d73b95e8a2236b25f7172efb57c673e1f8d309c1..70c700084fdf765450ce59a2d758f1a7da609ffa 100644
(file)
--- a/
src/language/dictionary/modify-variables.c
+++ b/
src/language/dictionary/modify-variables.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2010, 2011
, 2012
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-28,6
+28,7
@@
#include "libpspp/assertion.h"
#include "libpspp/bit-vector.h"
#include "libpspp/compiler.h"
#include "libpspp/assertion.h"
#include "libpspp/bit-vector.h"
#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "libpspp/str.h"
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "libpspp/str.h"
@@
-88,8
+89,8
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
size_t i;
if (proc_make_temporary_transformations_permanent (ds))
size_t i;
if (proc_make_temporary_transformations_permanent (ds))
- msg (SE, _("
MODIFY VARS may not be used after TEMPORARY
. "
- "Temporary transformations will be made permanent."));
+ msg (SE, _("
%s may not be used after %s
. "
+ "Temporary transformations will be made permanent.")
, "MODIFY VARS", "TEMPORARY"
);
vm.reorder_vars = NULL;
vm.reorder_cnt = 0;
vm.reorder_vars = NULL;
vm.reorder_cnt = 0;
@@
-228,8
+229,9
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (already_encountered & 4)
{
if (already_encountered & 4)
{
- msg (SE, _("KEEP subcommand may be given at most once. It may "
- "not be given in conjunction with the DROP subcommand."));
+ msg (SE, _("%s subcommand may be given at most once. It may "
+ "not be given in conjunction with the %s subcommand."),
+ "KEEP", "DROP");
goto done;
}
already_encountered |= 4;
goto done;
}
already_encountered |= 4;
@@
-271,9
+273,11
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (already_encountered & 4)
{
if (already_encountered & 4)
{
- msg (SE, _("DROP subcommand may be given at most once. It may "
- "not be given in conjunction with the KEEP "
- "subcommand."));
+ msg (SE, _("%s subcommand may be given at most once. It may "
+ "not be given in conjunction with the %s "
+ "subcommand."),
+ "DROP", "KEEP"
+ );
goto done;
}
already_encountered |= 4;
goto done;
}
already_encountered |= 4;
@@
-355,7
+359,7
@@
compare_variables_given_ordering (const void *a_, const void *b_,
result = a_index < b_index ? -1 : a_index > b_index;
}
else
result = a_index < b_index ? -1 : a_index > b_index;
}
else
- result = strcasecmp (var_get_name (a), var_get_name (b));
+ result =
utf8_
strcasecmp (var_get_name (a), var_get_name (b));
if (!ordering->forward)
result = -result;
return result;
if (!ordering->forward)
result = -result;
return result;
@@
-377,7
+381,7
@@
compare_var_renaming_by_new_name (const void *a_, const void *b_,
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
- return strcasecmp (a->new_name, b->new_name);
+ return
utf8_
strcasecmp (a->new_name, b->new_name);
}
/* Returns true if performing VM on dictionary D would not cause
}
/* Returns true if performing VM on dictionary D would not cause