X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=b2b61f28b53562707f7fbc27baf95a84bc28bb36;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=753ada4259826da6c251df41f69822b1c871fde3;hpb=3b6931719aa7e1269997d2e950b3ce436d5bd34d;p=lyx.git diff --git a/src/Changes.cpp b/src/Changes.cpp index 753ada4259..b2b61f28b5 100644 --- a/src/Changes.cpp +++ b/src/Changes.cpp @@ -340,8 +340,8 @@ void Changes::merge() namespace { -docstring getLaTeXMarkup(docstring const macro, docstring const author, - docstring const chgTime, +docstring getLaTeXMarkup(docstring const & macro, docstring const & author, + docstring const & chgTime, OutputParams const & runparams) { if (macro.empty()) @@ -365,7 +365,7 @@ docstring getLaTeXMarkup(docstring const macro, docstring const author, ods.put(author[n]); ods << "'>"; } else { - LYXERR0("Ommitting uncodable character '" + LYXERR0("Omitting uncodable character '" << docstring(1, author[n]) << "' in change author name!"); uncodable_author = author; @@ -380,7 +380,7 @@ docstring getLaTeXMarkup(docstring const macro, docstring const author, support::bformat(_("The author name '%1$s',\n" "used for change tracking, contains glyphs that cannot be\n" "represented in the current encoding. The respective glyphs\n" - "will be ommitted in the exported LaTeX file.\n\n" + "will be omitted in the exported LaTeX file.\n\n" "Chose an appropriate document encoding (such as utf8)\n" "or change the spelling of the author name."), uncodable_author)); warned_author = uncodable_author;