* Only enter inset which return true on isActive(). This is the behavior in the curso...

[lyx.git] / src / callback.cpp

diff --git a/src/callback.cpp b/src/callback.cpp
index 05a89db2459027919a5ce318659a087b2f30e521..5253bf547a07fe8102877d5e70061ea1686e2494 100644 (file)
--- a/src/callback.cpp
+++ b/src/callback.cpp
@@ -165,9 +165,9 @@ bool writeAs(Buffer * buffer, string const & newname)
        if (fs::exists(filename.toFilesystemEncoding())) {
                docstring const file = makeDisplayPath(fname, 30);
                docstring text = bformat(_("The document %1$s already exists.\n\n"
-                                                    "Do you want to over-write that document?"), file);
-               int const ret = Alert::prompt(_("Over-write document?"),
-                       text, 0, 1, _("&Over-write"), _("&Cancel"));
+                                          "Do you want to overwrite that document?"), file);
+               int const ret = Alert::prompt(_("Overwrite document?"),
+                       text, 0, 1, _("&Overwrite"), _("&Cancel"));
 
                if (ret == 1)
                        return false;
@@ -401,7 +401,7 @@ docstring const getContentsOfPlaintextFile(BufferView * bv, string const & f,
        // FIXME UNICODE: We don't know the encoding of the file
        docstring file_content = from_utf8(tmpstr);
        if (file_content.empty()) {
-               Alert::error(_("Reading not UTF-8 encoded file"), 
+               Alert::error(_("Reading not UTF-8 encoded file"),
                                        _("The file is not UTF-8 encoded.\n"
                                        "It will be read as local 8Bit-encoded.\n"
                                        "If this does not give the correct result\n"
@@ -409,7 +409,7 @@ docstring const getContentsOfPlaintextFile(BufferView * bv, string const & f,
                                        "to UTF-8 with a program other than LyX.\n"));
                file_content = from_local8bit(tmpstr);
        }
-       
+
        return normalize_kc(file_content);
 }