anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 14:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Push r38098 again in

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38108 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2011-03-28 22:20:41 +00:00
parent c8844cad05
commit 9c9abe843f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/CutAndPaste.cpp
View File

@ -672,13 +672,19 @@ void switchBetweenClasses(DocumentClass const * const oldone,
n == DocumentClass::plainInsetLayout().name();
if (!is_undefined)
continue;
// The flex inset is undefined in newtc
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()));
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);
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(
_("Undefined flex inset"),