Enlightenment CVS committal
Author : pfritz
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto.h ephoto_slideshow.c ephoto_viewer.c
Log Message:
some NLS work:
- use sgettext in menus
- use _(), N_() and S_() macros instead of functions
- update german translation
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- ephoto.c 16 Oct 2006 01:26:38 -0000 1.90
+++ ephoto.c 16 Oct 2006 12:30:33 -0000 1.91
@@ -47,7 +47,7 @@
ewl_widget_show(menubar);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), gettext("File"));
+ ewl_button_label_set(EWL_BUTTON(menu), S_("Menu|File"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -55,7 +55,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/exit.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Exit"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|File|Exit"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_cb, NULL);
@@ -63,7 +63,7 @@
ewl_widget_show(menu_item);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), gettext("Albums"));
+ ewl_button_label_set(EWL_BUTTON(menu), S_("Menu|Albums"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -71,7 +71,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/add.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Add Album"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Albums|Add Album"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
@@ -80,14 +80,14 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/remove.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Remove Album"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Albums|Remove Album"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
ewl_widget_show(menu_item);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), gettext("Viewer"));
+ ewl_button_label_set(EWL_BUTTON(menu), S_("Menu|Viewer"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -95,7 +95,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/emblem-photos.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Image Viewer"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Viewer|Image Viewer"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, view_images, NULL);
@@ -103,7 +103,7 @@
ewl_widget_show(menu_item);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), gettext("Slideshow"));
+ ewl_button_label_set(EWL_BUTTON(menu), S_("Menu|Slideshow"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -111,7 +111,8 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/preferences-system.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Configure Slideshow"));
+ ewl_button_label_set(EWL_BUTTON(menu_item),
+ S_("Menu|Slideshow|Configure Slideshow"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, create_slideshow_config,
NULL);
@@ -121,7 +122,8 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/x-office-presentation.png",
NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Start Slideshow"));
+ ewl_button_label_set(EWL_BUTTON(menu_item),
+ S_("Menu|Slideshow|Start Slideshow"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, start_slideshow, NULL);
@@ -162,7 +164,7 @@
ewl_widget_show(image);
text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), gettext(" Location:"));
+ ewl_text_text_set(EWL_TEXT(text), _(" Location:"));
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_object_maximum_size_set(EWL_OBJECT(text), 66, 15);
ewl_container_child_append(EWL_CONTAINER(hbox), text);
@@ -208,7 +210,7 @@
ewl_widget_show(hseparator);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), gettext("Albums"));
+ ewl_border_text_set(EWL_BORDER(border), _("Albums"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(vbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
@@ -249,3 +251,17 @@
ewl_main();
return 0;
}
+
+/*
+ * this function returns the translation of a "Menu|Foo|Blah" formated string
+ * or if there does not exist a translation, it simply returns "Blah"
+ */
+char *
+sgettext(const char *msgid)
+{
+ char *msgval = gettext(msgid);
+ if (msgval == msgid)
+ msgval = strrchr(msgid, '|') + 1;
+ return msgval;
+}
+
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ephoto.h 6 Oct 2006 02:22:53 -0000 1.42
+++ ephoto.h 16 Oct 2006 12:30:33 -0000 1.43
@@ -13,8 +13,21 @@
#include "config.h"
/* NLS */
-#include <libintl.h>
-#include <locale.h>
+#ifdef ENABLE_NLS
+# include <libintl.h>
+# include <locale.h>
+# define _(str) gettext(str)
+# define gettext_noop(str) str
+# define N_(str) gettext_noop(str)
+#else
+# define _(str) (str)
+# define gettext_noop(str) str
+# define N_(str) gettext_noop(str)
+# define gettext(str) ((char*) (str))
+#endif
+
+char *sgettext(const char *s);
+#define S_(str) sgettext(str)
void destroy_cb(Ewl_Widget *w, void *event, void *data);
void populate_browser(Ewl_Widget *w, void *event, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ephoto_slideshow.c 6 Oct 2006 21:50:02 -0000 1.19
+++ ephoto_slideshow.c 16 Oct 2006 12:30:33 -0000 1.20
@@ -112,7 +112,7 @@
srand((unsigned int)time((time_t *)NULL));
window = ewl_window_new();
- ewl_window_title_set(EWL_WINDOW(window), gettext("Ephoto Slideshow"));
+ ewl_window_title_set(EWL_WINDOW(window), _("Ephoto Slideshow"));
ewl_window_name_set(EWL_WINDOW(window), "Ephoto Slideshow");
if (sc->full_size)
ewl_window_fullscreen_set(EWL_WINDOW(window), 1);
@@ -326,7 +326,7 @@
sc = parse_slideshow_config();
sc->win = ewl_window_new();
- ewl_window_title_set(EWL_WINDOW(sc->win), gettext("Slideshow Configuration"));
+ ewl_window_title_set(EWL_WINDOW(sc->win), _("Slideshow Configuration"));
ewl_window_name_set(EWL_WINDOW(sc->win), "Slideshow Configuration");
ewl_window_dialog_set(EWL_WINDOW(sc->win), 1);
ewl_object_size_request(EWL_OBJECT(sc->win), 400, 200);
@@ -345,7 +345,7 @@
ewl_widget_show(main_hbox);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), gettext("Window Size"));
+ ewl_border_text_set(EWL_BORDER(border), _("Window Size"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(main_hbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
@@ -358,7 +358,7 @@
ewl_widget_show(hbox);
sc->fullscreen = ewl_radiobutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->fullscreen), gettext("Fullscreen"));
+ ewl_button_label_set(EWL_BUTTON(sc->fullscreen), _("Fullscreen"));
ewl_container_child_append(EWL_CONTAINER(hbox), sc->fullscreen);
ewl_radiobutton_checked_set(EWL_RADIOBUTTON(sc->fullscreen), sc->full_size);
ewl_object_alignment_set(EWL_OBJECT(sc->fullscreen), EWL_FLAG_ALIGN_LEFT);
@@ -366,7 +366,7 @@
ewl_widget_show(sc->fullscreen);
sc->custom = ewl_radiobutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->custom), gettext("Custom"));
+ ewl_button_label_set(EWL_BUTTON(sc->custom), _("Custom"));
ewl_container_child_append(EWL_CONTAINER(hbox), sc->custom);
ewl_radiobutton_checked_set(EWL_RADIOBUTTON(sc->custom), sc->custom_size);
ewl_radiobutton_chain_set(EWL_RADIOBUTTON(sc->fullscreen),
@@ -381,7 +381,7 @@
ewl_widget_show(hbox);
text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), gettext("Width"));
+ ewl_text_text_set(EWL_TEXT(text), _("Width"));
ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), text);
@@ -395,7 +395,7 @@
ewl_widget_show(sc->wentry);
text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), gettext("Height"));
+ ewl_text_text_set(EWL_TEXT(text), _("Height"));
ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), text);
@@ -409,21 +409,21 @@
ewl_widget_show(sc->hentry);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), gettext("Order"));
+ ewl_border_text_set(EWL_BORDER(border), _("Order"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(main_hbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(border);
sc->loop = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->loop), gettext("Loop Slideshow"));
+ ewl_button_label_set(EWL_BUTTON(sc->loop), _("Loop Slideshow"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->loop), sc->loop_slide);
ewl_container_child_append(EWL_CONTAINER(border), sc->loop);
ewl_object_alignment_set(EWL_OBJECT(sc->loop), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(sc->loop);
sc->random = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->random), gettext("Random Order"));
+ ewl_button_label_set(EWL_BUTTON(sc->random), _("Random Order"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->random), sc->random_order);
ewl_container_child_append(EWL_CONTAINER(border), sc->random);
ewl_object_alignment_set(EWL_OBJECT(sc->random), EWL_FLAG_ALIGN_CENTER);
@@ -436,28 +436,28 @@
ewl_widget_show(hbox);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), gettext("Image Size"));
+ ewl_border_text_set(EWL_BORDER(border), _("Image Size"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(border);
sc->zoom_image = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->zoom_image), gettext("Zoom Images to Fill
Window"));
+ ewl_button_label_set(EWL_BUTTON(sc->zoom_image), _("Zoom Images to Fill
Window"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->zoom_image), sc->zoom);
ewl_container_child_append(EWL_CONTAINER(border), sc->zoom_image);
ewl_object_alignment_set(EWL_OBJECT(sc->zoom_image), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(sc->zoom_image);
sc->aspect_image = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->aspect_image), gettext("Keep Aspect"));
+ ewl_button_label_set(EWL_BUTTON(sc->aspect_image), _("Keep Aspect"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->aspect_image),
sc->keep_aspect);
ewl_container_child_append(EWL_CONTAINER(border), sc->aspect_image);
ewl_object_alignment_set(EWL_OBJECT(sc->aspect_image), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(sc->aspect_image);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), gettext("Transitions"));
+ ewl_border_text_set(EWL_BORDER(border), _("Transitions"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
@@ -475,7 +475,7 @@
ewl_widget_show(sc->spinner);
sc->show_name = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->show_name), gettext("Show File Name On
Change"));
+ ewl_button_label_set(EWL_BUTTON(sc->show_name), _("Show File Name On
Change"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->show_name), sc->name_show);
ewl_container_child_append(EWL_CONTAINER(border), sc->show_name);
ewl_object_alignment_set(EWL_OBJECT(sc->show_name), EWL_FLAG_ALIGN_CENTER);
@@ -490,7 +490,7 @@
save = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(save),
PACKAGE_DATA_DIR "/images/stock_save.png", NULL);
- ewl_button_label_set(EWL_BUTTON(save), gettext("save"));
+ ewl_button_label_set(EWL_BUTTON(save), _("save"));
ewl_container_child_append(EWL_CONTAINER(hbox), save);
ewl_object_fill_policy_set(EWL_OBJECT(save), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(save), EWL_FLAG_ALIGN_CENTER);
@@ -500,7 +500,7 @@
cancel = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(cancel),
PACKAGE_DATA_DIR "/images/dialog-close.png", NULL);
- ewl_button_label_set(EWL_BUTTON(cancel), gettext("cancel"));
+ ewl_button_label_set(EWL_BUTTON(cancel), _("cancel"));
ewl_container_child_append(EWL_CONTAINER(hbox), cancel);
ewl_object_fill_policy_set(EWL_OBJECT(cancel), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(cancel), EWL_FLAG_ALIGN_CENTER);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ephoto_viewer.c 9 Oct 2006 03:22:36 -0000 1.21
+++ ephoto_viewer.c 16 Oct 2006 12:30:33 -0000 1.22
@@ -232,7 +232,7 @@
}
}
vwin = ewl_window_new();
- ewl_window_title_set(EWL_WINDOW(vwin), gettext("Ephoto Image Viewer"));
+ ewl_window_title_set(EWL_WINDOW(vwin), _("Ephoto Image Viewer"));
ewl_window_name_set(EWL_WINDOW(vwin), "Ephoto Image Viewer");
ewl_object_size_request(EWL_OBJECT(vwin), 480, 480);
ewl_callback_append(vwin, EWL_CALLBACK_DELETE_WINDOW, destroy_vwin, vwin);
@@ -250,7 +250,7 @@
ewl_widget_show(menubar);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), gettext("File"));
+ ewl_button_label_set(EWL_BUTTON(menu), S_("Menu|File"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -258,7 +258,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/stock_save.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Save Image"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|File|Save Image"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
//ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_vwin, NULL);
@@ -268,7 +268,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/exit.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Exit"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|File|Exit"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_vwin, vwin);
@@ -276,7 +276,7 @@
ewl_widget_show(menu_item);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), gettext("Actions"));
+ ewl_button_label_set(EWL_BUTTON(menu), S_("Menu|Actions"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -284,7 +284,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom In"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Actions|Zoom In"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, zoom_in, NULL);
@@ -294,7 +294,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom Out"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Actions|Zoom Out"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, zoom_out, NULL);
@@ -304,7 +304,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom To Fit"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Actions|Zoom To Fit"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, zoom_fit, NULL);
@@ -314,7 +314,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom 1:1"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Actions|Zoom 1:1"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, original_size, NULL);
@@ -324,7 +324,8 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/go-next.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Flip Horizontally"));
+ ewl_button_label_set(EWL_BUTTON(menu_item),
+ S_("Menu|Actions|Flip Horizontally"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, flip_horizontal, NULL);
@@ -334,7 +335,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/go-down.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Flip Vertically"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Actions|Flip
Vertically"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, flip_vertical, NULL);
@@ -344,7 +345,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/undo.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Rotate Left"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Actions|Rotate Left"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, rotate_left, NULL);
@@ -354,7 +355,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/redo.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Rotate Right"));
+ ewl_button_label_set(EWL_BUTTON(menu_item), S_("Menu|Actions|Rotate Right"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, rotate_right, NULL);
@@ -396,7 +397,7 @@
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(button), gettext("In"));
+ ewl_button_label_set(EWL_BUTTON(button), _("In"));
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
@@ -406,7 +407,7 @@
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(button), gettext("Out"));
+ ewl_button_label_set(EWL_BUTTON(button), _("Out"));
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
@@ -436,7 +437,7 @@
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/undo.png", NULL);
- ewl_button_label_set(EWL_BUTTON(button), gettext("Left"));
+ ewl_button_label_set(EWL_BUTTON(button), _("Left"));
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
@@ -446,7 +447,7 @@
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/redo.png", NULL);
- ewl_button_label_set(EWL_BUTTON(button), gettext("Right"));
+ ewl_button_label_set(EWL_BUTTON(button), _("Right"));
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
