X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=d639dbfd9fca1b9efe75ef91ac45a06fd5222284;hb=7470305720d7733a27e9c6e5ef13a0774f5d0f77;hp=a747f0071b4c1325da4005928d20d96b8cb7fd64;hpb=958958453ff69f02d94fc21f097463b77fab07d3;p=lyx.git

diff --git a/src/Format.cpp b/src/Format.cpp
index a747f0071b..d639dbfd9f 100644
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -123,7 +123,7 @@ void Format::setExtensions(string const & e)
 
 namespace {
 
-std::function<bool (Format const &)> FormatNamesEqual(string const & name)
+std::function<bool (Format const &)> FormatNameIs(string const & name)
 {
 	return [name](Format const & f){ return f.name() == name; };
 }
@@ -136,7 +136,7 @@ Format const * Formats::getFormat(string const & name) const
 {
 	FormatList::const_iterator cit =
 		find_if(formatlist_.begin(), formatlist_.end(),
-			FormatNamesEqual(name));
+			FormatNameIs(name));
 	if (cit != formatlist_.end())
 		return &(*cit);
 	else
@@ -148,7 +148,7 @@ Format * Formats::getFormat(string const & name)
 {
 	FormatList::iterator it =
 		find_if(formatlist_.begin(), formatlist_.end(),
-				FormatNamesEqual(name));
+				FormatNameIs(name));
 
 	if (it != formatlist_.end())
 		return &(*it);
@@ -554,7 +554,7 @@ int Formats::getNumber(string const & name) const
 {
 	FormatList::const_iterator cit =
 		find_if(formatlist_.begin(), formatlist_.end(),
-			FormatNamesEqual(name));
+			FormatNameIs(name));
 	if (cit == formatlist_.end())
 		return -1;
 
@@ -589,7 +589,7 @@ void Formats::erase(string const & name)
 {
 	FormatList::iterator it =
 		find_if(formatlist_.begin(), formatlist_.end(),
-			FormatNamesEqual(name));
+			FormatNameIs(name));
 	if (it != formatlist_.end())
 		formatlist_.erase(it);
 }
@@ -642,7 +642,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 // by the caller (this should be "utility" code)
 		Alert::error(_("Cannot view file"),
 			bformat(_("No information for viewing %1$s"),
-				prettyName(format_name)));
+				translateIfPossible(prettyName(format_name))));
 		return false;
 	}
 	// viewer is 'auto'
@@ -746,7 +746,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
 // be done by the caller (this should be "utility" code)
 		Alert::error(_("Cannot edit file"),
 			bformat(_("No information for editing %1$s"),
-				prettyName(format_name)));
+				translateIfPossible(prettyName(format_name))));
 		return false;
 	}
 
@@ -827,7 +827,7 @@ FlavorTranslator initFlavorTranslator()
 	f.addPair(OutputParams::LUATEX, "luatex");
 	f.addPair(OutputParams::PDFLATEX, "pdflatex");
 	f.addPair(OutputParams::XETEX, "xetex");
-	f.addPair(OutputParams::XML, "docbook-xml");
+	f.addPair(OutputParams::DOCBOOK5, "docbook-xml");
 	f.addPair(OutputParams::HTML, "xhtml");
 	f.addPair(OutputParams::TEXT, "text");
 	f.addPair(OutputParams::LYX, "lyx");