Commit a18e2a2d authored by Colin Walters's avatar Colin Walters

Consistently translate component failure message

https://bugzilla.gnome.org/show_bug.cgi?id=642497
parent c0f87685
...@@ -255,7 +255,9 @@ on_required_app_failure (GsmManager *manager, ...@@ -255,7 +255,9 @@ on_required_app_failure (GsmManager *manager,
const char *msg) const char *msg)
{ {
char *full_msg; char *full_msg;
full_msg = g_strdup_printf ("Component '%s': %s", /* Translators: This will look like: Component 'gnome-shell.desktop': Killed by signal 9.
* It is admittedly mostly technical goop. */
full_msg = g_strdup_printf (_("Component '%s': %s"),
gsm_app_peek_app_id (app), gsm_app_peek_app_id (app),
msg); msg);
gsm_fail_whale_dialog_we_failed (GSM_FAIL_WHALE_DIALOG_FAIL_TYPE_RECOVERABLE, gsm_fail_whale_dialog_we_failed (GSM_FAIL_WHALE_DIALOG_FAIL_TYPE_RECOVERABLE,
...@@ -556,7 +558,7 @@ app_died (GsmApp *app, ...@@ -556,7 +558,7 @@ app_died (GsmApp *app,
g_warning ("Application '%s' killed by signal", gsm_app_peek_app_id (app)); g_warning ("Application '%s' killed by signal", gsm_app_peek_app_id (app));
if (is_app_required (manager, app)) if (is_app_required (manager, app))
on_required_app_failure (manager, app, "Killed by signal"); on_required_app_failure (manager, app, _("Killed by signal"));
/* For now, we don't do anything with crashes from non-required apps; /* For now, we don't do anything with crashes from non-required apps;
* practically speaking they will be caught by ABRT/apport type * practically speaking they will be caught by ABRT/apport type
* infrastructure, and it'd be better to pick up the crash from * infrastructure, and it'd be better to pick up the crash from
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <signal.h> #include <signal.h>
#include <glib.h> #include <glib.h>
#include <glib/gi18n.h>
#include "gsm-process-helper.h" #include "gsm-process-helper.h"
...@@ -119,17 +120,17 @@ gsm_process_helper (const char *command_line, ...@@ -119,17 +120,17 @@ gsm_process_helper (const char *command_line,
g_set_error (error, g_set_error (error,
G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED, G_IO_CHANNEL_ERROR_FAILED,
"Exited with code %d", WEXITSTATUS (helper->status)); _("Exited with code %d"), WEXITSTATUS (helper->status));
} else if (WIFSIGNALED (helper->status)) { } else if (WIFSIGNALED (helper->status)) {
g_set_error (error, g_set_error (error,
G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED, G_IO_CHANNEL_ERROR_FAILED,
"Killed by signal %d", WTERMSIG (helper->status)); _("Killed by signal %d"), WTERMSIG (helper->status));
} else if (WIFSTOPPED (helper->status)) { } else if (WIFSTOPPED (helper->status)) {
g_set_error (error, g_set_error (error,
G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED, G_IO_CHANNEL_ERROR_FAILED,
"Stopped by signal %d", WSTOPSIG (helper->status)); _("Stopped by signal %d"), WSTOPSIG (helper->status));
} }
} }
......
...@@ -15,6 +15,8 @@ egg/eggsmclient.c ...@@ -15,6 +15,8 @@ egg/eggsmclient.c
gnome-session/gsm-gconf.c gnome-session/gsm-gconf.c
gnome-session/gsm-inhibit-dialog.c gnome-session/gsm-inhibit-dialog.c
gnome-session/gsm-logout-dialog.c gnome-session/gsm-logout-dialog.c
gnome-session/gsm-fail-whale-dialog.c
gnome-session/gsm-process-helper.c
gnome-session/gsm-manager.c gnome-session/gsm-manager.c
gnome-session/gsm-xsmp-client.c gnome-session/gsm-xsmp-client.c
gnome-session/gsm-xsmp-server.c gnome-session/gsm-xsmp-server.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment