Update it.po

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 8c98d5ec53b45e54591fed6e2c4304a36a745c26..770706c3e5eca8aa816b75c725eccdb943edd9d0 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -122,7 +122,7 @@ void LyXVC::registrer()
                } else {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
                                << to_utf8(filename.displayName()) << " with RCS");
-                       vcs.reset(new RCS(filename));
+                       vcs.reset(new RCS(FileName()));
                }
 
                vcs->owner(owner_);
@@ -132,38 +132,40 @@ void LyXVC::registrer()
        docstring response;
        bool ok = Alert::askForText(response, _("LyX VC: Initial description"),
                        _("(no initial description)"));
-       if (!ok || response.empty()) {
-               // should we insist on checking response.empty()?
+       if (!ok) {
                LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
                return;
        }
-
+       if (response.empty())
+               response = _("(no initial description)");
        vcs->registrer(to_utf8(response));
 }
 
 
-void LyXVC::checkIn()
+string LyXVC::checkIn()
 {
        LYXERR(Debug::LYXVC, "LyXVC: checkIn");
        docstring response;
+       string log;
        bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
        if (ok) {
                if (response.empty())
                        response = _("(no log message)");
-               vcs->checkIn(to_utf8(response));
+               log = vcs->checkIn(to_utf8(response));
        } else {
                LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
        }
+       return log;
 }
 
 
-void LyXVC::checkOut()
+string LyXVC::checkOut()
 {
        //RCS allows checkOut only in ReadOnly mode
-       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return;
+       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
 
        LYXERR(Debug::LYXVC, "LyXVC: checkOut");
-       vcs->checkOut();
+       return vcs->checkOut();
 }
 
 
@@ -173,8 +175,8 @@ void LyXVC::revert()
 
        docstring const file = owner_->fileName().displayName(20);
        docstring text = bformat(_("Reverting to the stored version of the "
-               "document %1$s will lose all current changes.\n\n"
-                                            "Do you want to revert to the saved version?"), file);
+                               "document %1$s will lose all current changes.\n\n"
+                               "Do you want to revert to the older version?"), file);
        int const ret = Alert::prompt(_("Revert to stored version of document?"),
                text, 0, 1, _("&Revert"), _("&Cancel"));