From 5d11f7bea2f0e54d159c33476441ce79120caf3d Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 31 Jan 2007 15:26:39 +0000 Subject: [PATCH] * 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 --- src/ChangeLog | 4 ++++ src/buffer.C | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 83865fb455..6f7d420858 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-01-31 Jean-Marc Lasgouttes + + * buffer.C (readFile): reword error message when lyx2lyx fails. + 2007-01-29 José Matos * output_docbook.C (makeEnvironment): If a sub list (embedded diff --git a/src/buffer.C b/src/buffer.C index 92f0912b17..8a2c034e44 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -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));