From 8a53cc7bea9c05a9306f475e27b9e895b894e195 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Mon, 28 Mar 2011 21:06:46 +0000 Subject: [PATCH] revert r38098 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38099 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/CutAndPaste.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index fb7ad88b5a..99f8383e6b 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -672,19 +672,13 @@ void switchBetweenClasses(DocumentClass const * const oldone, n == DocumentClass::plainInsetLayout().name(); if (!is_undefined) continue; - // The flex inset is undefined in newtc - docstring const oldname = from_utf8(oldtc.name()); - docstring const newname = from_utf8(newtc.name()); - docstring s; - if (oldname == newname) - s = bformat(_("Flex inset %1$s is undefined after " - "reloading `%2$s' layout."), - it->name(), oldname); - else - s = bformat(_("Flex inset %1$s is undefined because of " - "conversion from `%2$s' layout to `%3$s'."), - it->name(), oldname, newname); + docstring const s = bformat(_( + "Flex inset %1$s is " + "undefined because of class " + "conversion from\n%2$s to %3$s"), + it->name(), from_utf8(oldtc.name()), + from_utf8(newtc.name())); // To warn the user that something had to be done. errorlist.push_back(ErrorItem( _("Undefined flex inset"), -- 2.39.2