Enlightenment CVS committal Author : englebass Project : e_modules Module : photo
Dir : e_modules/photo/src/module Modified Files: e_mod_main.c photo_config.c photo_config_dialog.c photo_config_dialog_dir.c photo_config_dialog_item.c photo_item.c photo_menu.c photo_picture_histo.c photo_picture_local.c Log Message: get text from module locale =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/e_mod_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_main.c 12 Nov 2007 04:15:52 -0000 1.10 +++ e_mod_main.c 12 Nov 2007 08:17:34 -0000 1.11 @@ -49,42 +49,42 @@ if (!_e_canvas_init()) { - e_module_dialog_show(m, _("Photo Module"), _("E Canvas init failed !")); + e_module_dialog_show(m, D_("Photo Module"), D_("E Canvas init failed !")); e_modapi_shutdown(m); return NULL; } if (!_theme_init()) { - e_module_dialog_show(m, _("Photo Module"), _("Theme init failed !")); + e_module_dialog_show(m, D_("Photo Module"), D_("Theme init failed !")); e_modapi_shutdown(m); return NULL; } if (!photo_config_init()) { - e_module_dialog_show(m, _("Photo Module"), _("Config init failed")); + e_module_dialog_show(m, D_("Photo Module"), D_("Config init failed")); e_modapi_shutdown(m); return NULL; } if (!photo_picture_init()) { - e_module_dialog_show(m, _("Photo Module"), _("Picture subsystem init failed")); + e_module_dialog_show(m, D_("Photo Module"), D_("Picture subsystem init failed")); e_modapi_shutdown(m); return NULL; } if (!photo_popup_warn_init()) { - e_module_dialog_show(m, _("Photo Module"), _("Popup warn subsystem init failed")); + e_module_dialog_show(m, D_("Photo Module"), D_("Popup warn subsystem init failed")); e_modapi_shutdown(m); return NULL; } if (!photo_popup_info_init()) { - e_module_dialog_show(m, _("Photo Module"), _("Popup info subsystem init failed")); + e_module_dialog_show(m, D_("Photo Module"), D_("Popup info subsystem init failed")); e_modapi_shutdown(m); return NULL; } @@ -177,7 +177,7 @@ static char * _gc_label(void) { - return _("Photo"); + return D_("Photo"); } static Evas_Object * =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/photo_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- photo_config.c 22 Jul 2006 22:30:52 -0000 1.2 +++ photo_config.c 12 Nov 2007 08:17:34 -0000 1.3 @@ -62,13 +62,13 @@ if (photo->config->version < CONFIG_VERSION) { snprintf(buf, sizeof(buf), - _("<hilight>Photo module : Configuration Upgraded</hilight><br><br>" + D_("<hilight>Photo module : Configuration Upgraded</hilight><br><br>" "Your configuration of photo module<br>" "has been upgraded<br>" "Your settings were removed<br>" "Sorry for the inconvenience<br><br>" "(%d -> %d)"), photo->config->version, CONFIG_VERSION); - e_module_dialog_show(photo->module, _("Photo Module version " MODULE_VERSION), buf); + e_module_dialog_show(photo->module, D_("Photo Module version " MODULE_VERSION), buf); photo->config = NULL; } else @@ -76,13 +76,13 @@ if (photo->config->version > CONFIG_VERSION) { snprintf(buf, sizeof(buf), - _("<hilight>Photo module : Configuration Downgraded</hilight><br><br>" + D_("<hilight>Photo module : Configuration Downgraded</hilight><br><br>" "Your configuration of Photo module<br>" "has been downgraded<br>" "Your settings were removed<br>" "Sorry for the inconvenience<br><br>" "(%d ->%d)"), photo->config->version, CONFIG_VERSION); - e_module_dialog_show(photo->module, _("Photo Module version " MODULE_VERSION), buf); + e_module_dialog_show(photo->module, D_("Photo Module version " MODULE_VERSION), buf); photo->config = NULL; } } =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/photo_config_dialog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- photo_config_dialog.c 7 Oct 2007 21:26:48 -0000 1.6 +++ photo_config_dialog.c 12 Nov 2007 08:17:34 -0000 1.7 @@ -61,7 +61,7 @@ snprintf(buf, sizeof(buf), "%s/e-module-photo.edj", e_module_dir_get(photo->module)); cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), - _("Photo Configuration"), "Photo", "_e_modules_photo_config_dialog", buf, 0, v, NULL); + D_("Photo Configuration"), "Photo", "_e_modules_photo_config_dialog", buf, 0, v, NULL); return 1; } @@ -217,7 +217,7 @@ o = e_widget_table_add(evas, 0); - of = e_widget_frametable_add(evas, _("Picture directories"), 0); + of = e_widget_frametable_add(evas, D_("Picture directories"), 0); ob = e_widget_textblock_add(evas); cfdata->textblock_local_infos = ob; @@ -232,51 +232,51 @@ photo_config_dialog_refresh_local_dirs(); e_widget_frametable_object_append(of, ob, 0, 1, 3, 1, 1, 1, 1, 1); - ob = e_widget_button_add(evas, _("Add"), NULL, _cb_dir_add, cfdata, NULL); + ob = e_widget_button_add(evas, D_("Add"), NULL, _cb_dir_add, cfdata, NULL); e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_button_add(evas, _("Delete"), NULL, _cb_dir_del, cfdata, NULL); + ob = e_widget_button_add(evas, D_("Delete"), NULL, _cb_dir_del, cfdata, NULL); e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_button_add(evas, _("Configure"), NULL, _cb_dir_config, cfdata, NULL); + ob = e_widget_button_add(evas, D_("Configure"), NULL, _cb_dir_config, cfdata, NULL); e_widget_frametable_object_append(of, ob, 2, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_button_add(evas, _("Reload picture directories"), NULL, _cb_dir_reload, cfdata, NULL); + ob = e_widget_button_add(evas, D_("Reload picture directories"), NULL, _cb_dir_reload, cfdata, NULL); cfdata->button_local_load_start = ob; e_widget_frametable_object_append(of, ob, 0, 3, 3, 1, 1, 1, 1, 1); - ob = e_widget_button_add(evas, _("Stop loading"), NULL, _cb_dir_stopload, cfdata, NULL); + ob = e_widget_button_add(evas, D_("Stop loading"), NULL, _cb_dir_stopload, cfdata, NULL); cfdata->button_local_load_stop = ob; e_widget_frametable_object_append(of, ob, 0, 4, 3, 1, 1, 1, 1, 1); photo_config_dialog_refresh_local_load(); e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1); - of = e_widget_frametable_add(evas, _("Appearance"), 0); + of = e_widget_frametable_add(evas, D_("Appearance"), 0); - ob = e_widget_check_add(evas, _("Always show label"), &(cfdata->show_label)); + ob = e_widget_check_add(evas, D_("Always show label"), &(cfdata->show_label)); e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1); - ob = e_widget_check_add(evas, _("Nice transitions"), &(cfdata->nice_trans)); + ob = e_widget_check_add(evas, D_("Nice transitions"), &(cfdata->nice_trans)); e_widget_frametable_object_append(of, ob, 0, 1, 2, 1, 1, 1, 1, 1); e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1); - of = e_widget_frametable_add(evas, _("Default Mouse actions"), 0); + of = e_widget_frametable_add(evas, D_("Default Mouse actions"), 0); - ob = e_widget_label_add(evas, _("Over")); + ob = e_widget_label_add(evas, D_("Over")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); CONFIG_DIALOG_ACTION_CHOICE(of, 0, 2, cfdata->action_mouse_over, ITEM_ACTION_NO); - ob = e_widget_label_add(evas, _("Left")); + ob = e_widget_label_add(evas, D_("Left")); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, _("click")); + ob = e_widget_label_add(evas, D_("click")); e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); CONFIG_DIALOG_ACTION_CHOICE(of, 1, 2, cfdata->action_mouse_left, ITEM_ACTION_NO); - ob = e_widget_label_add(evas, _("Middle")); + ob = e_widget_label_add(evas, D_("Middle")); e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, _("click")); + ob = e_widget_label_add(evas, D_("click")); e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 1, 1); CONFIG_DIALOG_ACTION_CHOICE(of, 2, 2, cfdata->action_mouse_middle, ITEM_ACTION_NO); - CONFIG_DIALOG_ACTION_CHOICE_LABELS(of, 3, 2, _("No")); + CONFIG_DIALOG_ACTION_CHOICE_LABELS(of, 3, 2, D_("No")); e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1); @@ -315,45 +315,45 @@ o = e_widget_table_add(evas, 0); - of = e_widget_frametable_add(evas, _("Popups"), 0); + of = e_widget_frametable_add(evas, D_("Popups"), 0); - ob = e_widget_label_add(evas, _("Picture loader popup")); + ob = e_widget_label_add(evas, D_("Picture loader popup")); e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1); rg = e_widget_radio_group_new(&(cfdata->local.popup)); - ob = e_widget_radio_add(evas, _("Never"), PICTURE_LOCAL_POPUP_NEVER, rg); + ob = e_widget_radio_add(evas, D_("Never"), PICTURE_LOCAL_POPUP_NEVER, rg); e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_add(evas, _("Summary"), PICTURE_LOCAL_POPUP_SUM, rg); + ob = e_widget_radio_add(evas, D_("Summary"), PICTURE_LOCAL_POPUP_SUM, rg); e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_add(evas, _("Verbose"), PICTURE_LOCAL_POPUP_ALWAYS, rg); + ob = e_widget_radio_add(evas, D_("Verbose"), PICTURE_LOCAL_POPUP_ALWAYS, rg); e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1); - of = e_widget_frametable_add(evas, _("Miscellaneous"), 0); + of = e_widget_frametable_add(evas, D_("Miscellaneous"), 0); - ob = e_widget_check_add(evas, _("Remove generated backgrounds"), + ob = e_widget_check_add(evas, D_("Remove generated backgrounds"), &(cfdata->pictures_set_bg_purge)); e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, _("Pictures viewer")); + ob = e_widget_label_add(evas, D_("Pictures viewer")); e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); ob = e_widget_entry_add(evas, &(cfdata->pictures_viewer), NULL, NULL, NULL); e_widget_min_size_set(ob, 80, 25); e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, _("Images Quality")); + ob = e_widget_label_add(evas, D_("Images Quality")); e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pix"), + ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f pix"), (float)PICTURE_THUMB_SIZE_MIN, (float)PICTURE_THUMB_SIZE_MAX, 100.0, 0, NULL, &(cfdata->pictures_thumb_size), 80); e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0); - ob = e_widget_check_add(evas, _("Automaticly reload directories"), + ob = e_widget_check_add(evas, D_("Automaticly reload directories"), &(cfdata->local.auto_reload)); e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, _("when add / modify directory list")); + ob = e_widget_label_add(evas, D_("when add / modify directory list")); e_widget_frametable_object_append(of, ob, 0, 4, 2, 1, 1, 1, 1, 1); =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/photo_config_dialog_dir.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- photo_config_dialog_dir.c 7 Oct 2007 21:26:48 -0000 1.5 +++ photo_config_dialog_dir.c 12 Nov 2007 08:17:34 -0000 1.6 @@ -35,7 +35,7 @@ snprintf(buf, sizeof(buf), "%s/e-module-photo.edj", e_module_dir_get(photo->module)); cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), - _("Photo Directory Configuration"), "Photo", "_e_modules_photo_dir_config_dialog", buf, 0, v, dir); + D_("Photo Directory Configuration"), "Photo", "_e_modules_photo_dir_config_dialog", buf, 0, v, dir); if (dir) dir->config_dialog = cfd; else photo->config_dialog_adddir = cfd; @@ -115,7 +115,7 @@ o = e_widget_table_add(evas, 0); - of = e_widget_frametable_add(evas, _("Directory"), 0); + of = e_widget_frametable_add(evas, D_("Directory"), 0); ob = e_widget_entry_add(evas, &(cfdata->path), NULL, NULL, NULL); e_widget_min_size_set(ob, 250, 25); @@ -124,11 +124,11 @@ e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1); - of = e_widget_frametable_add(evas, _("Loading options"), 0); + of = e_widget_frametable_add(evas, D_("Loading options"), 0); - ob = e_widget_check_add(evas, _("Recursive"), &(cfdata->recursive)); + ob = e_widget_check_add(evas, D_("Recursive"), &(cfdata->recursive)); e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1); - ob = e_widget_check_add(evas, _("Read hidden files"), &(cfdata->read_hidden)); + ob = e_widget_check_add(evas, D_("Read hidden files"), &(cfdata->read_hidden)); e_widget_frametable_object_append(of, ob, 0, 1, 2, 1, 1, 1, 1, 1); e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1); @@ -155,7 +155,7 @@ "<hilight>The directory %s is being loaded at the moment !</hilight><br>" "Please wait until the loading is finished to modify its settings", cfdata->dir->path); - e_module_dialog_show(photo->module, _("Photo Module Warning"), buf); + e_module_dialog_show(photo->module, D_("Photo Module Warning"), buf); return 0; } =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/photo_config_dialog_item.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- photo_config_dialog_item.c 29 May 2007 17:11:45 -0000 1.6 +++ photo_config_dialog_item.c 12 Nov 2007 08:17:34 -0000 1.7 @@ -45,7 +45,7 @@ snprintf(buf, sizeof(buf), "%s/e-module-photo.edj", e_module_dir_get(photo->module)); cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), - _("Photo Item Configuration"), "Photo", "_e_modules_photo_item_config_dialog", buf, 0, v, pi); + D_("Photo Item Configuration"), "Photo", "_e_modules_photo_item_config_dialog", buf, 0, v, pi); pi->config_dialog = cfd; return 1; @@ -109,12 +109,12 @@ o = e_widget_table_add(evas, 0); - of = e_widget_frametable_add(evas, _("Timer between pictures change"), 0); + of = e_widget_frametable_add(evas, D_("Timer between pictures change"), 0); - ob = e_widget_check_add(evas, _("Activate"), &(cfdata->timer_active)); + ob = e_widget_check_add(evas, D_("Activate"), &(cfdata->timer_active)); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), + ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f seconds"), (float)ITEM_TIMER_S_MIN, (float)ITEM_TIMER_S_MAX, 1.0, 0, NULL, &(cfdata->timer_s), 130); @@ -124,24 +124,24 @@ - of = e_widget_frametable_add(evas, _("Appearance"), 0); + of = e_widget_frametable_add(evas, D_("Appearance"), 0); - ob = e_widget_label_add(evas, _("Alpha")); + ob = e_widget_label_add(evas, D_("Alpha")); e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0.0, 255, 1.0, 0, + ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 0.0, 255, 1.0, 0, NULL, &(cfdata->alpha), 130); e_widget_frametable_object_append(of, ob, 0, 1, 3, 1, 1, 0, 1, 0); - ob = e_widget_label_add(evas, _("Always show label")); + ob = e_widget_label_add(evas, D_("Always show label")); e_widget_frametable_object_append(of, ob, 0, 2, 3, 1, 1, 1, 1, 1); rg = e_widget_radio_group_new(&(cfdata->show_label)); - ob = e_widget_radio_add(evas, _("Yes"), ITEM_SHOW_LABEL_YES, rg); + ob = e_widget_radio_add(evas, D_("Yes"), ITEM_SHOW_LABEL_YES, rg); e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_add(evas, _("No"), ITEM_SHOW_LABEL_NO, rg); + ob = e_widget_radio_add(evas, D_("No"), ITEM_SHOW_LABEL_NO, rg); e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_add(evas, _("Default setting"), ITEM_SHOW_LABEL_PARENT, rg); + ob = e_widget_radio_add(evas, D_("Default setting"), ITEM_SHOW_LABEL_PARENT, rg); e_widget_frametable_object_append(of, ob, 2, 3, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1); @@ -186,24 +186,24 @@ o = e_widget_table_add(evas, 0); - of = e_widget_frametable_add(evas, _("Mouse actions"), 0); + of = e_widget_frametable_add(evas, D_("Mouse actions"), 0); - ob = e_widget_label_add(evas, _("Over")); + ob = e_widget_label_add(evas, D_("Over")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); CONFIG_DIALOG_ACTION_CHOICE(of, 0, 2, cfdata->action_mouse_over, ITEM_ACTION_PARENT); - ob = e_widget_label_add(evas, _("Left")); + ob = e_widget_label_add(evas, D_("Left")); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, _("click")); + ob = e_widget_label_add(evas, D_("click")); e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); CONFIG_DIALOG_ACTION_CHOICE(of, 1, 2, cfdata->action_mouse_left, ITEM_ACTION_PARENT); - ob = e_widget_label_add(evas, _("Middle")); + ob = e_widget_label_add(evas, D_("Middle")); e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_label_add(evas, _("click")); + ob = e_widget_label_add(evas, D_("click")); e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 1, 1); CONFIG_DIALOG_ACTION_CHOICE(of, 2, 2, cfdata->action_mouse_middle, ITEM_ACTION_PARENT); - CONFIG_DIALOG_ACTION_CHOICE_LABELS(of, 3, 2, _("Default setting")); + CONFIG_DIALOG_ACTION_CHOICE_LABELS(of, 3, 2, D_("Default setting")); e_widget_table_object_append(o, of, 1, 0, 1, 2, 1, 1, 1, 1); =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/photo_item.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- photo_item.c 16 Sep 2007 01:46:50 -0000 1.7 +++ photo_item.c 12 Nov 2007 08:17:34 -0000 1.8 @@ -386,10 +386,10 @@ if (!ecore_file_exists(file)) { snprintf(buf, sizeof(buf), - _("<hilight>File %s doesnt exists.</hilight><br><br>" + D_("<hilight>File %s doesnt exists.</hilight><br><br>" "This file is in Photo module picture list, but it seems you removed it from the disk<br>" "It cant be set as background, sorry."), file); - e_module_dialog_show(photo->module, _("Photo Module Error"), buf); + e_module_dialog_show(photo->module, D_("Photo Module Error"), buf); return 0; } @@ -410,11 +410,11 @@ else { snprintf(buf, sizeof(buf), - _("<hilight>e17setroot needed</hilight><br><br>" + D_("<hilight>e17setroot needed</hilight><br><br>" "%s is not an edje file !<br>" "Photo module needs e17setroot util from e_utils package to set you're picture as background" "Please install it and try again"), file); - e_module_dialog_show(photo->module, _("Photo Module Error"), buf); + e_module_dialog_show(photo->module, D_("Photo Module Error"), buf); return 0; } } @@ -449,10 +449,10 @@ if (!ecore_file_exists(file)) { snprintf(buf, sizeof(buf), - _("<hilight>File %s doesnt exists !</hilight><br><br>" + D_("<hilight>File %s doesnt exists !</hilight><br><br>" "This file is in Photo's module picture list, but it seems you removed it from the disk.<br>" "It cant be set opened in a viewer, sorry."), file); - e_module_dialog_show(photo->module, _("Photo Module Error"), buf); + e_module_dialog_show(photo->module, D_("Photo Module Error"), buf); return 0; } @@ -469,10 +469,10 @@ else { snprintf(buf, sizeof(buf), - _("<hilight>Viewer %s not found !</hilight><br><br>" + D_("<hilight>Viewer %s not found !</hilight><br><br>" "You can change the viewer for images in Photo module configuration panel (Advanced view)"), photo->config->pictures_viewer); - e_module_dialog_show(photo->module, _("Photo Module Error"), buf); + e_module_dialog_show(photo->module, D_("Photo Module Error"), buf); return 0; } =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/photo_menu.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- photo_menu.c 21 Feb 2007 01:36:31 -0000 1.4 +++ photo_menu.c 12 Nov 2007 08:17:34 -0000 1.5 @@ -27,21 +27,21 @@ mi = e_menu_item_new(mn); if (pi->config->timer_active) { - e_menu_item_label_set(mi, _("Pause slideshow")); + e_menu_item_label_set(mi, D_("Pause slideshow")); photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_PAUSE); } else { - e_menu_item_label_set(mi, _("Resume slideshow")); + e_menu_item_label_set(mi, D_("Resume slideshow")); photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_RESUME); } e_menu_item_callback_set(mi, _cb_pause_toggle, pi); mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Next picture")); + e_menu_item_label_set(mi, D_("Next picture")); photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_NEXT); e_menu_item_callback_set(mi, _cb_picture_next, pi); mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Previous picture")); + e_menu_item_label_set(mi, D_("Previous picture")); photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_PREVIOUS); e_menu_item_callback_set(mi, _cb_picture_prev, pi); @@ -51,15 +51,15 @@ e_menu_item_separator_set(mi, 1); mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Picture informations")); + e_menu_item_label_set(mi, D_("Picture informations")); photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_INFOS); e_menu_item_callback_set(mi, _cb_picture_info, pi); mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Set as background")); + e_menu_item_label_set(mi, D_("Set as background")); photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_SETBG); e_menu_item_callback_set(mi, _cb_picture_setbg, pi); mi = e_menu_item_new(mn); - snprintf(buf, sizeof(buf), "%s %s", _("Open in"), photo->config->pictures_viewer); + snprintf(buf, sizeof(buf), "%s %s", D_("Open in"), photo->config->pictures_viewer); e_menu_item_label_set(mi, buf); photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_VIEWER); e_menu_item_callback_set(mi, _cb_picture_viewer, pi); @@ -68,18 +68,18 @@ e_menu_item_separator_set(mi, 1); mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Configure Photo module")); + e_menu_item_label_set(mi, D_("Configure Photo module")); e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); e_menu_item_callback_set(mi, _cb_configure_general, NULL); mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Configure this Photo gadget")); + e_menu_item_label_set(mi, D_("Configure this Photo gadget")); e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); e_menu_item_callback_set(mi, _cb_configure_item, pi); mn2 = e_menu_new(); e_gadcon_client_util_menu_items_append(pi->gcc, mn2, 0); mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Configure Gadget and Shelf")); + e_menu_item_label_set(mi, D_("Configure Gadget and Shelf")); e_menu_item_submenu_set(mi, mn2); pi->menu = mn; =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/photo_picture_histo.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- photo_picture_histo.c 12 Oct 2007 12:05:29 -0000 1.9 +++ photo_picture_histo.c 12 Nov 2007 08:17:34 -0000 1.10 @@ -118,7 +118,7 @@ E_Menu_Item *mi; mi = e_menu_item_new(mn_main); - e_menu_item_label_set(mi, _("Historic")); + e_menu_item_label_set(mi, D_("Historic")); e_menu_item_submenu_pre_callback_set(mi, _cb_menu_populate, pi); e_menu_item_submenu_post_callback_set(mi, =================================================================== RCS file: /cvs/e/e_modules/photo/src/module/photo_picture_local.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- photo_picture_local.c 24 Sep 2006 03:19:06 -0000 1.9 +++ photo_picture_local.c 12 Nov 2007 08:17:34 -0000 1.10 @@ -250,13 +250,13 @@ { char buf[4096]; snprintf(buf, sizeof(buf), - _("<hilight>Directory %s doesnt exists.</hilight><br><br>" + D_("<hilight>Directory %s doesnt exists.</hilight><br><br>" "You can change the picture's folders in main configuration panel<br>" "They can be jpeg or png<br><br>" "After import, if you can remove these files and the pictures still can<br>" "be viewed, but you wont be able to set them as wallpaper anymore<br><br>"), path); - e_module_dialog_show(photo->module, _("Photo Module Error"), buf); + e_module_dialog_show(photo->module, D_("Photo Module Error"), buf); return NULL; } @@ -590,8 +590,8 @@ { photo->config->local.thumb_msg = 0; photo_config_save(); - e_module_dialog_show(photo->module, _("Photo Module Information"), - _("<hilight>Creating thumbs</hilight><br><br>" + e_module_dialog_show(photo->module, D_("Photo Module Information"), + D_("<hilight>Creating thumbs</hilight><br><br>" "Some pictures are being thumbed in a <hilight>background task</hilight>.<br>" "It can take a while, but after, loading will be faster and lighter :)<br><br>" "Each time wou will load pictures that haven't been loaded in Photo module before,<br>" ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs