Merge branch 'backport' into work

Conflicts:

	openbox/openbox.c
	openbox/session.c

1 files changed, 3 insertions, 3 deletions

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index c534ba8b..ff73bf2b 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -86,7 +86,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     if (!o->cmd) return FALSE;
     cmd = g_filename_from_utf8(o->cmd, -1, NULL, NULL, NULL);
     if (!cmd) {
-        g_message(_("Failed to convert the path '%s' from utf8"), o->cmd);
+        g_message(_("Failed to convert the path \"%s\" from utf8"), o->cmd);
         return FALSE;
     }
 
@@ -95,7 +95,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     event_cancel_all_key_grabs();
 
     if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) {
-        g_message(_("Failed to execute '%s': %s"), o->cmd, e->message);
+        g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
         g_error_free(e);
     }
     else {
@@ -114,7 +114,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
                            G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
                            NULL, NULL, NULL, &e))
         {
-            g_message(_("Failed to execute '%s': %s"), o->cmd, e->message);
+            g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
             g_error_free(e);
 
             if (o->sn)