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 :)


SVN revision: 14143
This commit is contained in:
Carsten Haitzler 2005-04-11 20:25:52 +00:00
parent 6f0b2143e5
commit 272ecdcb9d
18 changed files with 968 additions and 142 deletions

View File

@ -1,4 +1,4 @@
SUBDIRS = src data doc
SUBDIRS = src data doc po
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \

View File

@ -7,7 +7,21 @@ echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \
&& echo "Running autoheader..."; autoheader \
&& echo "Running autoconf..."; autoconf \
&& echo "Running libtoolize..."; ( libtoolize --automake || glibtoolize --automake ) \
&& echo "Running automake..."; automake --add-missing --copy --gnu
&& echo "Running automake..."; automake --add-missing --copy --gnu \
&& echo "Generating gettext enlightenment.pot template"; \
xgettext \
-s \
-n \
-C \
-d enlightenment \
-p po \
--copyright-holder="Enlightenment development team" \
--foreign-user \
--msgid-bugs-address="enlightenment-devel@lists.sourceforge.net" \
-k -k_ -kd_ \
--from-code=UTF-8 \
-o enlightenment.pot \
`find . -name "*.[ch]" -print`
### If you want this, uncomment it.
./configure "$@"

View File

@ -81,13 +81,22 @@ dnl Set PACKAGE_DATA_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/share'; then
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", "Package installed data destination")
AC_DEFINE_UNQUOTED(LOCALE_DIR, "${ac_default_prefix}/share/locale", "Locale directory")
else
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination")
AC_DEFINE_UNQUOTED(LOCALE_DIR, "${prefix}/share/locale", "Locale directory")
fi
else
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", "Package installed data destination")
AC_DEFINE_UNQUOTED(LOCALE_DIR, "${datadir}/locale", "Locale directory")
fi
AM_GNU_GETTEXT
AM_GNU_GETTEXT_VERSION(0.12.1)
if test "x$LIBINTL" = "x"; then
LIBINTL="$INTLLIBS"
fi
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
AC_SUBST(dlopen_libs)
@ -153,7 +162,7 @@ AC_ARG_WITH(embryo-config,
embryo_cflags=`$EMBRYO_CONFIG --cflags`
embryo_libs=`$EMBRYO_CONFIG --libs`
e_libs=$evas_libs" "$ecore_libs" "$edje_libs" "$eet_libs" "$embryo_libs" "
e_libs=$evas_libs" "$ecore_libs" "$edje_libs" "$eet_libs" "$embryo_libs" "$LIBINTL" "
e_cflags=$evas_cflags" "$ecore_cflags" "$edje_cflags" "$eet_cflags" "$embryo_cflags" "
AC_SUBST(e_libs)
AC_SUBST(e_cflags)
@ -211,6 +220,7 @@ data/icons/Makefile
data/icons/images/Makefile
data/other/Makefile
doc/Makefile
po/Makefile
enlightenment-config
],[
chmod +x enlightenment-config

26
po/Makefile.am Normal file
View File

@ -0,0 +1,26 @@
MAINTAINERCLEANFILES = Makefile.in
MSGFMT = msgfmt
podir =
po_DATA = \
ja.mo
LANGS = \
ja
install-data-local:
for L in $(LANGS); do \
$(INSTALL_DATA) -D \
$$L.mo $(datadir)/locale/$$L/LC_MESSAGES/$(PACKAGE).mo; \
done
EXTRA_DIST = \
enlightenment.pot \
ja.po
.po.mo:
$(MSGFMT) -f -o $@ $<
clean-local:
rm -f *.mo

360
po/enlightenment.pot Normal file
View File

@ -0,0 +1,360 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2005-04-12 05:16+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/bin/e_int_menus.c:272
msgid "(No Applications)"
msgstr ""
#: src/bin/e_int_menus.c:445
msgid "(No Windows)"
msgstr ""
#: src/bin/e_int_menus.c:521
msgid "(Unused)"
msgstr ""
#: src/bin/e_int_menus.c:102 src/bin/e_int_menus.c:210
msgid "About Enlightenment"
msgstr ""
#: src/bin/e_module.c:381
msgid "About..."
msgstr ""
#: src/bin/e_main.c:361
msgid "Artificially slowing startup so you can see it all."
msgstr ""
#: src/bin/e_gadman.c:526
msgid "Automatic Height"
msgstr ""
#: src/bin/e_gadman.c:483
msgid "Automatic Width"
msgstr ""
#: src/bin/e_gadman.c:509
msgid "Center Horizontally"
msgstr ""
#: src/bin/e_gadman.c:552
msgid "Center Vertically"
msgstr ""
#: src/bin/e_border.c:3213
msgid "Close"
msgstr ""
#: src/bin/e_module.c:396
msgid "Configuration"
msgstr ""
#: src/bin/e_border.c:3281
msgid "Create Icon"
msgstr ""
#: src/bin/e_int_menus.c:77
msgid "Desktops"
msgstr ""
#: src/bin/e_border.c:3255
msgid "Edit Icon"
msgstr ""
#: src/bin/e_int_menus.c:515
msgid "Edit Mode"
msgstr ""
#: src/bin/e_module.c:385
msgid "Enabled"
msgstr ""
#: src/bin/e_gadman.c:563
msgid "End Edit Mode"
msgstr ""
#: src/bin/e_main.c:345
msgid "Enlightenment"
msgstr ""
#: src/bin/e_main.c:330
msgid "Enlightenment IPC setup error!"
msgstr ""
#: src/bin/e_main.c:347
msgid "Enlightenment Starting. Please wait."
msgstr ""
#: src/bin/e_main.c:157
msgid ""
"Enlightenment cannot Initialize Ecore!\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:235
msgid ""
"Enlightenment cannot create directories in your home directory.\n"
"Perhaps you have no home directory or the disk is full?"
msgstr ""
#: src/bin/e_main.c:184
msgid ""
"Enlightenment cannot initialize its X connection.\n"
"Have you set your DISPLAY variable?"
msgstr ""
#: src/bin/e_main.c:223
msgid ""
"Enlightenment cannot initialize the Evas system.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:215
msgid ""
"Enlightenment cannot initialize the IPC system.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:207
msgid ""
"Enlightenment cannot initialize the connections system.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:173
msgid ""
"Enlightenment cannot set up a HUP signal handler.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:167
msgid ""
"Enlightenment cannot set up an exit signal handler.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:272
msgid ""
"Enlightenment cannot set up init screen.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:288
msgid "Enlightenment cannot set up its app system."
msgstr ""
#: src/bin/e_main.c:251
msgid "Enlightenment cannot set up its config system."
msgstr ""
#: src/bin/e_main.c:262
msgid "Enlightenment cannot set up its font system."
msgstr ""
#: src/bin/e_main.c:313
msgid "Enlightenment cannot set up its module system."
msgstr ""
#: src/bin/e_main.c:243
msgid ""
"Enlightenment cannot set up paths for finding files.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:300 src/bin/e_main.c:331
msgid ""
"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."
msgstr ""
#: src/bin/e_main.c:191
msgid ""
"Enlightenment cannot setup xinerama wrapping.\n"
"This should not happen."
msgstr ""
#: src/bin/e_main.c:280
msgid ""
"Enlightenment set up window management for all the screens on your system\n"
"failed. Perhaps another window manager is running?\n"
msgstr ""
#: src/bin/e_error.c:354
msgid "Enlightenment: Error!"
msgstr ""
#: src/bin/e_module.c:98 src/bin/e_module.c:109 src/bin/e_module.c:131
msgid "Error loading Module"
msgstr ""
#: src/bin/e_border.c:3355
msgid ""
"Error starting icon editor\n"
"\n"
"please install e_util_eapp_edit\n"
"or make sure it is in your PATH\n"
msgstr ""
#: src/bin/e_int_menus.c:117
msgid "Exit Enlightement"
msgstr ""
#: src/bin/e_int_menus.c:58
msgid "Favorite Applications"
msgstr ""
#: src/bin/e_gadman.c:541
msgid "Full Screen Height"
msgstr ""
#: src/bin/e_gadman.c:498
msgid "Full Screen Width"
msgstr ""
#: src/bin/e_int_menus.c:93
msgid "Gadgets"
msgstr ""
#: src/bin/e_gadman.c:536
msgid "Half Screen Height"
msgstr ""
#: src/bin/e_gadman.c:493
msgid "Half Screen Width"
msgstr ""
#: src/bin/e_border.c:3354
msgid "Icon Edit Error"
msgstr ""
#: src/bin/e_border.c:3218
msgid "Iconify"
msgstr ""
#: src/bin/e_border.c:3233
msgid "Maximized"
msgstr ""
#: src/bin/e_int_menus.c:69
msgid "Modules"
msgstr ""
#: src/bin/e_main.c:363
msgid "Most features do not work yet, and those that do are buggy."
msgstr ""
#: src/bin/e_int_menus.c:362
msgid "New Column of Desktops"
msgstr ""
#: src/bin/e_int_menus.c:354
msgid "New Row of Desktops"
msgstr ""
#: src/bin/e_main.c:112
#, c-format
msgid ""
"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"
msgstr ""
#: src/bin/e_int_menus.c:366
msgid "Remove Column of Desktops"
msgstr ""
#: src/bin/e_int_menus.c:358
msgid "Remove Row of Desktops"
msgstr ""
#: src/bin/e_int_menus.c:111
msgid "Restart Enlightement"
msgstr ""
#: src/bin/e_border.c:3226
msgid "Shaded"
msgstr ""
#: src/bin/e_border.c:3240
msgid "Sticky"
msgstr ""
#: src/bin/e_module.c:99
#, c-format
msgid ""
"There was an error loading module named: %s\n"
"No module named %s could be found in the\n"
"module search directories\n"
msgstr ""
#: src/bin/e_module.c:110 src/bin/e_module.c:132
#, c-format
msgid ""
"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"
msgstr ""
#: src/bin/e_int_menus.c:211
#, c-format
msgid ""
"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."
msgstr ""
#: src/bin/e_main.c:362
msgid "This is development code, so be warned."
msgstr ""
#: src/bin/e_main.c:322
msgid ""
"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."
msgstr ""
#: src/bin/e_main.c:321
msgid "Welcome to Enlightenment 0.17"
msgstr ""
#: src/bin/e_int_menus.c:85
msgid "Windows"
msgstr ""
#: src/bin/e_init.c:34
#, c-format
msgid "X reports there are no root windows and %i screens!\n"
msgstr ""

360
po/ja.po Normal file
View File

@ -0,0 +1,360 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# FIRST AUTHOR <raster@rasterman.com>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.999\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2005-04-12 05:16+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <raster@rasterman.com>\n"
"Language-Team: LANGUAGE <enlightenment-devel@lists.sourceforge.ne>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/bin/e_int_menus.c:272
msgid "(No Applications)"
msgstr ""
#: src/bin/e_int_menus.c:445
msgid "(No Windows)"
msgstr ""
#: src/bin/e_int_menus.c:521
msgid "(Unused)"
msgstr ""
#: src/bin/e_int_menus.c:102 src/bin/e_int_menus.c:210
msgid "About Enlightenment"
msgstr "悟について"
#: src/bin/e_module.c:381
msgid "About..."
msgstr ""
#: src/bin/e_main.c:361
msgid "Artificially slowing startup so you can see it all."
msgstr "人工に開始従ってあなたを遅らせることはそれをすべて見ることができる。"
#: src/bin/e_gadman.c:526
msgid "Automatic Height"
msgstr ""
#: src/bin/e_gadman.c:483
msgid "Automatic Width"
msgstr ""
#: src/bin/e_gadman.c:509
msgid "Center Horizontally"
msgstr ""
#: src/bin/e_gadman.c:552
msgid "Center Vertically"
msgstr ""
#: src/bin/e_border.c:3213
msgid "Close"
msgstr ""
#: src/bin/e_module.c:396
msgid "Configuration"
msgstr ""
#: src/bin/e_border.c:3281
msgid "Create Icon"
msgstr ""
#: src/bin/e_int_menus.c:77
msgid "Desktops"
msgstr ""
#: src/bin/e_border.c:3255
msgid "Edit Icon"
msgstr ""
#: src/bin/e_int_menus.c:515
msgid "Edit Mode"
msgstr ""
#: src/bin/e_module.c:385
msgid "Enabled"
msgstr ""
#: src/bin/e_gadman.c:563
msgid "End Edit Mode"
msgstr ""
#: src/bin/e_main.c:345
msgid "Enlightenment"
msgstr "悟"
#: src/bin/e_main.c:330
msgid "Enlightenment IPC setup error!"
msgstr ""
#: src/bin/e_main.c:347
msgid "Enlightenment Starting. Please wait."
msgstr "悟は始まっている。ちょっとまってください。"
#: src/bin/e_main.c:157
msgid ""
"Enlightenment cannot Initialize Ecore!\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:235
msgid ""
"Enlightenment cannot create directories in your home directory.\n"
"Perhaps you have no home directory or the disk is full?"
msgstr ""
#: src/bin/e_main.c:184
msgid ""
"Enlightenment cannot initialize its X connection.\n"
"Have you set your DISPLAY variable?"
msgstr ""
#: src/bin/e_main.c:223
msgid ""
"Enlightenment cannot initialize the Evas system.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:215
msgid ""
"Enlightenment cannot initialize the IPC system.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:207
msgid ""
"Enlightenment cannot initialize the connections system.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:173
msgid ""
"Enlightenment cannot set up a HUP signal handler.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:167
msgid ""
"Enlightenment cannot set up an exit signal handler.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:272
msgid ""
"Enlightenment cannot set up init screen.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:288
msgid "Enlightenment cannot set up its app system."
msgstr ""
#: src/bin/e_main.c:251
msgid "Enlightenment cannot set up its config system."
msgstr ""
#: src/bin/e_main.c:262
msgid "Enlightenment cannot set up its font system."
msgstr ""
#: src/bin/e_main.c:313
msgid "Enlightenment cannot set up its module system."
msgstr ""
#: src/bin/e_main.c:243
msgid ""
"Enlightenment cannot set up paths for finding files.\n"
"Perhaps you are out of memory?"
msgstr ""
#: src/bin/e_main.c:300 src/bin/e_main.c:331
msgid ""
"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."
msgstr ""
#: src/bin/e_main.c:191
msgid ""
"Enlightenment cannot setup xinerama wrapping.\n"
"This should not happen."
msgstr ""
#: src/bin/e_main.c:280
msgid ""
"Enlightenment set up window management for all the screens on your system\n"
"failed. Perhaps another window manager is running?\n"
msgstr ""
#: src/bin/e_error.c:354
msgid "Enlightenment: Error!"
msgstr ""
#: src/bin/e_module.c:98 src/bin/e_module.c:109 src/bin/e_module.c:131
msgid "Error loading Module"
msgstr ""
#: src/bin/e_border.c:3355
msgid ""
"Error starting icon editor\n"
"\n"
"please install e_util_eapp_edit\n"
"or make sure it is in your PATH\n"
msgstr ""
#: src/bin/e_int_menus.c:117
msgid "Exit Enlightement"
msgstr "出口の悟"
#: src/bin/e_int_menus.c:58
msgid "Favorite Applications"
msgstr ""
#: src/bin/e_gadman.c:541
msgid "Full Screen Height"
msgstr ""
#: src/bin/e_gadman.c:498
msgid "Full Screen Width"
msgstr ""
#: src/bin/e_int_menus.c:93
msgid "Gadgets"
msgstr ""
#: src/bin/e_gadman.c:536
msgid "Half Screen Height"
msgstr ""
#: src/bin/e_gadman.c:493
msgid "Half Screen Width"
msgstr ""
#: src/bin/e_border.c:3354
msgid "Icon Edit Error"
msgstr ""
#: src/bin/e_border.c:3218
msgid "Iconify"
msgstr ""
#: src/bin/e_border.c:3233
msgid "Maximized"
msgstr ""
#: src/bin/e_int_menus.c:69
msgid "Modules"
msgstr ""
#: src/bin/e_main.c:363
msgid "Most features do not work yet, and those that do are buggy."
msgstr "ほとんどの特徴はまだ働かないし、特徴はバッギである。"
#: src/bin/e_int_menus.c:362
msgid "New Column of Desktops"
msgstr ""
#: src/bin/e_int_menus.c:354
msgid "New Row of Desktops"
msgstr ""
#: src/bin/e_main.c:112
#, c-format
msgid ""
"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"
msgstr ""
#: src/bin/e_int_menus.c:366
msgid "Remove Column of Desktops"
msgstr ""
#: src/bin/e_int_menus.c:358
msgid "Remove Row of Desktops"
msgstr ""
#: src/bin/e_int_menus.c:111
msgid "Restart Enlightement"
msgstr "再始動悟"
#: src/bin/e_border.c:3226
msgid "Shaded"
msgstr ""
#: src/bin/e_border.c:3240
msgid "Sticky"
msgstr ""
#: src/bin/e_module.c:99
#, c-format
msgid ""
"There was an error loading module named: %s\n"
"No module named %s could be found in the\n"
"module search directories\n"
msgstr ""
#: src/bin/e_module.c:110 src/bin/e_module.c:132
#, c-format
msgid ""
"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"
msgstr ""
#: src/bin/e_int_menus.c:211
#, c-format
msgid ""
"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."
msgstr ""
#: src/bin/e_main.c:362
msgid "This is development code, so be warned."
msgstr "これは開発コード、従って警告される。"
#: src/bin/e_main.c:322
msgid ""
"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."
msgstr ""
#: src/bin/e_main.c:321
msgid "Welcome to Enlightenment 0.17"
msgstr ""
#: src/bin/e_int_menus.c:85
msgid "Windows"
msgstr ""
#: src/bin/e_init.c:34
#, c-format
msgid "X reports there are no root windows and %i screens!\n"
msgstr ""

View File

@ -44,7 +44,8 @@ e_xinerama.h \
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_table.c \
e_layout.c \
e_test.c \
e_font.c \
e_intl.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@

View File

@ -3210,12 +3210,12 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y)
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_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y)
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 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y)
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 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y)
"--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 @@ _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi)
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

View File

@ -351,7 +351,7 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
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

View File

@ -480,7 +480,7 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
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_gadman_client_menu_new(E_Gadman_Client *gmc)
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 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
{
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 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
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_gadman_client_menu_new(E_Gadman_Client *gmc)
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 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
{
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_gadman_client_menu_new(E_Gadman_Client *gmc)
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;

View File

@ -34,3 +34,4 @@
#include "e_table.h"
#include "e_layout.h"
#include "e_font.h"
#include "e_intl.h"

View File

@ -31,7 +31,7 @@ e_init_init(void)
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;
}

View File

@ -55,7 +55,7 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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_int_menus_main_new(void)
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_int_menus_main_new(void)
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 @@ _e_int_menus_main_del_hook(void *obj)
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 @@ _e_int_menus_apps_scan(E_Menu *m)
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_int_menus_desktops_pre_cb(void *data, E_Menu *m)
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 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
{
/* 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_int_menus_gadgets_pre_cb(void *data, E_Menu *m)
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);
}
}

26
src/bin/e_intl.c Normal file
View File

@ -0,0 +1,26 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "e.h"
#include "config.h"
/* TODO List:
*/
int
e_intl_init(void)
{
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALE_DIR);
textdomain(PACKAGE);
// XSetLocaleModifiers("");
bind_textdomain_codeset(PACKAGE, "UTF-8");
return 1;
}
int
e_intl_shutdown(void)
{
return 1;
}

20
src/bin/e_intl.h Normal file
View File

@ -0,0 +1,20 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef E_TYPEDEFS
#include <locale.h>
#include <libintl.h>
#define _(str) gettext(str)
#define d_(str, dom) dgettext(PACKAGE dom, str)
#else
#ifndef E_INTL_H
#define E_INTL_H
EAPI int e_intl_init(void);
EAPI int e_intl_shutdown(void);
#endif
#endif

View File

@ -82,6 +82,8 @@ main(int argc, char **argv)
after_restart = 1;
}
putenv("RESTART=1");
e_intl_init();
/* handle some command-line parameters */
for (i = 1; i < argc; i++)
@ -107,16 +109,16 @@ main(int argc, char **argv)
(!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 @@ main(int argc, char **argv)
/* 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 @@ main(int argc, char **argv)
/* 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 @@ main(int argc, char **argv)
/* 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 @@ main(int argc, char **argv)
/* 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 @@ main(int argc, char **argv)
/* 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 @@ main(int argc, char **argv)
/* 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 @@ main(int argc, char **argv)
/* 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 @@ main(int argc, char **argv)
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 @@ main(int argc, char **argv)
/* 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 @@ main(int argc, char **argv)
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 @@ main(int argc, char **argv)
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 @@ main(int argc, char **argv)
}
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 @@ main(int argc, char **argv)
/* 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 @@ _e_main_dirs_init(void)
system(buf);
}
free(homedir);
e_intl_shutdown();
return 1;
}

View File

@ -95,10 +95,10 @@ e_module_new(char *name)
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 @@ e_module_new(char *name)
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 @@ e_module_new(char *name)
(!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 @@ _e_module_control_menu_new(E_Module *mod)
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_module_control_menu_new(E_Module *mod)
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;

View File

@ -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