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

fix the fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6654 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-03-31 01:20:32 +00:00
parent 315e07fabc
commit 1bd5e00158
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-03-31 John Levon <levon@movementarian.org>
* lyx_main.C: fix to the last fix
2003-03-31 John Levon <levon@movementarian.org>
* bufferlist.C: "Load original" -> "Load Original"

12
src/lyx_main.C
View File

@ -641,14 +641,14 @@ bool LyX::readRcFile(string const & name)
<< " in " << lyxrc_path << endl;
if (lyxrc.read(lyxrc_path) < 0) {
#if USE_BOOST_FORMAT
Alert::warning(_("Could not read preferences"),
Alert::warning(_("Could not read configuration file"),
boost::io::str(boost::format(
_("Error while reading the preferences file\n%1$s.\n"
"LyX will use the built-in defaults.")) % lyxrc_path));
_("Error while reading the configuration file\n%1$s.\n"
".\nLyX will use the built-in defaults.")) % lyxrc_path));
#else
Alert::warning(_("Could not read preferences"),
string(_("Error while reading the preferences file\n"))
+ lyxrc_path + _("LyX will use the built-in defaults."));
Alert::warning(_("Could not read configuration file"),
string(_("Error while reading the configuration file\n"))
+ lyxrc_path + _(".\nLyX will use the built-in defaults."));
#endif
return false;
}