From 04010ff0fe1851fe296db8032cff7eccee2afb03 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 24 Apr 2007 21:09:12 +0000 Subject: [PATCH] don't split strings inside _() across lines. change some of the text messages --- openbox/openbox.c | 37 +++++++++++++++---------------------- openbox/screen.c | 3 +-- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/openbox/openbox.c b/openbox/openbox.c index 74842614..dac9d222 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -226,8 +226,7 @@ gint main(gint argc, gchar **argv) openbox_rc, config_file); parse_tree(i, doc, node->xmlChildrenNode); } else { - g_message(_("Unable to find a valid config file, using " - "some simple defaults")); + g_message(_("Unable to find a valid config file, using some simple defaults")); PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc); } /* we're done with parsing now, kill it */ @@ -346,8 +345,9 @@ gint main(gint argc, gchar **argv) execvp(argvp[0], argvp); g_strfreev(argvp); } else { - g_message(_("Restart failed to execute new executable " - "'%s': %s"), restart_path, err->message); + g_message( + _("Restart failed to execute new executable '%s': %s"), + restart_path, err->message); g_error_free(err); } } @@ -397,30 +397,23 @@ static void print_version() static void print_help() { - g_print(_("Syntax: openbox [options]\n\n")); - g_print(_("Options:\n\n")); - g_print(_(" --reconfigure Tell the currently running instance of " - "Openbox to\n" - " reconfigure (and then exit " - "immediately)\n")); - g_print(_(" --config-file FILE Specify the file to load for the config " - "file\n")); + g_print(_("Syntax: openbox [options]\n")); + g_print(_("\nOptions:\n\n")); + g_print(_(" --config-file FILE Specify the file to load for the config file\n")); #ifdef USE_SM - g_print(_(" --sm-disable Disable connection to session " - "manager\n")); + g_print(_(" --sm-disable Disable connection to session manager\n")); g_print(_(" --sm-client-id ID Specify session management ID\n")); - g_print(_(" --sm-save-file FILE Specify file to load a saved session" - "from\n")); + g_print(_(" --sm-save-file FILE Specify file to load a saved session from\n")); #endif - g_print(_(" --replace Replace the currently running window " - "manager\n")); + g_print(_(" --replace Replace the currently running window manager\n")); g_print(_(" --help Display this help and exit\n")); g_print(_(" --version Display the version and exit\n")); - g_print(_(" --sync Run in synchronous mode (this is slow and" - " meant for\n" - " debugging X routines)\n")); + g_print(_("\nPassing messages to a running Openbox instance:\n\n")); + g_print(_(" --reconfigure Reload Openbox's configuration\n")); + g_print(_("\nDebugging options:\n\n")); + g_print(_(" --sync Run in synchronous mode\n")); g_print(_(" --debug Display debugging output\n")); - g_print(_(" --debug-focus Display debugging output\n")); + g_print(_(" --debug-focus Display debugging output for focus handling\n")); g_print(_("\nPlease report bugs at %s\n\n"), PACKAGE_BUGREPORT); } diff --git a/openbox/screen.c b/openbox/screen.c index 97cab3e6..db7c8ace 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -139,8 +139,7 @@ static gboolean replace_wm() } if (wait >= timeout) { - g_message(_("Timeout expired while waiting for the current WM to die" - " on screen %d"), ob_screen); + g_message(_("The WM on screen %d is not exiting"), ob_screen); return FALSE; } } -- 2.39.2