Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_border.c e_error.c e_gadman.c e_includes.h
e_init.c e_int_menus.c e_main.c e_module.c e_signals.c
Added Files:
e_intl.c e_intl.h
Log Message:
e17 now CAN be translated. i have done a partial japanese translation for
amusement value (it works). we can add .po's for anything else we like :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Makefile.am 2 Apr 2005 16:40:30 -0000 1.20
+++ Makefile.am 11 Apr 2005 20:25:51 -0000 1.21
@@ -44,7 +44,8 @@
e_table.h \
e_layout.h \
e_test.h \
-e_font.h
+e_font.h \
+e_intl.h
enlightenment_SOURCES = \
e_main.c \
@@ -82,6 +83,7 @@
e_layout.c \
e_test.c \
e_font.c \
+e_intl.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- e_border.c 11 Apr 2005 03:36:48 -0000 1.128
+++ e_border.c 11 Apr 2005 20:25:51 -0000 1.129
@@ -3210,12 +3210,12 @@
e_menu_post_deactivate_callback_set(m, _e_border_cb_border_menu_end, NULL);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Close");
+ e_menu_item_label_set(mi, _("Close"));
e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd);
e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/close");
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Iconify");
+ e_menu_item_label_set(mi, _("Iconify"));
e_menu_item_callback_set(mi, _e_border_menu_cb_iconify, bd);
e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/minimize");
@@ -3223,21 +3223,21 @@
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Shaded");
+ e_menu_item_label_set(mi, _("Shaded"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->shaded ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_shade, bd);
e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/shade");
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Maximized");
+ e_menu_item_label_set(mi, _("Maximized"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->maximized ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_maximize, bd);
e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/maximize");
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Sticky");
+ e_menu_item_label_set(mi, _("Sticky"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->sticky ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_stick, bd);
@@ -3252,7 +3252,7 @@
if (a)
{
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Edit Icon");
+ e_menu_item_label_set(mi, _("Edit Icon"));
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, a->path);
e_menu_item_icon_edje_set(mi, a->path, "icon");
}
@@ -3278,7 +3278,7 @@
"--win-class \"%s\" %s/.e/e/applications/all/%s.eapp",
bd->client.icccm.class, homedir, name);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Create Icon");
+ e_menu_item_label_set(mi, _("Create Icon"));
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, buf);
}
@@ -3351,9 +3351,10 @@
printf("EXEC %s\n", full);
process = ecore_exe_run(full, NULL);
if (!process || !ecore_exe_pid_get(process))
- e_error_dialog_show("Icon Edit Error", "Error starting icon editor\n\n \
- please install e_util_eapp_edit\n \
- or make sure it is in your PATH\n");
+ e_error_dialog_show(_("Icon Edit Error"),
+ _("Error starting icon editor\n\n"
+ "please install e_util_eapp_edit\n"
+ "or make sure it is in your PATH\n"));
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_error.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_error.c 31 Mar 2005 15:38:26 -0000 1.13
+++ e_error.c 11 Apr 2005 20:25:51 -0000 1.14
@@ -351,7 +351,7 @@
static void
_e_error_message_show_x(char *txt)
{
- e_error_dialog_show_internal("Enlightenment: Error!", txt);
+ e_error_dialog_show_internal(_("Enlightenment: Error!"), txt);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_gadman.c 5 Apr 2005 14:47:41 -0000 1.28
+++ e_gadman.c 11 Apr 2005 20:25:51 -0000 1.29
@@ -480,7 +480,7 @@
if (gmc->autow > 0)
{
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Automatic Width");
+ e_menu_item_label_set(mi, _("Automatic Width"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, gmc->use_autow);
e_menu_item_icon_edje_set(mi, e_path_find(path_icons,
"default.edj"),
@@ -490,12 +490,12 @@
e_menu_item_separator_set(mi, 1);
}
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Half Screen Width");
+ e_menu_item_label_set(mi, _("Half Screen Width"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"half_width");
e_menu_item_callback_set(mi, _e_gadman_cb_half_width, gmc);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Full Screen Width");
+ e_menu_item_label_set(mi, _("Full Screen Width"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"full_width");
e_menu_item_callback_set(mi, _e_gadman_cb_full_width, gmc);
@@ -506,7 +506,7 @@
{
seperator = 1;
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Center Horizontally");
+ e_menu_item_label_set(mi, _("Center Horizontally"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"center_horiz");
e_menu_item_callback_set(mi, _e_gadman_cb_center_horiz, gmc);
@@ -523,7 +523,7 @@
if (gmc->autoh > 0)
{
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Automatic Height");
+ e_menu_item_label_set(mi, _("Automatic Height"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, gmc->use_autoh);
e_menu_item_icon_edje_set(mi, e_path_find(path_icons,
"default.edj"),
@@ -533,12 +533,12 @@
e_menu_item_separator_set(mi, 1);
}
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Half Screen Height");
+ e_menu_item_label_set(mi, _("Half Screen Height"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"half_height");
e_menu_item_callback_set(mi, _e_gadman_cb_half_height, gmc);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Full Screen Height");
+ e_menu_item_label_set(mi, _("Full Screen Height"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"full_height");
e_menu_item_callback_set(mi, _e_gadman_cb_full_height, gmc);
@@ -549,7 +549,7 @@
{
seperator = 1;
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Center Vertically");
+ e_menu_item_label_set(mi, _("Center Vertically"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"center_vert");
e_menu_item_callback_set(mi, _e_gadman_cb_center_vert, gmc);
@@ -560,7 +560,7 @@
e_menu_item_separator_set(mi, 1);
}
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "End Edit Mode");
+ e_menu_item_label_set(mi, _("End Edit Mode"));
e_menu_item_callback_set(mi, _e_gadman_cb_end_edit_mode, gmc);
return m;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_includes.h 2 Apr 2005 16:40:31 -0000 1.10
+++ e_includes.h 11 Apr 2005 20:25:52 -0000 1.11
@@ -34,3 +34,4 @@
#include "e_table.h"
#include "e_layout.h"
#include "e_font.h"
+#include "e_intl.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_init.c 31 Mar 2005 16:03:33 -0000 1.15
+++ e_init.c 11 Apr 2005 20:25:52 -0000 1.16
@@ -31,7 +31,7 @@
roots = ecore_x_window_root_list(&num);
if ((!roots) || (num <= 0))
{
- e_error_message_show("X reports there are no root windows and %i
screens!\n",
+ e_error_message_show(_("X reports there are no root windows and %i
screens!\n"),
num);
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_int_menus.c 31 Mar 2005 04:26:55 -0000 1.42
+++ e_int_menus.c 11 Apr 2005 20:25:52 -0000 1.43
@@ -55,7 +55,7 @@
subm = e_int_menus_favorite_apps_new();
dat->apps = subm;
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Favorite Applications");
+ e_menu_item_label_set(mi, _("Favorite Applications"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"favorites");
e_menu_item_submenu_set(mi, subm);
@@ -66,7 +66,7 @@
subm = e_module_menu_new();
dat->modules = subm;
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Modules");
+ e_menu_item_label_set(mi, _("Modules"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"module");
e_menu_item_submenu_set(mi, subm);
@@ -74,7 +74,7 @@
subm = e_int_menus_desktops_new();
dat->desktops = subm;
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Desktops");
+ e_menu_item_label_set(mi, _("Desktops"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"desktops");
e_menu_item_submenu_set(mi, subm);
@@ -82,7 +82,7 @@
subm = e_int_menus_clients_new();
dat->clients = subm;
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Windows");
+ e_menu_item_label_set(mi, _("Windows"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"windows");
e_menu_item_submenu_set(mi, subm);
@@ -90,7 +90,7 @@
subm = e_int_menus_gadgets_new();
dat->gadgets = subm;
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Gadgets");
+ e_menu_item_label_set(mi, _("Gadgets"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"gadgets");
e_menu_item_submenu_set(mi, subm);
@@ -99,7 +99,7 @@
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "About Enlightenment");
+ e_menu_item_label_set(mi, _("About Enlightenment"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"e");
e_menu_item_callback_set(mi, _e_int_menus_main_about, NULL);
@@ -108,13 +108,13 @@
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Restart Enlightement");
+ e_menu_item_label_set(mi, _("Restart Enlightement"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"reset");
e_menu_item_callback_set(mi, _e_int_menus_main_restart, NULL);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Exit Enlightement");
+ e_menu_item_label_set(mi, _("Exit Enlightement"));
e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"power");
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
@@ -207,12 +207,13 @@
static void
_e_int_menus_main_about(void *data, E_Menu *m, E_Menu_Item *mi)
{
- e_error_dialog_show("About Enlightenment",
- "This is Enlightenment "VERSION".\n"
- "Copyright © 1999-2004, by the Enlightenment Dev
Team.\n"
- "\n"
- "We hope you enjoy using this software as much as we
enjoyed writing it.\n\n"
- "Please think of the aardvarks. They need some love too."
+ e_error_dialog_show(_("About Enlightenment"),
+ _("This is Enlightenment %s.\n"
+ "Copyright © 1999-2004, by the Enlightenment Dev
Team.\n"
+ "\n"
+ "We hope you enjoy using this software as much as we
enjoyed writing it.\n\n"
+ "Please think of the aardvarks. They need some love
too."),
+ VERSION
);
}
@@ -268,7 +269,7 @@
if (app_count == 0)
{
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "(No Applications)");
+ e_menu_item_label_set(mi, _("(No Applications)"));
}
}
@@ -350,19 +351,19 @@
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "New Row of Desktops");
+ e_menu_item_label_set(mi, _("New Row of Desktops"));
e_menu_item_callback_set(mi, _e_int_menus_desktops_row_add_cb, NULL);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Remove Row of Desktops");
+ e_menu_item_label_set(mi, _("Remove Row of Desktops"));
e_menu_item_callback_set(mi, _e_int_menus_desktops_row_del_cb, NULL);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "New Column of Desktops");
+ e_menu_item_label_set(mi, _("New Column of Desktops"));
e_menu_item_callback_set(mi, _e_int_menus_desktops_col_add_cb, NULL);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Remove Column of Desktops");
+ e_menu_item_label_set(mi, _("Remove Column of Desktops"));
e_menu_item_callback_set(mi, _e_int_menus_desktops_col_del_cb, NULL);
}
@@ -441,7 +442,7 @@
{
/* FIXME here we want nothing, but that crashes!!! */
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "(No Windows)");
+ e_menu_item_label_set(mi, _("(No Windows)"));
return;
}
for (l = borders; l; l = l->next)
@@ -511,13 +512,13 @@
e_menu_item_toggle_set(mi, 1);
else
e_menu_item_toggle_set(mi, 0);
- e_menu_item_label_set(mi, "Edit Mode");
+ e_menu_item_label_set(mi, _("Edit Mode"));
e_menu_item_callback_set(mi, _e_int_menus_gadgets_edit_mode_cb,
root->zone->container->gadman);
}
else
{
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "(Unused)");
+ e_menu_item_label_set(mi, _("(Unused)"));
e_menu_item_callback_set(mi, NULL, NULL);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- e_main.c 2 Apr 2005 16:40:37 -0000 1.59
+++ e_main.c 11 Apr 2005 20:25:52 -0000 1.60
@@ -82,6 +82,8 @@
after_restart = 1;
}
putenv("RESTART=1");
+
+ e_intl_init();
/* handle some command-line parameters */
for (i = 1; i < argc; i++)
@@ -107,16 +109,16 @@
(!strcmp(argv[i], "--help")))
{
printf
- ("Options:\n"
- "\t-display DISPLAY\n"
- "\t\tConnect to display named DISPLAY.\n"
- "\t\tEG: -display :1.0\n"
- "\t-fake-xinerama-screen WxH+X+Y\n"
- "\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
- "\t\tgiven the geometry. Add as many as you like. They all\n"
- "\t\treplace the real xinerama screens, if any. This can\n"
- "\t\tbe used to simulate xinerama.\n"
- "\t\tEG: -fake-xinerama-screen 800x600+0+0
-fake-xinerama-screen 800x600+800+0\n"
+ (_("Options:\n"
+ "\t-display DISPLAY\n"
+ "\t\tConnect to display named DISPLAY.\n"
+ "\t\tEG: -display :1.0\n"
+ "\t-fake-xinerama-screen WxH+X+Y\n"
+ "\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+ "\t\tgiven the geometry. Add as many as you like. They all\n"
+ "\t\treplace the real xinerama screens, if any. This can\n"
+ "\t\tbe used to simulate xinerama.\n"
+ "\t\tEG: -fake-xinerama-screen 800x600+0+0
-fake-xinerama-screen 800x600+800+0\n")
);
exit(0);
}
@@ -152,8 +154,8 @@
/* basic ecore init */
if (!ecore_init())
{
- e_error_message_show("Enlightenment cannot Initialize Ecore!\n"
- "Perhaps you are out of memory?");
+ e_error_message_show(_("Enlightenment cannot Initialize Ecore!\n"
+ "Perhaps you are out of memory?"));
exit(-1);
}
_e_main_shutdown_push(ecore_shutdown);
@@ -162,14 +164,14 @@
/* setup a handler for when e is asked to exit via a system signal */
if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT,
_e_main_cb_signal_exit, NULL))
{
- e_error_message_show("Enlightenment cannot set up an exit signal
handler.\n"
- "Perhaps you are out of memory?");
+ e_error_message_show(_("Enlightenment cannot set up an exit signal
handler.\n"
+ "Perhaps you are out of memory?"));
_e_main_shutdown(-1);
}
if(!ecore_event_handler_add(ECORE_EVENT_SIGNAL_HUP, _e_main_cb_signal_hup,
NULL))
{
- e_error_message_show("Enlightenment cannot set up a HUP signal
handler.\n"
- "Perhaps you are out of memory?");
+ e_error_message_show(_("Enlightenment cannot set up a HUP signal
handler.\n"
+ "Perhaps you are out of memory?"));
_e_main_shutdown(-1);
}
@@ -179,15 +181,15 @@
/* init x */
if (!ecore_x_init(NULL))
{
- e_error_message_show("Enlightenment cannot initialize its X
connection.\n"
- "Have you set your DISPLAY variable?");
+ e_error_message_show(_("Enlightenment cannot initialize its X
connection.\n"
+ "Have you set your DISPLAY variable?"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_x_shutdown);
if (!e_xinerama_init())
{
- e_error_message_show("Enlightenment cannot setup xinerama wrapping.\n"
- "This should not happen.");
+ e_error_message_show(_("Enlightenment cannot setup xinerama wrapping.\n"
+ "This should not happen."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_xinerama_shutdown);
@@ -202,24 +204,24 @@
/* init generic communications */
if (!ecore_con_init())
{
- e_error_message_show("Enlightenment cannot initialize the connections
system.\n"
- "Perhaps you are out of memory?");
+ e_error_message_show(_("Enlightenment cannot initialize the connections
system.\n"
+ "Perhaps you are out of memory?"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(ecore_con_shutdown);
/* init ipc */
if (!ecore_ipc_init())
{
- e_error_message_show("Enlightenment cannot initialize the ipc system.\n"
- "Perhaps you are out of memory?");
+ e_error_message_show(_("Enlightenment cannot initialize the IPC
system.\n"
+ "Perhaps you are out of memory?"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(ecore_ipc_shutdown);
/* init the evas wrapper */
if (!ecore_evas_init())
{
- e_error_message_show("Enlightenment cannot initialize the evas
system.\n"
- "Perhaps you are out of memory?");
+ e_error_message_show(_("Enlightenment cannot initialize the Evas
system.\n"
+ "Perhaps you are out of memory?"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(ecore_evas_shutdown);
@@ -230,23 +232,23 @@
/* setup directories we will be using for configurations sotrage etc. */
if (!_e_main_dirs_init())
{
- e_error_message_show("Enlightenment cannot create directories in your
home directory.\n"
- "Perhaps you have no home directory or the disk is
full?");
+ e_error_message_show(_("Enlightenment cannot create directories in your
home directory.\n"
+ "Perhaps you have no home directory or the disk
is full?"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_dirs_shutdown);
/* setup paths for finding things */
if (!_e_main_path_init())
{
- e_error_message_show("Enlightenment cannot set up paths for finding
files.\n"
- "Perhaps you are out of memory?");
+ e_error_message_show(_("Enlightenment cannot set up paths for finding
files.\n"
+ "Perhaps you are out of memory?"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_path_shutdown);
/* init config system */
if (!e_config_init())
{
- e_error_message_show("Enlightenment cannot set up its config system.");
+ e_error_message_show(_("Enlightenment cannot set up its config
system."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_config_shutdown);
@@ -257,7 +259,7 @@
/* init font system */
if (!e_font_init())
{
- e_error_message_show("Enlightenment cannot set up its font system.");
+ e_error_message_show(_("Enlightenment cannot set up its font system."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_font_shutdown);
@@ -267,23 +269,23 @@
/* setup init status window/screen */
if (!e_init_init())
{
- e_error_message_show("Enlightenment cannot set up init screen.\n"
- "Perhaps you are out of memory?");
+ e_error_message_show(_("Enlightenment cannot set up init screen.\n"
+ "Perhaps you are out of memory?"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_init_shutdown);
/* manage the root window */
if (!_e_main_screens_init())
{
- e_error_message_show("Enlightenment set up window management for all
the screens on your system\n"
- "failed. Perhaps another window manager is
running?\n");
+ e_error_message_show(_("Enlightenment set up window management for all
the screens on your system\n"
+ "failed. Perhaps another window manager is
running?\n"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_screens_shutdown);
/* init app system */
if (!e_app_init())
{
- e_error_message_show("Enlightenment cannot set up its app system.");
+ e_error_message_show(_("Enlightenment cannot set up its app system."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_app_shutdown);
@@ -295,11 +297,11 @@
if (!_e_main_ipc_init())
{
e_error_message_show(
- "Enlightenment cannot set up the IPC socket.\n"
- "It likely is already in use by an exisiting copy
of Enlightenment.\n"
- "Double check to see if Enlightenment is not
already on this display,\n"
- "but if that fails try deleting all files in
~/.ecore/enlightenment-*\n"
- "and try running again.");
+ _("Enlightenment cannot set up the IPC socket.\n"
+ "It likely is already in use by an exisiting
copy of Enlightenment.\n"
+ "Double check to see if Enlightenment is not
already on this display,\n"
+ "but if that fails try deleting all files in
~/.ecore/enlightenment-*\n"
+ "and try running again."));
ipc_failed = 1;
}
else
@@ -308,7 +310,7 @@
/* setup module loading etc */
if (!e_module_init())
{
- e_error_message_show("Enlightenment cannot set up its module system.");
+ e_error_message_show(_("Enlightenment cannot set up its module
system."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_module_shutdown);
@@ -316,21 +318,21 @@
if (!nowelcome)
{
/* explicitly show a gui dialog */
- e_error_dialog_show("Welcome to Enlightenment 0.17",
- "This is program has barely been started on, so it
is not complete by a long\n"
- "shot. Please do NOT expect anything to work
properly at this stage. It's\n"
- "being worked on.\n"
- "\n"
- "Hit \"OK\" to dismiss this dialog and continue
using Enlightenment 0.17.");
+ e_error_dialog_show(_("Welcome to Enlightenment 0.17"),
+ _("This is program has barely been started on, so
it is not complete by a long\n"
+ "shot. Please do NOT expect anything to work
properly at this stage. It's\n"
+ "being worked on.\n"
+ "\n"
+ "Hit \"OK\" to dismiss this dialog and continue
using Enlightenment 0.17."));
}
if (ipc_failed)
- e_error_dialog_show("Enlightenment IPC setup error!",
- "Enlightenment cannot set up the IPC socket.\n"
- "It likely is already in use by an exisiting copy of
Enlightenment.\n"
- "Double check to see if Enlightenment is not already
on this display,\n"
- "but if that fails try deleting all files in
~/.ecore/enlightenment-*\n"
- "and try running again.");
+ e_error_dialog_show(_("Enlightenment IPC setup error!"),
+ _("Enlightenment cannot set up the IPC socket.\n"
+ "It likely is already in use by an exisiting copy of
Enlightenment.\n"
+ "Double check to see if Enlightenment is not already
on this display,\n"
+ "but if that fails try deleting all files in
~/.ecore/enlightenment-*\n"
+ "and try running again."));
/* add in a handler that just before we go idle we flush x */
_e_main_idle_enterer_flusher = ecore_idle_enterer_add(_e_main_cb_x_flusher,
NULL);
@@ -340,9 +342,9 @@
ecore_x_ungrab();
- e_init_title_set("Enlightenment");
+ e_init_title_set(_("Enlightenment"));
e_init_version_set(VERSION);
- e_init_status_set("Enlightenment Starting. Please wait.");
+ e_init_status_set(_("Enlightenment Starting. Please wait."));
if (!nostartup)
{
@@ -356,9 +358,9 @@
}
else
{
- ecore_timer_add( 3.0, _e_main_cb_startup_fake_status, "Artificially
slowing startup so you can see it all.");
- ecore_timer_add( 7.5, _e_main_cb_startup_fake_status, "This is
development code, so be warned.");
- ecore_timer_add(12.0, _e_main_cb_startup_fake_status, "Most features do
not work yet, and those that do are buggy.");
+ ecore_timer_add( 3.0, _e_main_cb_startup_fake_status, _("Artificially
slowing startup so you can see it all."));
+ ecore_timer_add( 7.5, _e_main_cb_startup_fake_status, _("This is
development code, so be warned."));
+ ecore_timer_add(12.0, _e_main_cb_startup_fake_status, _("Most features
do not work yet, and those that do are buggy."));
ecore_timer_add(16.0, _e_main_cb_startup_fake_end, NULL);
}
@@ -379,9 +381,7 @@
/* if we were flagged to restart, then restart. */
if (restart)
{
- printf("Restart...\n");
ecore_app_restart();
- printf("eh? restart failed!\n");
}
/* just return 0 to keep the compiler quiet */
@@ -517,6 +517,8 @@
system(buf);
}
free(homedir);
+
+ e_intl_shutdown();
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_module.c 30 Mar 2005 13:49:09 -0000 1.21
+++ e_module.c 11 Apr 2005 20:25:52 -0000 1.22
@@ -95,10 +95,10 @@
modpath = name;
if (!modpath)
{
- e_error_dialog_show("Error loading Module",
- "There was an error loading module named: %s\n"
- "No module named %s could be found in the\n"
- "module search directories\n",
+ e_error_dialog_show(_("Error loading Module"),
+ _("There was an error loading module named: %s\n"
+ "No module named %s could be found in the\n"
+ "module search directories\n"),
name, buf);
free(m);
return NULL;
@@ -106,12 +106,12 @@
m->handle = dlopen(modpath, RTLD_NOW | RTLD_LOCAL);
if (!m->handle)
{
- e_error_dialog_show("Error loading Module",
- "There was an error loading module named: %s\n"
- "The full path to this module is:\n"
- "%s\n"
- "The error reported was:\n"
- "%s",
+ e_error_dialog_show(_("Error loading Module"),
+ _("There was an error loading module named: %s\n"
+ "The full path to this module is:\n"
+ "%s\n"
+ "The error reported was:\n"
+ "%s"),
name, buf, dlerror());
free(m);
return NULL;
@@ -128,12 +128,12 @@
(!m->func.about)
)
{
- e_error_dialog_show("Error loading Module",
- "There was an error loading module named: %s\n"
- "The full path to this module is:\n"
- "%s\n"
- "The error reported was:\n"
- "%s",
+ e_error_dialog_show(_("Error loading Module"),
+ _("There was an error loading module named: %s\n"
+ "The full path to this module is:\n"
+ "%s\n"
+ "The error reported was:\n"
+ "%s"),
name, buf, dlerror());
dlclose(m->handle);
free(m);
@@ -378,11 +378,11 @@
m = e_menu_new();
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "About...");
+ e_menu_item_label_set(mi, _("About..."));
e_menu_item_callback_set(mi, _e_module_control_menu_about, mod);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Enabled");
+ e_menu_item_label_set(mi, _("Enabled"));
e_menu_item_check_set(mi, 1);
if (mod->enabled) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _e_module_control_menu_enabled, mod);
@@ -393,7 +393,7 @@
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, "Configuration");
+ e_menu_item_label_set(mi, _("Configuration"));
e_menu_item_submenu_set(mi, mod->config_menu);
}
return m;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_signals.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_signals.c 2 Apr 2005 16:11:04 -0000 1.5
+++ e_signals.c 11 Apr 2005 20:25:52 -0000 1.6
@@ -12,21 +12,24 @@
/* a tricky little devil, requires e and it's libs to be built
* with the -rdynamic flag to GCC for any sort of decent output.
*/
-void e_sigseg_act(int x, siginfo_t *info, void *data){
-
- void *array[255];
- size_t size;
- write(2, "**** SEGMENTATION FAULT ****\n", 29);
- write(2, "**** Printing Backtrace... *****\n\n", 34);
- size = backtrace(array, 255);
- backtrace_symbols_fd(array, size, 2);
- exit(-11);
+void
+e_sigseg_act(int x, siginfo_t *info, void *data)
+{
+ void *array[255];
+ size_t size;
+
+ write(2, "**** SEGMENTATION FAULT ****\n", 29);
+ write(2, "**** Printing Backtrace... *****\n\n", 34);
+ size = backtrace(array, 255);
+ backtrace_symbols_fd(array, size, 2);
+ exit(-11);
}
#else
-void e_sigseg_act(int x, siginfo_t *info, void *data){
- write(2, "**** SEGMENTATION FAULT ****\n", 29);
- write(2, "**** Backtrace disabled... *****\n\n", 34);
- exit(-11);
+void e_sigseg_act(int x, siginfo_t *info, void *data)
+{
+ write(2, "**** SEGMENTATION FAULT ****\n", 29);
+ write(2, "**** Backtrace disabled... *****\n\n", 34);
+ exit(-11);
}
#endif
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
