mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-27 11:52:25 +00:00
Whitespace and typo fix. (That meant: "After LyX presses OK, it will re-
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32954 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
bafb725487
commit
5261a21e72
@ -600,7 +600,7 @@ string SVN::checkIn(string const & msg)
|
|||||||
frontend::Alert::error(_("Revision control error."),
|
frontend::Alert::error(_("Revision control error."),
|
||||||
_("Error when committing to repository.\n"
|
_("Error when committing to repository.\n"
|
||||||
"You have to manually resolve the problem.\n"
|
"You have to manually resolve the problem.\n"
|
||||||
"After pressing OK, LyX will reopen the document."));
|
"LyX will reopen the document after you press OK."));
|
||||||
else
|
else
|
||||||
fileLock(false, tmpf, log);
|
fileLock(false, tmpf, log);
|
||||||
|
|
||||||
@ -628,8 +628,9 @@ string SVN::scanLogFile(FileName const & f, string & status)
|
|||||||
|
|
||||||
while (ifs) {
|
while (ifs) {
|
||||||
getline(ifs, line);
|
getline(ifs, line);
|
||||||
lyxerr << line << "\n";
|
LYXERR(Debug::LYXVC, line << "\n");
|
||||||
if (!line.empty()) status += line + "; ";
|
if (!line.empty())
|
||||||
|
status += line + "; ";
|
||||||
if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
|
if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
|
||||||
ifs.close();
|
ifs.close();
|
||||||
return line;
|
return line;
|
||||||
|
Loading…
Reference in New Issue
Block a user