Enlightenment CVS committal
Author : maiurana
Project : e_modules
Module : emu
Dir : e_modules/emu/src/modules/emu
Modified Files:
border_props.c border_props.h e_mod_config.c e_mod_main.c
e_mod_main.h easy_menu.h
Log Message:
added i18n support and italian localization
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/border_props.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- border_props.c 1 Mar 2006 04:59:23 -0000 1.3
+++ border_props.c 20 Mar 2006 11:37:33 -0000 1.4
@@ -1,7 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "e.h"
+#include "border_props.h"
struct _E_Config_Dialog_Data
{
@@ -52,7 +52,7 @@
v->advanced.create_widgets =
_border_props_dialog_advanced_create_widgets;
/* Create The Dialog */
- cfd = e_config_dialog_new(con, _("Window properties"), NULL, 0, v, bd);
+ cfd = e_config_dialog_new(con, D_("Window properties"), NULL, 0, v,
bd);
}
}
@@ -221,43 +221,43 @@
_border_props_dialog_fill_data(bd, cfdata);
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_frametable_add(evas, _("Window identification"), 0);
- ob = e_widget_label_add(evas, _("Title (%T)"));
+ of = e_widget_frametable_add(evas, D_("Window identification"), 0);
+ ob = e_widget_label_add(evas, D_("Title (%T)"));
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->title);
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_frametable_add(evas, _("Properties"), 0);
- ob = e_widget_label_add(evas, _("Position (%p)"));
+ of = e_widget_frametable_add(evas, D_("Properties"), 0);
+ ob = e_widget_label_add(evas, D_("Position (%p)"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->position); // bd->x, bd->y
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Size (%s)"));
+ ob = e_widget_label_add(evas, D_("Size (%s)"));
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->size); // bd->w, bd->h
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Border style (%b)"));
+ ob = e_widget_label_add(evas, D_("Border style (%b)"));
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->border);
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Stickiness (%p)"));
+ ob = e_widget_label_add(evas, D_("Stickiness (%p)"));
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->sticky);
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Virtual desktop (%d)"));
+ ob = e_widget_label_add(evas, D_("Virtual desktop (%d)"));
e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->desk);
e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Shaded state (%r)"));
+ ob = e_widget_label_add(evas, D_("Shaded state (%r)"));
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->shaded);
e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Fullscreen (%f)"));
+ ob = e_widget_label_add(evas, D_("Fullscreen (%f)"));
e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->fullscreen);
e_widget_frametable_object_append(of, ob, 1, 6, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Iconified (%i)"));
+ ob = e_widget_label_add(evas, D_("Iconified (%i)"));
e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->icon);
e_widget_frametable_object_append(of, ob, 1, 7, 1, 1, 1, 1, 1, 1);
@@ -276,79 +276,79 @@
_border_props_dialog_fill_data(bd, cfdata);
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_frametable_add(evas, _("Window identification"), 0);
- ob = e_widget_label_add(evas, _("Window ID (%I)"));
+ of = e_widget_frametable_add(evas, D_("Window identification"), 0);
+ ob = e_widget_label_add(evas, D_("Window ID (%I)"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->ID);
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Window name (%N)"));
+ ob = e_widget_label_add(evas, D_("Window name (%N)"));
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->name);
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Window class (%C)"));
+ ob = e_widget_label_add(evas, D_("Window class (%C)"));
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->class);
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Title (%T)"));
+ ob = e_widget_label_add(evas, D_("Title (%T)"));
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->title);
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Window role (%R)"));
+ ob = e_widget_label_add(evas, D_("Window role (%R)"));
e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->role);
e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Window type (%S)"));
+ ob = e_widget_label_add(evas, D_("Window type (%S)"));
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->type);
e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Transient (%H)"));
+ ob = e_widget_label_add(evas, D_("Transient (%H)"));
e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->transient);
e_widget_frametable_object_append(of, ob, 1, 6, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_frametable_add(evas, _("Properties"), 0);
- ob = e_widget_label_add(evas, _("Position (%p)"));
+ of = e_widget_frametable_add(evas, D_("Properties"), 0);
+ ob = e_widget_label_add(evas, D_("Position (%p)"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->position);
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Size (%s)"));
+ ob = e_widget_label_add(evas, D_("Size (%s)"));
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->size);
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Layer (%l)"));
+ ob = e_widget_label_add(evas, D_("Layer (%l)"));
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->layer);
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Border style (%b)"));
+ ob = e_widget_label_add(evas, D_("Border style (%b)"));
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->border);
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Stickiness (%y)"));
+ ob = e_widget_label_add(evas, D_("Stickiness (%y)"));
e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->sticky);
e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Virtual desktop (%d)"));
+ ob = e_widget_label_add(evas, D_("Virtual desktop (%d)"));
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->desk);
e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Shaded state (%r)"));
+ ob = e_widget_label_add(evas, D_("Shaded state (%r)"));
e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->shaded);
e_widget_frametable_object_append(of, ob, 1, 6, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Screen zone (%z)"));
+ ob = e_widget_label_add(evas, D_("Screen zone (%z)"));
e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->zone);
e_widget_frametable_object_append(of, ob, 1, 7, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Window list skip (%w)"));
+ ob = e_widget_label_add(evas, D_("Window list skip (%w)"));
e_widget_frametable_object_append(of, ob, 0, 8, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->winlist);
e_widget_frametable_object_append(of, ob, 1, 8, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Fullscreen (%f)"));
+ ob = e_widget_label_add(evas, D_("Fullscreen (%f)"));
e_widget_frametable_object_append(of, ob, 0, 9, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->fullscreen);
e_widget_frametable_object_append(of, ob, 1, 9, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Iconified (%i)"));
+ ob = e_widget_label_add(evas, D_("Iconified (%i)"));
e_widget_frametable_object_append(of, ob, 0, 10, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, cfdata->icon);
e_widget_frametable_object_append(of, ob, 1, 10, 1, 1, 1, 1, 1, 1);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/border_props.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- border_props.h 5 Feb 2006 04:39:40 -0000 1.1
+++ border_props.h 20 Mar 2006 11:37:33 -0000 1.2
@@ -6,6 +6,7 @@
#else
#ifndef BORDER_PROPS_H
#define BORDER_PROPS_H
+#include "e_mod_main.h"
EAPI void border_props_dialog(E_Container *con, E_Border * bd);
EAPI char *border_props_substitute(E_Border * bd, char type);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/e_mod_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_config.c 12 Mar 2006 16:17:13 -0000 1.7
+++ e_mod_config.c 20 Mar 2006 11:37:33 -0000 1.8
@@ -1,4 +1,4 @@
-#include "e_mod_main.h"
+#include "e_mod_config.h"
typedef struct _Cfg_File_Data Cfg_File_Data;
@@ -42,7 +42,7 @@
v->advanced.create_widgets = _advanced_create_widgets;
/* Create The Dialog */
- cfd = e_config_dialog_new(con, _("Emu Configuration"), NULL, 0, v, emu);
+ cfd = e_config_dialog_new(con, D_("Emu Configuration"), NULL, 0, v, emu);
emu->config_dialog = cfd;
}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c 1 Mar 2006 15:59:47 -0000 1.10
+++ e_mod_main.c 20 Mar 2006 11:37:33 -0000 1.11
@@ -1,4 +1,3 @@
-#include "e.h"
#include "e_mod_main.h"
static const char *_emu_module_edje = NULL;
@@ -145,8 +144,8 @@
{
/* This is a basic module dialog that is provided for simplicity,
* but there is probably nothing stopping you from making a complex dialog.
*/
- e_module_dialog_show(_("Enlightenment Emu Module - version " VERSION),
- _
+ e_module_dialog_show(D_("Enlightenment Emu Module - version " VERSION),
+ D_
("Experimental generic scriptable module for
E17.<br><br>"
"Keep an eye out for the emu's.<br>"
"Don't even try to run away, they're fast
buggers.<br>"
@@ -168,6 +167,10 @@
{
Emu *emu;
+ /* Set up module's message catalogue */
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
+
emu = E_NEW(Emu, 1);
if (emu)
@@ -299,7 +302,7 @@
ecore_exe_pipe_run(emu_face->command, ECORE_EXE_PIPE_READ |
ECORE_EXE_PIPE_WRITE | ECORE_EXE_PIPE_READ_LINE_BUFFERED
/*| ECORE_EXE_RESPAWN */ , emu_face);
if (!emu_face->exe)
- e_module_dialog_show(_("Enlightenment Emu Module - error"),
_("There is no emu."));
+ e_module_dialog_show(D_("Enlightenment Emu Module - error"),
D_("There is no emu."));
}
}
@@ -644,42 +647,42 @@
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Add face"));
+ e_menu_item_label_set(mi, D_("Add face"));
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Remove face"));
+ e_menu_item_label_set(mi, D_("Remove face"));
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Add row"));
+ e_menu_item_label_set(mi, D_("Add row"));
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Remove row"));
+ e_menu_item_label_set(mi, D_("Remove row"));
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Add column"));
+ e_menu_item_label_set(mi, D_("Add column"));
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Remove column"));
+ e_menu_item_label_set(mi, D_("Remove column"));
mi = e_menu_item_new(menu);
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Transparent"));
+ e_menu_item_label_set(mi, D_("Transparent"));
e_menu_item_check_set(mi, 1);
if (1)
e_menu_item_toggle_set(mi, 1);
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Zoom icons"));
+ e_menu_item_label_set(mi, D_("Zoom icons"));
e_menu_item_check_set(mi, 1);
if (0)
e_menu_item_toggle_set(mi, 1);
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Stretch bar"));
+ e_menu_item_label_set(mi, D_("Stretch bar"));
e_menu_item_check_set(mi, 1);
if (0)
e_menu_item_toggle_set(mi, 1);
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Cling to edge"));
+ e_menu_item_label_set(mi, D_("Cling to edge"));
e_menu_item_check_set(mi, 1);
if (0)
e_menu_item_toggle_set(mi, 1);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/e_mod_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_main.h 12 Mar 2006 16:17:13 -0000 1.6
+++ e_mod_main.h 20 Mar 2006 11:37:33 -0000 1.7
@@ -3,6 +3,8 @@
#include "e_mod_config.h"
#include "config.h"
+#define D_(str) dgettext(PACKAGE, str)
+
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/emu/src/modules/emu/easy_menu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- easy_menu.h 1 Mar 2006 15:59:47 -0000 1.6
+++ easy_menu.h 20 Mar 2006 11:37:33 -0000 1.7
@@ -2,7 +2,7 @@
#else
#ifndef EASY_MENU_H
#define EASY_MENU_H
-#include "e.h"
+#include "e_mod_main.h"
typedef struct _Easy_Menu Easy_Menu;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
