From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Thu, 25 Nov 2010 14:55:21 +0000 (+0000)
Subject: Fix also the other occurence of the strange language that was corrected in r36489... 
X-Git-Tag: 2.0.0~1689
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3f6e6aff90567416a1f3c6db8893dfa469acc189;p=features.git

Fix also the other occurence of the strange language that was corrected in r36489. Also fix the english.

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

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 9997c81877..ebbac0f556 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -988,13 +988,13 @@ Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
 		if (from_format < LYX_FORMAT) {
 			Alert::error(_("Conversion script failed"),
 				bformat(_("%1$s is from an older version"
-					" of LyX, but the lyx2lyx script"
+					" of LyX and the lyx2lyx script"
 					" failed to convert it."),
 					from_utf8(fn.absFileName())));
 			return LyX2LyXOlderFormat;
 		} else {
 			Alert::error(_("Conversion script failed"),
-				bformat(_("%1$s is from an newer version"
+				bformat(_("%1$s is from a newer version"
 					" of LyX and the lyx2lyx script"
 					" failed to convert it."),
 					from_utf8(fn.absFileName())));