anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-14 01:22:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* VCBackend.cpp:

Browse Source 
- some spelling and grammar fixes (a native EN speaker will have to double-check).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28838 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2009-03-17 11:07:17 +00:00
parent 1d8b2b595f
commit 73709670e1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/VCBackend.cpp
View File

@ -80,7 +80,7 @@ FileName const RCS::findFile(FileName const & file)
FileName tmp(file.absFilename() + ",v"); FileName tmp(file.absFilename() + ",v");
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp); LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
if (tmp.isReadableFile()) { if (tmp.isReadableFile()) {
LYXERR(Debug::LYXVC, "Yes " << file << " is under rcs."); LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs.");
return tmp; return tmp;
} }
@ -88,7 +88,7 @@ FileName const RCS::findFile(FileName const & file)
tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v"); tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v");
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp); LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
if (tmp.isReadableFile()) { if (tmp.isReadableFile()) {
LYXERR(Debug::LYXVC, "Yes " << file << " it is under rcs."); LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs.");
return tmp; return tmp;
} }
@ -356,7 +356,7 @@ string CVS::checkOut()
// cvs update or perhaps for cvs this should be a noop // cvs update or perhaps for cvs this should be a noop
// we need to detect conflict (eg "C" in output) // we need to detect conflict (eg "C" in output)
// before we can do this. // before we can do this.
lyxerr << "Sorry not implemented." << endl; lyxerr << "Sorry, not implemented." << endl;
return string(); return string();
} }
@ -389,7 +389,7 @@ void CVS::undoLast()
// merge the current with the previous version // merge the current with the previous version
// in a reverse patch kind of way, so that the // in a reverse patch kind of way, so that the
// result is to revert the last changes. // result is to revert the last changes.
lyxerr << "Sorry not implemented." << endl; lyxerr << "Sorry, not implemented." << endl;
} }
@ -533,7 +533,7 @@ string SVN::checkIn(string const & msg)
string res = scanLogFile(tmpf, log); string res = scanLogFile(tmpf, log);
if (!res.empty()) if (!res.empty())
frontend::Alert::error(_("Revision control error."), frontend::Alert::error(_("Revision control error."),
_("Error when commiting 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.")); "After pressing OK, LyX will reopen the document."));
else else
@ -596,8 +596,9 @@ 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 when acquiring write lock.\n"
"Most probably some other user edit the current document now!\n" "Most probably another user is editing\n"
"Check also the access to the repository.")); "the current document now!\n"
"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 when releasing write lock.\n"
@ -659,7 +660,7 @@ void SVN::undoLast()
// merge the current with the previous version // merge the current with the previous version
// in a reverse patch kind of way, so that the // in a reverse patch kind of way, so that the
// result is to revert the last changes. // result is to revert the last changes.
lyxerr << "Sorry not implemented." << endl; lyxerr << "Sorry, not implemented." << endl;
} }