anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

convert string arguments for bformat with proper encoding

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27696 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2008-11-24 21:12:58 +00:00
parent 74037183fe
commit 3cef6c3bab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/VCBackend.cpp
View File

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