diff --git a/src/applets/tasks.c b/src/applets/tasks.c index 803b872..06490ff 100644 --- a/src/applets/tasks.c +++ b/src/applets/tasks.c @@ -26,7 +26,7 @@ #include #include "Panel/applet.h" #define _(string) gettext(string) -#define N_(string) (string) +#define N_(string) string #if !GTK_CHECK_VERSION(3, 0, 0) # define gdk_error_trap_pop_ignored() gdk_error_trap_pop() diff --git a/src/helper.c b/src/helper.c index dfdb6a9..0f318e2 100644 --- a/src/helper.c +++ b/src/helper.c @@ -211,8 +211,8 @@ static void _logout_dialog_on_response(GtkWidget * widget, gint response); static void _panel_helper_logout_dialog(Panel * panel) { - const char * message = _("This will log you out of the current session," - " therefore closing any application currently opened" + const char message[] = N_("This will log you out of the current session" + ", therefore closing any application currently opened" " and losing any unsaved data.\n" "Do you really want to proceed?"); GtkWidget * widget; @@ -229,7 +229,7 @@ static void _panel_helper_logout_dialog(Panel * panel) gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG( panel->lo_window), #endif - "%s", message); + "%s", _(message)); #if GTK_CHECK_VERSION(2, 10, 0) gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(panel->lo_window), gtk_image_new_from_icon_name("gnome-logout", @@ -386,12 +386,12 @@ enum { RES_CANCEL, RES_REBOOT, RES_SHUTDOWN }; static void _panel_helper_shutdown_dialog(Panel * panel) { #ifdef EMBEDDED - const char * message = _("This will shutdown your device," + const char message[] = N_("This will shutdown your device," " therefore closing any application currently opened" " and losing any unsaved data.\n" "Do you really want to proceed?"); #else - const char * message = _("This will shutdown your computer," + const char message[] = N_("This will shutdown your computer," " therefore closing any application currently opened" " and losing any unsaved data.\n" "Do you really want to proceed?"); @@ -410,7 +410,7 @@ static void _panel_helper_shutdown_dialog(Panel * panel) gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG( panel->sh_window), #endif - "%s", message); + "%s", _(message)); #if GTK_CHECK_VERSION(2, 10, 0) gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(panel->sh_window), gtk_image_new_from_icon_name("gnome-shutdown", diff --git a/src/panel.c b/src/panel.c index 41e5cd8..4dd9de6 100644 --- a/src/panel.c +++ b/src/panel.c @@ -39,7 +39,7 @@ #include "panel.h" #include "../config.h" #define _(string) gettext(string) -#define N_(string) (string) +#define N_(string) string /* constants */ #ifndef PROGNAME diff --git a/src/window.c b/src/window.c index b1994b9..3833849 100644 --- a/src/window.c +++ b/src/window.c @@ -27,7 +27,7 @@ #include "window.h" #include "../config.h" #define _(string) gettext(string) -#define N_(string) (string) +#define N_(string) string /* constants */ #ifndef PROGNAME diff --git a/tools/notify.c b/tools/notify.c index 1e2d7ce..7cfdd59 100644 --- a/tools/notify.c +++ b/tools/notify.c @@ -30,6 +30,7 @@ #include "../src/panel.h" #include "../config.h" #define _(string) gettext(string) +#define N_(string) string /* constants */ #ifndef PROGNAME diff --git a/tools/test.c b/tools/test.c index 2b47e3d..9bafd69 100644 --- a/tools/test.c +++ b/tools/test.c @@ -29,6 +29,7 @@ #include "../src/panel.h" #include "../config.h" #define _(string) gettext(string) +#define N_(string) string #ifndef PROGNAME # define PROGNAME "panel-test"