Move bind file format tag to LyXAction.cpp, and rename it.

[lyx.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index bfa1efbf68ada62942b0ccbee9c20430b43e90ba..bc47719480488acfadb71e80ff61652253c713ed 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -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 ) {