From: Stephan Witt <switt@lyx.org>
Date: Mon, 24 Nov 2008 21:12:58 +0000 (+0000)
Subject: convert string arguments for bformat with proper encoding
X-Git-Tag: 2.0.0~7635
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3cef6c3bab14fae9937bda1957ab7c478bf7a0fd;p=features.git

convert string arguments for bformat with proper encoding

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27696 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 387ead3e9d..a787d4cb2c 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -52,7 +52,7 @@ int VCS::doVCCommand(string const & cmd, FileName const & path)
 		frontend::Alert::error(_("Revision control error."),
 			bformat(_("Some problem occured while running the command:\n"
 				  "'%1$s'."),
-			from_ascii(cmd)));
+			from_utf8(cmd)));
 	return ret;
 }
 
@@ -534,7 +534,7 @@ string SVN::checkOut()
 			bformat(_("Error when updating from repository.\n"
 				"You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
 				"After pressing OK, LyX will try to reopen resolved document."),
-			from_ascii(res)));
+			from_local8bit(res)));
 	tmpf.erase();
 	return "SVN: " + log;
 }