mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 11:16:55 +00:00
Adjust some messages and constify a variable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33701 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
f225a6d8b6
commit
039807ed28
@ -743,13 +743,13 @@ void SVN::fileLock(bool lock, FileName const & tmpf, string &status)
|
|||||||
|
|
||||||
if (!isLocked() && lock)
|
if (!isLocked() && lock)
|
||||||
frontend::Alert::error(_("Revision control error."),
|
frontend::Alert::error(_("Revision control error."),
|
||||||
_("Error when acquiring write lock.\n"
|
_("Error while acquiring write lock.\n"
|
||||||
"Most probably another user is editing\n"
|
"Another user is most probably editing\n"
|
||||||
"the current document now!\n"
|
"the current document now!\n"
|
||||||
"Also check the access to the repository."));
|
"Also check the access to the repository."));
|
||||||
if (isLocked() && !lock)
|
if (isLocked() && !lock)
|
||||||
frontend::Alert::error(_("Revision control error."),
|
frontend::Alert::error(_("Revision control error."),
|
||||||
_("Error when releasing write lock.\n"
|
_("Error while releasing write lock.\n"
|
||||||
"Check the access to the repository."));
|
"Check the access to the repository."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -767,7 +767,7 @@ string SVN::checkOut()
|
|||||||
FileName(owner_->filePath()));
|
FileName(owner_->filePath()));
|
||||||
|
|
||||||
string log;
|
string log;
|
||||||
string res = scanLogFile(tmpf, log);
|
string const res = scanLogFile(tmpf, log);
|
||||||
if (!res.empty())
|
if (!res.empty())
|
||||||
frontend::Alert::error(_("Revision control error."),
|
frontend::Alert::error(_("Revision control error."),
|
||||||
bformat(_("Error when updating from repository.\n"
|
bformat(_("Error when updating from repository.\n"
|
||||||
|
Loading…
Reference in New Issue
Block a user