From 4d0e8cb5f0d9afab5ae768e94d3015f251dc5fa5 Mon Sep 17 00:00:00 2001
From: Pavel Sanda <sanda@lyx.org>
Date: Thu, 25 Nov 2010 14:37:10 +0000
Subject: [PATCH] This message looked strange.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36489 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Buffer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index eef948300c..9997c81877 100644
--- 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;