garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=aba7a8c9d53cf5e0d83046e50c4b8a579a118cfd
commit aba7a8c9d53cf5e0d83046e50c4b8a579a118cfd Author: Igor Murzov <[email protected]> Date: Wed Sep 3 17:11:19 2014 +0400 Improve messages in bindings configuration dialogs --- src/bin/e_grab_dialog.c | 6 +++--- src/modules/conf_bindings/e_int_config_acpibindings.c | 2 +- src/modules/conf_bindings/e_int_config_keybindings.c | 7 ++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/bin/e_grab_dialog.c b/src/bin/e_grab_dialog.c index 2dfbb8f..c2a943e 100644 --- a/src/bin/e_grab_dialog.c +++ b/src/bin/e_grab_dialog.c @@ -1,6 +1,6 @@ #include "e.h" -#define TEXT_PRESS_KEY_SEQUENCE _("Please press key sequence,<br><br>" \ +#define TEXT_PRESS_KEY_SEQUENCE _("Please press key combination,<br><br>" \ "or <hilight>Escape</hilight> to abort.") #define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want<br>" \ "and press any button on your mouse,<br>or roll a" \ @@ -122,14 +122,14 @@ e_grab_dialog_show(E_Win *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key if (is_mouse) { eg->dia = e_dialog_new(c, "E", "_mousebind_getmouse_dialog"); - e_dialog_title_set(eg->dia, _("Mouse Binding Sequence")); + e_dialog_title_set(eg->dia, _("Mouse Binding Combination")); e_dialog_icon_set(eg->dia, "preferences-desktop-mouse", 48); e_dialog_text_set(eg->dia, TEXT_PRESS_MOUSE_BINIDING_SEQUENCE); } else { eg->dia = e_dialog_new(c, "E", "_keybind_getkey_dialog"); - e_dialog_title_set(eg->dia, _("Key Binding Sequence")); + e_dialog_title_set(eg->dia, _("Key Binding Combination")); e_dialog_icon_set(eg->dia, "preferences-desktop-keyboard-shortcuts", 48); e_dialog_text_set(eg->dia, TEXT_PRESS_KEY_SEQUENCE); } diff --git a/src/modules/conf_bindings/e_int_config_acpibindings.c b/src/modules/conf_bindings/e_int_config_acpibindings.c index b9479d6..4e69afe 100644 --- a/src/modules/conf_bindings/e_int_config_acpibindings.c +++ b/src/modules/conf_bindings/e_int_config_acpibindings.c @@ -68,7 +68,7 @@ e_int_config_acpibindings(E_Comp *comp, v->basic.apply_cfdata = _basic_apply; v->basic.create_widgets = _basic_create; - cfd = e_config_dialog_new(comp, _("ACPI Bindings"), "E", + cfd = e_config_dialog_new(comp, _("ACPI Bindings Settings"), "E", "advanced/acpi_bindings", "preferences-system-power-management", 0, v, NULL); diff --git a/src/modules/conf_bindings/e_int_config_keybindings.c b/src/modules/conf_bindings/e_int_config_keybindings.c index 2819ede..108f498 100644 --- a/src/modules/conf_bindings/e_int_config_keybindings.c +++ b/src/modules/conf_bindings/e_int_config_keybindings.c @@ -1,9 +1,6 @@ #include "e.h" #define TEXT_NONE_ACTION_KEY _("<None>") -#define TEXT_PRESS_KEY_SEQUENCE _("Please press key sequence,<br><br>" \ - "or <hilight>Escape</hilight> to abort.") - #define TEXT_NO_PARAMS _("<None>") #define TEXT_NO_MODIFIER_HEADER _("Single key") @@ -977,10 +974,10 @@ _grab_key_down_cb(void *data, if (actd) label = _(actd->act_name); e_util_dialog_show(_("Binding Key Error"), - _("The binding key sequence, that you choose," + _("The binding key combination that you chose" " is already used by <br>" "<hilight>%s</hilight> action.<br>" - "Please choose another binding key sequence."), + "Please choose another binding key combination."), label ? label : _("Unknown")); #endif EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->gui.o_binding_list), l, it) --
