diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c
index 85e37bebd..5f7b7948e 100644
--- a/src/modules/mixer/app_mixer.c
+++ b/src/modules/mixer/app_mixer.c
@@ -163,9 +163,9 @@ _populate_channel_editor(E_Mixer_App_Dialog_Data *app)
    e_widget_entry_text_set(ui->channel, app->channel_name);
 
    if (e_mixer_system_has_capture(app->sys, app->channel_info->id))
-     e_widget_entry_text_set(ui->type, D_("Capture"));
+     e_widget_entry_text_set(ui->type, _("Capture"));
    else
-     e_widget_entry_text_set(ui->type, D_("Playback"));
+     e_widget_entry_text_set(ui->type, _("Playback"));
 
    e_mixer_system_get_state(app->sys, app->channel_info->id, &state);
    _update_channel_editor_state(app, state);
@@ -285,13 +285,13 @@ _populate_channels(E_Mixer_App_Dialog_Data *app)
 	struct channel_info *info = app->channels_infos->data;
 	if (info->has_capture)
 	  {
-	     e_widget_ilist_header_append(ilist, NULL, D_("Input"));
+	     e_widget_ilist_header_append(ilist, NULL, _("Input"));
 	     header_input = 1;
 	     i = 1;
 	  }
 	else
 	  {
-	     e_widget_ilist_header_append(ilist, NULL, D_("Output"));
+	     e_widget_ilist_header_append(ilist, NULL, _("Output"));
 	     header_input = 0;
 	     i = 1;
 	  }
@@ -303,7 +303,7 @@ _populate_channels(E_Mixer_App_Dialog_Data *app)
 
 	if ((!header_input) && info->has_capture)
 	  {
-	     e_widget_ilist_header_append(ilist, NULL, D_("Input"));
+	     e_widget_ilist_header_append(ilist, NULL, _("Input"));
 	     header_input = 1;
 	     i++;
 	  }
@@ -364,7 +364,7 @@ _create_cards(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app)
 	free(card_name);
      }
 
-   ui->frame = e_widget_framelist_add(evas, D_("Cards"), 0);
+   ui->frame = e_widget_framelist_add(evas, _("Cards"), 0);
    e_widget_framelist_object_append(ui->frame, ui->list);
    e_widget_list_object_append(app->ui.hlayout, ui->frame, 1, 0, 0.0);
 }
@@ -379,7 +379,7 @@ _create_channels(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app)
    e_widget_min_size_set(ui->list, 180, 100);
    e_widget_ilist_go(ui->list);
 
-   ui->frame = e_widget_framelist_add(evas, D_("Channels"), 0);
+   ui->frame = e_widget_framelist_add(evas, _("Channels"), 0);
    e_widget_framelist_object_append(ui->frame, ui->list);
    e_widget_list_object_append(app->ui.hlayout, ui->frame, 1, 1, 0.0);
 }
@@ -391,36 +391,36 @@ _create_channel_editor(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *ap
 
    ui = &app->ui.channel_editor;
 
-   ui->label_card = e_widget_label_add(evas, D_("Card:"));
+   ui->label_card = e_widget_label_add(evas, _("Card:"));
    ui->card = e_widget_entry_add(evas, NULL, NULL, NULL, NULL);
    e_widget_entry_readonly_set(ui->card, 1);
 
-   ui->label_channel = e_widget_label_add(evas, D_("Channel:"));
+   ui->label_channel = e_widget_label_add(evas, _("Channel:"));
    ui->channel = e_widget_entry_add(evas, NULL, NULL, NULL, NULL);
    e_widget_entry_readonly_set(ui->channel, 1);
 
-   ui->label_type = e_widget_label_add(evas, D_("Type:"));
+   ui->label_type = e_widget_label_add(evas, _("Type:"));
    ui->type = e_widget_entry_add(evas, NULL, NULL, NULL, NULL);
    e_widget_entry_readonly_set(ui->type, 1);
 
-   ui->label_left = e_widget_label_add(evas, D_("Left:"));
+   ui->label_left = e_widget_label_add(evas, _("Left:"));
    ui->left = e_widget_slider_add(evas, 1, 0, "%3.0f", 0.0, 100.0, 10.0, 100.0,
 				  NULL, &app->state.left, 150);
    e_widget_on_change_hook_set(ui->left, _cb_changed_left, app);
 
-   ui->label_right = e_widget_label_add(evas, D_("Right:"));
+   ui->label_right = e_widget_label_add(evas, _("Right:"));
    ui->right = e_widget_slider_add(evas, 1, 0, "%3.0f", 0.0, 100.0, 10.0, 100.0,
 				   NULL, &app->state.right, 150);
    e_widget_on_change_hook_set(ui->right, _cb_changed_right, app);
 
-   ui->mute = e_widget_check_add(evas, D_("Mute"), &app->state.mute);
+   ui->mute = e_widget_check_add(evas, _("Mute"), &app->state.mute);
    e_widget_on_change_hook_set(ui->mute, _cb_changed_mute, app);
 
-   ui->lock_sliders = e_widget_check_add(evas, D_("Lock Sliders"),
+   ui->lock_sliders = e_widget_check_add(evas, _("Lock Sliders"),
 					 &app->lock_sliders);
    e_widget_on_change_hook_set(ui->lock_sliders, _cb_changed_lock_sliders, app);
 
-   ui->frame = e_widget_framelist_add(evas, D_("Edit"), 0);
+   ui->frame = e_widget_framelist_add(evas, _("Edit"), 0);
    e_widget_framelist_object_append(ui->frame, ui->label_card);
    e_widget_framelist_object_append(ui->frame, ui->card);
    e_widget_framelist_object_append(ui->frame, ui->label_channel);
@@ -527,14 +527,14 @@ e_mixer_app_dialog_new(E_Container *con, void (*func)(E_Dialog *dialog, void *da
    app->del.data = data;
    app->del.func = func;
 
-   e_dialog_title_set(dialog, D_(_Name));
+   e_dialog_title_set(dialog, _(_Name));
    e_dialog_resizable_set(dialog, 1);
 
    e_win_delete_callback_set(dialog->win, _cb_win_del);
 
    _create_ui(dialog, app);
 
-   e_dialog_button_add(dialog, D_("Close"), NULL, _cb_dialog_dismiss, app);
+   e_dialog_button_add(dialog, _("Close"), NULL, _cb_dialog_dismiss, app);
    e_dialog_button_focus_num(dialog, 1);
    e_win_centered_set(dialog->win, 1);
    e_dialog_show(dialog);
diff --git a/src/modules/mixer/conf_gadget.c b/src/modules/mixer/conf_gadget.c
index 928dda856..b6cdae12b 100644
--- a/src/modules/mixer/conf_gadget.c
+++ b/src/modules/mixer/conf_gadget.c
@@ -194,16 +194,16 @@ _basic_create_general(Evas *evas, E_Config_Dialog_Data *cfdata)
 
    ui = &cfdata->ui.general;
 
-   ui->frame = e_widget_framelist_add(evas, D_("General Settings"), 0);
+   ui->frame = e_widget_framelist_add(evas, _("General Settings"), 0);
 
    ui->lock_sliders = e_widget_check_add(
-      evas, D_("Lock Sliders"), &cfdata->lock_sliders);
+      evas, _("Lock Sliders"), &cfdata->lock_sliders);
    evas_object_smart_callback_add(
       ui->lock_sliders, "changed", _lock_change, cfdata);
    e_widget_framelist_object_append(ui->frame, ui->lock_sliders);
 
    ui->show_locked = e_widget_check_add(
-      evas, D_("Show both sliders when locked"), &cfdata->show_locked);
+      evas, _("Show both sliders when locked"), &cfdata->show_locked);
    e_widget_disabled_set(ui->show_locked, !cfdata->lock_sliders);
    e_widget_framelist_object_append(ui->frame, ui->show_locked);
 }
@@ -282,7 +282,7 @@ _basic_create_channels(Evas *evas, E_Config_Dialog_Data *cfdata)
    ui = &cfdata->ui.channels;
    ui->list = e_widget_list_add(evas, 1, 0);
    ui->scroll = e_widget_scrollframe_simple_add(evas, ui->list);
-   ui->frame = e_widget_framelist_add(evas, D_("Channels"), 0);
+   ui->frame = e_widget_framelist_add(evas, _("Channels"), 0);
 
    _fill_channels(evas, cfdata);
 
@@ -324,7 +324,7 @@ _basic_create_cards(Evas *evas, E_Config_Dialog_Data *cfdata)
 
    ui = &cfdata->ui.cards;
 
-   ui->frame = e_widget_framelist_add(evas, D_("Sound Cards"), 0);
+   ui->frame = e_widget_framelist_add(evas, _("Sound Cards"), 0);
    ui->radio = e_widget_radio_group_new(&cfdata->card_num);
    for (i = 0, l = cfdata->cards_names; l != NULL; l = l->next, i++)
      {
@@ -380,7 +380,7 @@ e_mixer_config_dialog_new(E_Container *con, E_Mixer_Gadget_Config *conf)
    view->basic.create_widgets = _basic_create;
    view->basic.apply_cfdata = _basic_apply;
 
-   dialog = e_config_dialog_new(con, D_("Mixer Configuration"),
+   dialog = e_config_dialog_new(con, _("Mixer Configuration"),
                                 _Name, "e_mixer_config_dialog_new",
                                 e_mixer_theme_path(), 0, view, conf);
    e_dialog_resizable_set(dialog->dia, 1);
diff --git a/src/modules/mixer/conf_module.c b/src/modules/mixer/conf_module.c
index 80fa88306..617c7f665 100644
--- a/src/modules/mixer/conf_module.c
+++ b/src/modules/mixer/conf_module.c
@@ -93,9 +93,9 @@ _basic_create_general(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data
    ui = &cfdata->ui.general;
    ctxt = dialog->data;
 
-   ui->frame = e_widget_framelist_add(evas, D_("General Settings"), 0);
+   ui->frame = e_widget_framelist_add(evas, _("General Settings"), 0);
 
-   label = e_widget_label_add(evas, D_("Mixer to use for global actions:"));
+   label = e_widget_label_add(evas, _("Mixer to use for global actions:"));
    e_widget_framelist_object_append(ui->frame, label);
 
    ui->radio = e_widget_radio_group_new(&cfdata->default_instance);
@@ -149,7 +149,7 @@ _basic_create_mixer_call(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Da
 {
     Evas_Object *button;
 
-    button = e_widget_button_add(evas, D_("Launch mixer..."), NULL,
+    button = e_widget_button_add(evas, _("Launch mixer..."), NULL,
                                  cb_mixer_call, dialog->data, NULL);
     e_widget_list_object_append(cfdata->ui.list, button, 0, 0, 0.0);
 }
@@ -184,7 +184,7 @@ e_mixer_config_module_dialog_new(E_Container *con, E_Mixer_Module_Context *ctxt)
    view->basic.create_widgets = _basic_create;
    view->basic.apply_cfdata = _basic_apply;
 
-   dialog = e_config_dialog_new(con, D_("Mixer Module Configuration"),
+   dialog = e_config_dialog_new(con, _("Mixer Module Configuration"),
                                 _Name, "e_mixer_config_module_dialog_new",
                                 e_mixer_theme_path(), 0, view, ctxt);
 
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 035365b49..bab9f4b67 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -119,7 +119,7 @@ _mixer_gadget_configuration_free_foreach(const Evas_Hash *hash, const char *key,
 static int
 _mixer_module_configuration_alert(void *data)
 {
-   e_util_dialog_show(D_("Mixer Configuration Updated"), data);
+   e_util_dialog_show(_("Mixer Configuration Updated"), data);
    return 0;
 }
 
@@ -544,7 +544,7 @@ _mixer_popup_new(E_Mixer_Instance *inst)
 
    if (e_mixer_system_can_mute(inst->sys, inst->channel))
      {
-        inst->ui.mute = e_widget_check_add(evas, D_("Mute"), &state->mute);
+        inst->ui.mute = e_widget_check_add(evas, _("Mute"), &state->mute);
         evas_object_show(inst->ui.mute);
         e_widget_table_object_append(inst->ui.table, inst->ui.mute,
                                      0, 2, colspan, 1, 1, 1, 1, 0);
@@ -554,7 +554,7 @@ _mixer_popup_new(E_Mixer_Instance *inst)
    else
      inst->ui.mute = NULL;
 
-   inst->ui.button = e_widget_button_add(evas, D_(_Name), NULL,
+   inst->ui.button = e_widget_button_add(evas, _(_Name), NULL,
 					 _mixer_popup_cb_mixer, inst, NULL);
    e_widget_table_object_append(inst->ui.table, inst->ui.button,
                                 0, 7, colspan, 1, 1, 1, 1, 0);
@@ -609,7 +609,7 @@ _mixer_menu_new(E_Mixer_Instance *inst, Evas_Event_Mouse_Down *ev)
    inst->menu = mn;
 
    mi = e_menu_item_new(mn);
-   e_menu_item_label_set(mi, D_("Configuration"));
+   e_menu_item_label_set(mi, _("Configuration"));
    e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
    e_menu_item_callback_set(mi, _mixer_menu_cb_cfg, inst);
 
@@ -898,7 +898,7 @@ _gc_orient(E_Gadcon_Client *gcc)
 static char *
 _gc_label(void)
 {
-   return D_(_Name);
+   return _(_Name);
 }
 
 static Evas_Object *
@@ -1020,9 +1020,9 @@ static const char _reg_item[] = "extensions/e";
 static void
 _mixer_configure_registry_register(void)
 {
-   e_configure_registry_category_add(_reg_cat, 90, D_("Extensions"), NULL,
+   e_configure_registry_category_add(_reg_cat, 90, _("Extensions"), NULL,
                                      "enlightenment/extensions");
-   e_configure_registry_item_add(_reg_item, 30, D_(_Name), NULL,
+   e_configure_registry_item_add(_reg_item, 30, _(_Name), NULL,
                                  "enlightenment/e",
 				 _mixer_module_config);
 }
@@ -1098,7 +1098,7 @@ _mixer_module_configuration_load(E_Config_DD *module_conf_edd)
 	  return NULL;
 
 	ecore_timer_add(1.0, _mixer_module_configuration_alert,
-			D_("Mixer Module Configuration data changed.<br>"
+			_("Mixer Module Configuration data changed.<br>"
 			   "Your old configuration has been replaced with "
 			   "new default.<br>Sorry for the inconvenience."));
 	return conf;
@@ -1133,7 +1133,7 @@ _mixer_actions_register(E_Mixer_Module_Context *ctxt)
    if (ctxt->actions.incr)
      {
         ctxt->actions.incr->func.go = _mixer_cb_volume_increase;
-        e_action_predef_name_set(D_(_Name), D_(_lbl_increase), _act_increase,
+        e_action_predef_name_set(_(_Name), _(_lbl_increase), _act_increase,
 				 NULL, NULL, 0);
      }
 
@@ -1141,7 +1141,7 @@ _mixer_actions_register(E_Mixer_Module_Context *ctxt)
    if (ctxt->actions.decr)
      {
         ctxt->actions.decr->func.go = _mixer_cb_volume_decrease;
-        e_action_predef_name_set(D_(_Name), D_(_lbl_decrease), _act_decrease,
+        e_action_predef_name_set(_(_Name), _(_lbl_decrease), _act_decrease,
 				 NULL, NULL, 0);
      }
 
@@ -1149,7 +1149,7 @@ _mixer_actions_register(E_Mixer_Module_Context *ctxt)
    if (ctxt->actions.mute)
      {
         ctxt->actions.mute->func.go = _mixer_cb_volume_mute;
-        e_action_predef_name_set(D_(_Name), D_(_lbl_mute), _act_mute,
+        e_action_predef_name_set(_(_Name), _(_lbl_mute), _act_mute,
                                  NULL, NULL, 0);
      }
 }
@@ -1159,19 +1159,19 @@ _mixer_actions_unregister(E_Mixer_Module_Context *ctxt)
 {
    if (ctxt->actions.incr)
      {
-        e_action_predef_name_del(D_(_Name), D_(_lbl_increase));
+        e_action_predef_name_del(_(_Name), _(_lbl_increase));
         e_action_del(_act_increase);
      }
 
    if (ctxt->actions.decr)
      {
-        e_action_predef_name_del(D_(_Name), D_(_lbl_decrease));
+        e_action_predef_name_del(_(_Name), _(_lbl_decrease));
         e_action_del(_act_decrease);
      }
 
    if (ctxt->actions.mute)
      {
-        e_action_predef_name_del(D_(_Name), D_(_lbl_mute));
+        e_action_predef_name_del(_(_Name), _(_lbl_mute));
         e_action_del(_act_mute);
      }
 }