]> git.lyx.org Git - features.git/commitdiff
Adjust some messages and constify a variable.
authorVincent van Ravesteijn <vfr@lyx.org>
Wed, 10 Mar 2010 17:03:53 +0000 (17:03 +0000)
committerVincent van Ravesteijn <vfr@lyx.org>
Wed, 10 Mar 2010 17:03:53 +0000 (17:03 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33701 a592a061-630c-0410-9148-cb99ea01b6c8

src/VCBackend.cpp

index 82b16e4b35859ebd8190d99963742184b0b02d37..52eaa5c49c4f520f6e9caa4ea6eee066e0743bd7 100644 (file)
@@ -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"