This message looked strange.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36489 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index eef948300c131c6c7e4d45337dc6793324ca2c46..9997c81877c7113a968d0e360508bb6eaf7b60ca 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -995,7 +995,7 @@ Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
                } else {
                        Alert::error(_("Conversion script failed"),
                                bformat(_("%1$s is from an newer version"
-                                       " of LyX, but the lyx2lyx script"
+                                       " of LyX and the lyx2lyx script"
                                        " failed to convert it."),
                                        from_utf8(fn.absFileName())));
                        return LyX2LyXNewerFormat;