From: Vincent van Ravesteijn Date: Wed, 10 Mar 2010 17:03:53 +0000 (+0000) Subject: Adjust some messages and constify a variable. X-Git-Tag: 2.0.0~3839 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=039807ed28d8518646c52d39d0bd7966be1f4e2e;p=features.git Adjust some messages and constify a variable. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33701 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 82b16e4b35..52eaa5c49c 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -743,13 +743,13 @@ void SVN::fileLock(bool lock, FileName const & tmpf, string &status) if (!isLocked() && lock) frontend::Alert::error(_("Revision control error."), - _("Error when acquiring write lock.\n" - "Most probably another user is editing\n" + _("Error while acquiring write lock.\n" + "Another user is most probably editing\n" "the current document now!\n" "Also check the access to the repository.")); if (isLocked() && !lock) frontend::Alert::error(_("Revision control error."), - _("Error when releasing write lock.\n" + _("Error while releasing write lock.\n" "Check the access to the repository.")); } @@ -767,7 +767,7 @@ string SVN::checkOut() FileName(owner_->filePath())); string log; - string res = scanLogFile(tmpf, log); + string const res = scanLogFile(tmpf, log); if (!res.empty()) frontend::Alert::error(_("Revision control error."), bformat(_("Error when updating from repository.\n"