rephrased the text for the dialog that appears if a new shortcut collides

2004-07-22  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpactionview.c: rephrased the text for the dialog
	that appears if a new shortcut collides with an existing one.

	* libgimpcolor/gimprgb.[ch]: added new function gimp_rgb_parse_name()
	which accepts RGB colors in hexadezimal notation or as SVG color
	keywords.
This commit is contained in:
Sven Neumann
2004-07-22 12:42:57 +00:00
committed by Sven Neumann
parent 3153eced5d
commit b50ea15b26
4 changed files with 427 additions and 57 deletions

View File

@ -552,9 +552,9 @@ gimp_action_view_accel_edited (GimpCellRendererAccel *accel,
g_strdup_printf ("Shortcut \"%s\" is already taken by "
"\"%s\" from the \"%s\" group.\n"
"\n"
"Click \"Delete Old Shortcut\" to "
"assign the shortcut anyway, "
"deleting %s's shortcut.",
"Choose \"Reassign Shortcut\" to "
"reassign the shortcut, thereby removing "
"the shortcut from %s.",
accel_string,
stripped,
conflict_group->label,
@ -573,7 +573,7 @@ gimp_action_view_accel_edited (GimpCellRendererAccel *accel,
NULL,
GIMP_STOCK_WARNING,
message,
_("Delete Old Shortcut"),
_("_Resassign Shortcut"),
GTK_STOCK_CANCEL,
G_OBJECT (view), "destroy",
gimp_action_view_accel_confirm,