mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 01:08:45 +00:00
* buffer.C (readFile): reword error message when lyx2lyx fails.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@16973 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
48d4b9f85b
commit
5d11f7bea2
@ -1,3 +1,7 @@
|
||||
2007-01-31 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* buffer.C (readFile): reword error message when lyx2lyx fails.
|
||||
|
||||
2007-01-29 José Matos <jamatos@lyx.org>
|
||||
|
||||
* output_docbook.C (makeEnvironment): If a sub list (embedded
|
||||
|
@ -624,7 +624,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
|
||||
string const tmpfile = tempName();
|
||||
if (tmpfile.empty()) {
|
||||
Alert::error(_("Conversion failed"),
|
||||
bformat(_("%1$s is from an earlier"
|
||||
bformat(_("%1$s is from a different"
|
||||
" version of LyX, but a temporary"
|
||||
" file for converting it could"
|
||||
" not be created."),
|
||||
@ -634,7 +634,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
|
||||
string const lyx2lyx = LibFileSearch("lyx2lyx", "lyx2lyx");
|
||||
if (lyx2lyx.empty()) {
|
||||
Alert::error(_("Conversion script not found"),
|
||||
bformat(_("%1$s is from an earlier"
|
||||
bformat(_("%1$s is from a different"
|
||||
" version of LyX, but the"
|
||||
" conversion script lyx2lyx"
|
||||
" could not be found."),
|
||||
@ -655,7 +655,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
|
||||
cmd_ret const ret = RunCommand(command_str);
|
||||
if (ret.first != 0) {
|
||||
Alert::error(_("Conversion script failed"),
|
||||
bformat(_("%1$s is from an earlier version"
|
||||
bformat(_("%1$s is from a different version"
|
||||
" of LyX, but the lyx2lyx script"
|
||||
" failed to convert it."),
|
||||
filename));
|
||||
|
Loading…
Reference in New Issue
Block a user