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

Stephan, I changed this string since the previous version was strange.

Browse Source 
If you have better version, improve it ;)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36611 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-11-30 00:23:34 +00:00
parent bd47057c20
commit d4fb2ac2ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/VCBackend.cpp
View File

@ -780,8 +780,8 @@ string CVS::repoUpdate()
docstring const file = from_utf8(owner_->filePath());
docstring text = bformat(_("There were detected changes "
"in the working directory:\n%1$s\n\n"
"In case of file conflict you have to resolve them "
"manually or revert to repository version later."), file);
"Possible file conflicts must be then resolved manually "
"or you will need to revert back to the repository version."), file);
int ret = frontend::Alert::prompt(_("Changes detected"),
text, 0, 1, _("&Continue"), _("&Abort"), _("View &Log ..."));
if (ret == 2 ) {