X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FExporter.cpp;h=5826cb52fcd7ae358d199bc0a192f44eceb00180;hb=e54ae72e5fac6f750c3f7972c74bb42b57f3a049;hp=283a6db83186c734121af80d6d76d3d97fd64d5f;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git

diff --git a/src/Exporter.cpp b/src/Exporter.cpp
index 283a6db831..5826cb52fc 100644
--- a/src/Exporter.cpp
+++ b/src/Exporter.cpp
@@ -28,14 +28,18 @@
 #include "Mover.h"
 #include "output_plaintext.h"
 #include "OutputParams.h"
-#include "frontends/Alert.h"
+#include "frontends/alert.h"
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "support/package.h"
+#include "support/Package.h"
 
 #include <boost/filesystem/operations.hpp>
 
+using std::find;
+using std::string;
+using std::vector;
+
 
 namespace lyx {
 
@@ -51,10 +55,6 @@ using support::onlyPath;
 using support::package;
 using support::prefixIs;
 
-using std::find;
-using std::string;
-using std::vector;
-
 namespace Alert = frontend::Alert;
 namespace fs = boost::filesystem;
 
@@ -63,7 +63,7 @@ namespace {
 vector<string> const Backends(Buffer const & buffer)
 {
 	vector<string> v;
-	if (buffer.params().getLyXTextClass().isTeXClassAvailable()) {
+	if (buffer.params().getTextClass().isTeXClassAvailable()) {
 		v.push_back(bufferFormat(buffer));
 		// FIXME: Don't hardcode format names here, but use a flag
 		if (v.back() == "latex")
@@ -80,11 +80,11 @@ int checkOverwrite(FileName const & filename)
 {
 	if (fs::exists(filename.toFilesystemEncoding())) {
 		docstring text = bformat(_("The file %1$s already exists.\n\n"
-						     "Do you want to over-write that file?"),
+						     "Do you want to overwrite that file?"),
 				      makeDisplayPath(filename.absFilename()));
-		return Alert::prompt(_("Over-write file?"),
+		return Alert::prompt(_("Overwrite file?"),
 				     text, 0, 2,
-				     _("&Over-write"), _("Over-write &all"),
+				     _("&Overwrite"), _("Overwrite &all"),
 				     _("&Cancel export"));
 	}
 	return 0;