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:
a3aefad
)
Consolidate some very similar user visible strings
author
John Darrington
<john@darrington.wattle.id.au>
Wed, 12 Oct 2011 09:41:10 +0000
(11:41 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Wed, 12 Oct 2011 09:41:10 +0000
(11:41 +0200)
src/language/command.c
patch
|
blob
|
history
diff --git
a/src/language/command.c
b/src/language/command.c
index ff2b030ce0e206f3af47c48f090368027dd60e4c..8580a18374feeb38569834f9ad5cdb36bab69571 100644
(file)
--- a/
src/language/command.c
+++ b/
src/language/command.c
@@
-385,24
+385,23
@@
report_state_mismatch (const struct command *command, enum cmd_state state)
case S_INITIAL | S_DATA:
NOT_REACHED ();
case S_INITIAL | S_INPUT_PROGRAM:
case S_INITIAL | S_DATA:
NOT_REACHED ();
case S_INITIAL | S_INPUT_PROGRAM:
- msg (SE, _("%s is allowed only before the active dataset has
"
-
"been defined or inside INPUT PROGRAM."), command->name
);
+ msg (SE, _("%s is allowed only before the active dataset has
been defined or inside %s."),
+
command->name, "INPUT PROGRAM"
);
break;
case S_INITIAL | S_FILE_TYPE:
break;
case S_INITIAL | S_FILE_TYPE:
- msg (SE, _("%s is allowed only before the active dataset has
"
-
"been defined or inside FILE TYPE."), command->name
);
+ msg (SE, _("%s is allowed only before the active dataset has
been defined or inside %s."),
+
command->name, "FILE TYPE"
);
break;
case S_DATA | S_INPUT_PROGRAM:
break;
case S_DATA | S_INPUT_PROGRAM:
- msg (SE, _("%s is allowed only after the active dataset has
"
-
"been defined or inside INPUT PROGRAM."), command->name
);
+ msg (SE, _("%s is allowed only after the active dataset has
been defined or inside %s."),
+
command->name, "INPUT PROGRAM"
);
break;
case S_DATA | S_FILE_TYPE:
break;
case S_DATA | S_FILE_TYPE:
- msg (SE, _("%s is allowed only after the active dataset has
"
-
"been defined or inside FILE TYPE."), command->name
);
+ msg (SE, _("%s is allowed only after the active dataset has
been defined or inside %s."),
+
command->name, "FILE TYPE"
);
break;
case S_INPUT_PROGRAM | S_FILE_TYPE:
break;
case S_INPUT_PROGRAM | S_FILE_TYPE:
- msg (SE, _("%s is allowed only inside INPUT PROGRAM "
- "or inside FILE TYPE."), command->name);
+ msg (SE, _("%s is allowed only inside INPUT PROGRAM or inside FILE TYPE."), command->name);
break;
/* Three allowed states. */
break;
/* Three allowed states. */
@@
-431,7
+430,7
@@
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 %s."),
}
else if (state == CMD_STATE_INPUT_PROGRAM)
msg (SE, _("%s is not allowed inside %s."),
-
command->name, "INPUT PROGRAM" );
+ command->name, "INPUT PROGRAM" );
else if (state == CMD_STATE_FILE_TYPE)
msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE");
else if (state == CMD_STATE_FILE_TYPE)
msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE");