nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't split strings inside _() across lines. change some of the text messages

Browse source
This commit is contained in:
Dana Jansens 2007-04-24 21:09:12 +00:00
parent 1582b36187
commit 04010ff0fe
2 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
openbox/openbox.c
View file

@ -226,8 +226,7 @@ gint main(gint argc, gchar **argv)
openbox_rc, config_file); openbox_rc, config_file);
parse_tree(i, doc, node->xmlChildrenNode); parse_tree(i, doc, node->xmlChildrenNode);
} else { } else {
g_message(_("Unable to find a valid config file, using " g_message(_("Unable to find a valid config file, using some simple defaults"));
"some simple defaults"));
PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc); PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc);
} }
/* we're done with parsing now, kill it */ /* we're done with parsing now, kill it */
@ -346,8 +345,9 @@ gint main(gint argc, gchar **argv)
execvp(argvp[0], argvp); execvp(argvp[0], argvp);
g_strfreev(argvp); g_strfreev(argvp);
} else { } else {
g_message(_("Restart failed to execute new executable " g_message(
"'%s': %s"), restart_path, err->message); _("Restart failed to execute new executable '%s': %s"),
restart_path, err->message);
g_error_free(err); g_error_free(err);
} }
} }
@ -397,30 +397,23 @@ static void print_version()
static void print_help() static void print_help()
{ {
g_print(_("Syntax: openbox [options]\n\n")); g_print(_("Syntax: openbox [options]\n"));
g_print(_("Options:\n\n")); g_print(_("\nOptions:\n\n"));
g_print(_(" --reconfigure Tell the currently running instance of " g_print(_(" --config-file FILE Specify the file to load for the config file\n"));
"Openbox to\n"
" reconfigure (and then exit "
"immediately)\n"));
g_print(_(" --config-file FILE Specify the file to load for the config "
"file\n"));
#ifdef USE_SM #ifdef USE_SM
g_print(_(" --sm-disable Disable connection to session " g_print(_(" --sm-disable Disable connection to session manager\n"));
"manager\n"));
g_print(_(" --sm-client-id ID Specify session management ID\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" g_print(_(" --sm-save-file FILE Specify file to load a saved session from\n"));
"from\n"));
#endif #endif
g_print(_(" --replace Replace the currently running window " g_print(_(" --replace Replace the currently running window manager\n"));
"manager\n"));
g_print(_(" --help Display this help and exit\n")); g_print(_(" --help Display this help and exit\n"));
g_print(_(" --version Display the version and exit\n")); g_print(_(" --version Display the version and exit\n"));
g_print(_(" --sync Run in synchronous mode (this is slow and" g_print(_("\nPassing messages to a running Openbox instance:\n\n"));
" meant for\n" g_print(_(" --reconfigure Reload Openbox's configuration\n"));
" debugging X routines)\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 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); g_print(_("\nPlease report bugs at %s\n\n"), PACKAGE_BUGREPORT);
} }

3
openbox/screen.c
View file

@ -139,8 +139,7 @@ static gboolean replace_wm()
} }
if (wait >= timeout) { if (wait >= timeout) {
g_message(_("Timeout expired while waiting for the current WM to die" g_message(_("The WM on screen %d is not exiting"), ob_screen);
" on screen %d"), ob_screen);
return FALSE; return FALSE;
} }
} }