Hello !
Patches for tonight :
>e_border_menu_hide_stacking_maximize.patch: don't show «Stacking» and
«Maximize» entries in border menu when anyway submenu will not be shown
>ecore_codepage_i18n.patch: strangely, even if manual says so, XLookupString
doesn't always return iso8859-1 strings, i have utf-8 strings
(LC_ALL=en_US.UTF-8). Don't know if it's correct, needs testing (tested
with utf-8, iso8859-1, iso8859-15 locales, but don't know for others)
>e_various_typos.patch: corrects some typos ("Ok"→"OK" for consistency,
"singal"→"signal"…)
Cheers !
ilLogict
Index: src/bin/e_int_border_menu.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.13
diff -u -r1.13 e_int_border_menu.c
--- src/bin/e_int_border_menu.c 3 Feb 2006 06:16:25 -0000 1.13
+++ src/bin/e_int_border_menu.c 6 Feb 2006 21:44:12 -0000
@@ -32,15 +32,16 @@
E_Menu_Item *mi;
if (bd->border_menu) return;
-
- m = e_menu_new();
- e_menu_category_set(m,"border/stacking");
- e_menu_category_data_set("border/stacking",bd);
- bd->border_stacking_menu = m;
+
/* Only allow to change layer for windows in "normal" layers */
if ((!bd->lock_user_stacking) &&
((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150)))
{
+ m = e_menu_new();
+ e_menu_category_set(m,"border/stacking");
+ e_menu_category_data_set("border/stacking",bd);
+ bd->border_stacking_menu = m;
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always On Top"));
e_menu_item_radio_set(mi, 1);
@@ -51,6 +52,7 @@
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_on_top"),
"widgets/border/default/stack_on_top");
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Normal"));
e_menu_item_radio_set(mi, 1);
@@ -61,6 +63,7 @@
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_normal"),
"widgets/border/default/stack_normal");
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always Below"));
e_menu_item_radio_set(mi, 1);
@@ -73,15 +76,17 @@
"widgets/border/default/stack_below");
}
- m = e_menu_new();
- e_menu_category_set(m,"border/maximize");
- e_menu_category_data_set("border/maximize",bd);
- bd->border_maximize_menu = m;
/* Only allow to change layer for windows in "normal" layers */
if ((!bd->lock_user_maximize) && (!bd->shaded) &&
((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150)))
{
int __fullmaximization = 0;
+
+ m = e_menu_new();
+ e_menu_category_set(m,"border/maximize");
+ e_menu_category_data_set("border/maximize",bd);
+ bd->border_maximize_menu = m;
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Maximized"));
e_menu_item_check_set(mi, 1);
Index: ecore/src/lib/ecore_x/ecore_x_events.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v
retrieving revision 1.79
diff -u -r1.79 ecore_x_events.c
--- ecore/src/lib/ecore_x/ecore_x_events.c 6 Jan 2006 20:22:09 -0000 1.79
+++ ecore/src/lib/ecore_x/ecore_x_events.c 6 Feb 2006 21:51:08 -0000
@@ -1,12 +1,21 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+#include "langinfo.h"
#include "ecore_private.h"
#include "Ecore.h"
#include "ecore_x_private.h"
#include "Ecore_X.h"
#include "Ecore_X_Atoms.h"
+/** OpenBSD does not define CODESET
+ * FIXME ??
+ */
+
+#ifndef CODESET
+#define CODESET "INVALID"
+#endif
+
#if 0
static void _ecore_x_event_free_window_prop_name_class_change(void *data, void *ev);
static void _ecore_x_event_free_window_prop_title_change(void *data, void *ev);
@@ -191,7 +200,7 @@
if (val > 0)
{
buf[val] = 0;
- e->key_compose = ecore_txt_convert("ISO8859-1", "UTF-8", buf);
+ e->key_compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", buf);
}
else e->key_compose = NULL;
keyname = XKeysymToString(sym);
Index: src/bin/e_apps_error.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v
retrieving revision 1.10
diff -u -r1.10 e_apps_error.c
--- src/bin/e_apps_error.c 26 Jan 2006 21:36:05 -0000 1.10
+++ src/bin/e_apps_error.c 6 Feb 2006 21:44:12 -0000
@@ -60,19 +60,19 @@
if ((app->del.signalled) && (!cfdata->signal))
{
if (app->del.exit_signal == SIGINT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt Singal"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt Signal"),
app->app->exe);
else if (app->del.exit_signal == SIGQUIT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Singal"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal"),
app->app->exe);
else if (app->del.exit_signal == SIGABRT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort Singal"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort Signal"),
app->app->exe);
else if (app->del.exit_signal == SIGFPE)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Floating Point Error"),
app->app->exe);
else if (app->del.exit_signal == SIGKILL)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an Uninterruptable Kill Singal"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by an Uninterruptable Kill Signal"),
app->app->exe);
else if (app->del.exit_signal == SIGSEGV)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Segmentation Fault"),
@@ -87,7 +87,7 @@
snprintf(buf, sizeof(buf), _("%s was interrupted by a Bus Error"),
app->app->exe);
else
- snprintf(buf, sizeof(buf), _("%s was interupted by the signal number %i"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by the signal number %i"),
app->app->exe, app->del.exit_signal);
cfdata->signal = strdup(buf);
/* FIXME: Add sigchld_info stuff
Index: src/bin/e_file_dialog.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.c,v
retrieving revision 1.11
diff -u -r1.11 e_file_dialog.c
--- src/bin/e_file_dialog.c 7 Jan 2006 10:39:45 -0000 1.11
+++ src/bin/e_file_dialog.c 6 Feb 2006 21:44:12 -0000
@@ -63,7 +63,7 @@
e_widget_min_size_get(ol, &w, &h);
e_dialog_content_set(dia->dia, ol, w, h);
- e_dialog_button_add(dia->dia, _("Ok"), NULL, _e_file_dialog_button1_click, dia);
+ e_dialog_button_add(dia->dia, _("OK"), NULL, _e_file_dialog_button1_click, dia);
e_dialog_button_add(dia->dia, _("Cancel"), NULL, _e_file_dialog_button2_click, dia);
return dia;
Index: src/bin/e_fileman_smart.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.121
diff -u -r1.121 e_fileman_smart.c
--- src/bin/e_fileman_smart.c 22 Jan 2006 18:14:50 -0000 1.121
+++ src/bin/e_fileman_smart.c 6 Feb 2006 21:44:12 -0000
@@ -851,7 +851,7 @@
char text[PATH_MAX + 256];
dia = e_dialog_new(icon->sd->win->container);
- e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
e_dialog_button_focus_num(dia, 1);
e_dialog_title_set(dia, _("Error"));
snprintf(text, PATH_MAX + 256, _("Could not delete <br><b>%s</b>"), icon->file->path);
Index: src/bin/e_int_border_locks.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_locks.c,v
retrieving revision 1.9
diff -u -r1.9 e_int_border_locks.c
--- src/bin/e_int_border_locks.c 22 Jan 2006 18:14:51 -0000 1.9
+++ src/bin/e_int_border_locks.c 6 Feb 2006 21:44:12 -0000
@@ -353,7 +353,7 @@
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_check_add(evas, _("Fullscreen state"), &(cfdata->lock.user.fullscreen));
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("The border style"), &(cfdata->lock.border));
+ ob = e_widget_check_add(evas, _("Border style"), &(cfdata->lock.border));
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5);
Index: src/bin/e_int_config_background_import.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v
retrieving revision 1.7
diff -u -r1.7 e_int_config_background_import.c
--- src/bin/e_int_config_background_import.c 23 Jan 2006 04:52:37 -0000 1.7
+++ src/bin/e_int_config_background_import.c 6 Feb 2006 21:44:13 -0000
@@ -199,7 +199,7 @@
edje_object_part_swallow(import->bg_obj, "content_swallow", o);
evas_object_show(o);
- import->ok_obj = e_widget_button_add(evas, _("Ok"), NULL, _import_cb_ok, win, cfdata);
+ import->ok_obj = e_widget_button_add(evas, _("OK"), NULL, _import_cb_ok, win, cfdata);
e_widget_disabled_set(import->ok_obj, 1);
e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5);
Index: src/bin/e_int_config_window_display.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_window_display.c,v
retrieving revision 1.10
diff -u -r1.10 e_int_config_window_display.c
--- src/bin/e_int_config_window_display.c 4 Feb 2006 01:07:04 -0000 1.10
+++ src/bin/e_int_config_window_display.c 6 Feb 2006 21:44:13 -0000
@@ -152,7 +152,7 @@
rg = e_widget_radio_group_new(&(cfdata->placement));
ob = e_widget_radio_add(evas, _("Smart Placement"), E_WINDOW_PLACEMENT_SMART, rg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Dont hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg);
+ ob = e_widget_radio_add(evas, _("Don't hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Place at mouse pointer"), E_WINDOW_PLACEMENT_CURSOR, rg);
e_widget_framelist_object_append(of, ob);
@@ -208,7 +208,7 @@
rg = e_widget_radio_group_new(&(cfdata->placement));
ob = e_widget_radio_add(evas, _("Smart Placement"), E_WINDOW_PLACEMENT_SMART, rg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Dont hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg);
+ ob = e_widget_radio_add(evas, _("Don't hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Place at mouse pointer"), E_WINDOW_PLACEMENT_CURSOR, rg);
e_widget_framelist_object_append(of, ob);
Index: src/bin/e_main.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.146
diff -u -r1.146 e_main.c
--- src/bin/e_main.c 4 Feb 2006 06:45:13 -0000 1.146
+++ src/bin/e_main.c 6 Feb 2006 21:44:13 -0000
@@ -202,7 +202,7 @@
"\t\tbe used to simulate xinerama.\n"
"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800+0\n"
"\t-profile CONF_PROFILE\n"
- "\t\tUse the configuration profile CONF_PROFILE instead of the the user selected default or just \"default\".\n"
+ "\t\tUse the configuration profile CONF_PROFILE instead of the user selected default or just \"default\".\n"
"\t-good\n"
"\t\tBe good.\n"
"\t-evil\n"
@@ -374,7 +374,7 @@
ee = ecore_evas_buffer_new(1, 1);
if (!ee)
{
- e_error_message_show(_("Enlightenment found evas can't create a buffer canvas. Please check\n"
+ e_error_message_show(_("Enlightenment found Evas can't create a buffer canvas. Please check\n"
"Evas has Software Buffer engine support.\n"));
_e_main_shutdown(-1);
}
@@ -384,7 +384,7 @@
evas_object_image_file_set(im, buf, NULL);
if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
{
- e_error_message_show(_("Enlightenment found evas can't load PNG files. Check Evas has PNG\n"
+ e_error_message_show(_("Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
"loader support.\n"));
_e_main_shutdown(-1);
}
@@ -393,7 +393,7 @@
evas_object_image_file_set(im, buf, NULL);
if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
{
- e_error_message_show(_("Enlightenment found evas can't load JPEG files. Check Evas has JPEG\n"
+ e_error_message_show(_("Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
"loader support.\n"));
_e_main_shutdown(-1);
}
@@ -402,7 +402,7 @@
evas_object_image_file_set(im, buf, "images/0");
if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
{
- e_error_message_show(_("Enlightenment found evas can't load EET files. Check Evas has EET\n"
+ e_error_message_show(_("Enlightenment found Evas can't load EET files. Check Evas has EET\n"
"loader support.\n"));
_e_main_shutdown(-1);
}
Index: src/bin/e_module.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.53
diff -u -r1.53 e_module.c
--- src/bin/e_module.c 10 Jan 2006 04:23:43 -0000 1.53
+++ src/bin/e_module.c 6 Feb 2006 21:44:14 -0000
@@ -145,8 +145,8 @@
"The full path to this module is:<br>"
"%s<br>"
"The error reported was:<br>"
- "Module does not contain all needed functions<br>"),
- name, buf);
+ "%s<br>"),
+ name, buf, _("Module does not contain all needed functions"));
_e_module_dialog_disable_show(_("Error loading Module"), body, m);
m->api = NULL;
m->func.init = NULL;
@@ -471,7 +471,7 @@
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);
Index: src/modules/battery/e_mod_main.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.66
diff -u -r1.66 e_mod_main.c
--- src/modules/battery/e_mod_main.c 20 Jan 2006 04:04:12 -0000 1.66
+++ src/modules/battery/e_mod_main.c 6 Feb 2006 21:44:16 -0000
@@ -562,7 +562,7 @@
e_dialog_text_set(dia, _("Battery Running Low<br>"
"Your battery is running low.<br>"
"You may wish to switch to an AC source."));
- e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
}
Index: src/modules/cpufreq/e_mod_main.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/cpufreq/e_mod_main.c,v
retrieving revision 1.32
diff -u -r1.32 e_mod_main.c
--- src/modules/cpufreq/e_mod_main.c 20 Jan 2006 04:04:13 -0000 1.32
+++ src/modules/cpufreq/e_mod_main.c 6 Feb 2006 21:44:16 -0000
@@ -315,7 +315,7 @@
e_dialog_icon_set(dia, "enlightenment/e", 64);
e_dialog_text_set(dia, _("There was an error trying to set the cpu frequency<br>"
"governor via the module's setfreq utility."));
- e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
}
@@ -343,7 +343,7 @@
e_dialog_icon_set(dia, "enlightenment/e", 64);
e_dialog_text_set(dia, _("There was an error trying to set the cpu frequency<br>"
"setting via the module's setfreq utility."));
- e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
}
@@ -570,10 +570,10 @@
frequency = (int)l->data;
mi = e_menu_item_new(mn);
if (frequency < 1000000)
- snprintf(buf, sizeof(buf), _("%i Mhz"),
+ snprintf(buf, sizeof(buf), _("%i MHz"),
frequency / 1000);
else
- snprintf(buf, sizeof(buf), _("%i.%i Ghz"),
+ snprintf(buf, sizeof(buf), _("%i.%i GHz"),
frequency / 1000000, (frequency % 1000000) / 100000);
buf[sizeof(buf) - 1] = 0;
e_menu_item_label_set(mi, buf);
