Revert change in rev. 15955 because as Georg says:

This fix will create extra translator work, and nobody will remmeber that
bformat should be used instead of your solution once the real problem is
fixed. If you use from_ascii instead of from_utf8 everything is OK. utf8
can be wrong as encoding for files anyway, so for now we require that files
are pure ascii.

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

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 389647b5626363c846b9ebc0754c1d3198d08379..27bfb440074b1706264875f142a166519e165f6a 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -390,8 +390,9 @@ void LyX::prepareExit()
                // FIXME UNICODE: package().temp_dir() could in theory contain utf8 characters.
                // We cannot use from_utf8() here because this involves the use of static data
                // that may have been destroyed already on Mac systems.
-               docstring const msg = _("Unable to remove the temporary directory") + " "
-                       + package().temp_dir().c_str();
+               docstring const msg =
+                       bformat(_("Unable to remove the temporary directory %1$s"),
+                       from_ascii(package().temp_dir()));
                Alert::warning(_("Unable to remove temporary directory"), msg);
        }
 }