Two patches make 5 more messages translatable, 3 of them are
already present in their pots.
One additional patch fixes mismatching parameters for
e_action_predef_name_{set,del}() in extra modules.
-- Igor
>From 810137601226a88be3d35f8c911872bfd8fd40db Mon Sep 17 00:00:00 2001
From: Igor Murzov <[email protected]>
Date: Thu, 20 Dec 2012 18:56:00 +0400
Subject: [PATCH] Make 'Signal:' and 'Sorce:' messages translatable.
---
src/modules/conf_edgebindings/e_int_config_signalbindings.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/conf_edgebindings/e_int_config_signalbindings.c b/src/modules/conf_edgebindings/e_int_config_signalbindings.c
index 89a8a9d..0924d7b 100644
--- a/src/modules/conf_edgebindings/e_int_config_signalbindings.c
+++ b/src/modules/conf_edgebindings/e_int_config_signalbindings.c
@@ -642,12 +642,12 @@ _signal_add_show(E_Config_Dialog_Data *cfdata)
evas = e_win_evas_get(cfdata->locals.dia->win);
obg = e_widget_list_add(evas, 1, 0);
- ol = e_widget_framelist_add(evas, "Source:", 0);
+ ol = e_widget_framelist_add(evas, _("Source:"), 0);
entry = o = e_widget_entry_add(evas, &cfdata->locals.dia_source, NULL, NULL, NULL);
e_widget_framelist_object_append(ol, o);
e_widget_list_object_append(obg, ol, 1, 0, 0.5);
- ol = e_widget_framelist_add(evas, "Signal:", 0);
+ ol = e_widget_framelist_add(evas, _("Signal:"), 0);
o = e_widget_entry_add(evas, &cfdata->locals.dia_signal, NULL, NULL, NULL);
e_widget_framelist_object_append(ol, o);
e_widget_list_object_append(obg, ol, 1, 0, 0.5);
--
1.7.12.1
>From b31c71867822fbcb094c6f23a3a20b9442dfd5d0 Mon Sep 17 00:00:00 2001
From: Igor Murzov <[email protected]>
Date: Thu, 20 Dec 2012 18:39:10 +0400
Subject: [PATCH 1/2] Fix mismatching parameters for
e_action_predef_name_{set,del}()
It's a followup to r81048.
---
exalt-client/src/e_mod_main.c | 4 ++--
places/src/e_mod_main.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/exalt-client/src/e_mod_main.c b/exalt-client/src/e_mod_main.c
index 7b05e10..0a0e9eb 100644
--- a/exalt-client/src/e_mod_main.c
+++ b/exalt-client/src/e_mod_main.c
@@ -155,11 +155,11 @@ e_modapi_init(E_Module *m)
e_modapi_shutdown(E_Module *m)
{
/* Unregister the config dialog from the main panel */
- e_configure_registry_item_del("advanced/exalt");
+ e_configure_registry_item_del("extensions/exalt");
/* Remove the config panel category if we can. E will tell us.
category stays if other items using it */
- e_configure_registry_category_del("advanced");
+ e_configure_registry_category_del("extensions");
/* Kill the config dialog */
if (exalt_conf->cfd) e_object_del(E_OBJECT(exalt_conf->cfd));
diff --git a/places/src/e_mod_main.c b/places/src/e_mod_main.c
index af6f39d..b275979 100644
--- a/places/src/e_mod_main.c
+++ b/places/src/e_mod_main.c
@@ -149,8 +149,8 @@ e_modapi_shutdown(E_Module *m)
{
places_shutdown();
- e_configure_registry_item_del("extensions/places");
- e_configure_registry_category_del("extensions");
+ e_configure_registry_item_del("fileman/places");
+ e_configure_registry_category_del("fileman");
/* Kill the config dialog */
if (places_conf->cfd) e_object_del(E_OBJECT(places_conf->cfd));
--
1.7.12.1
>From 6eb01a72b42bf3671f6b3fbd7448501e65da27e4 Mon Sep 17 00:00:00 2001
From: Igor Murzov <[email protected]>
Date: Thu, 20 Dec 2012 18:45:10 +0400
Subject: [PATCH 2/2] Make some labels in Places modules translatable.
It also replaces _ with D_ in everything-places for the sake of consistency.
---
everything-places/po/Makevars | 2 +-
everything-places/src/e_mod_main.c | 4 ++--
everything-places/src/e_mod_main.h | 4 ++--
places/src/e_mod_main.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/everything-places/po/Makevars b/everything-places/po/Makevars
index c6a5b44..446ec3c 100644
--- a/everything-places/po/Makevars
+++ b/everything-places/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \
+XGETTEXT_OPTIONS = --keyword=D_ --keyword=N_ \
--keyword=EVRY_PLUGIN_BASE:1 --keyword=EVRY_ACTION_NEW:1 \
--from-code=UTF-8 --foreign-user
diff --git a/everything-places/src/e_mod_main.c b/everything-places/src/e_mod_main.c
index 6394648..7c1833f 100644
--- a/everything-places/src/e_mod_main.c
+++ b/everything-places/src/e_mod_main.c
@@ -135,10 +135,10 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item)
EVRY_PLUGIN_INSTANCE(p, plugin);
- _item_add(p, N_("Home"), e_user_homedir_get(), _mime_dir, NULL);
+ _item_add(p, D_("Home"), e_user_homedir_get(), _mime_dir, NULL);
e_user_dir_concat_static(path, "backgrounds");
- _item_add(p, N_("Wallpaper"), path, _mime_dir, NULL);
+ _item_add(p, D_("Wallpaper"), path, _mime_dir, NULL);
_gtk_bookmarks_add(p);
diff --git a/everything-places/src/e_mod_main.h b/everything-places/src/e_mod_main.h
index 9ba49fb..cc3eb71 100644
--- a/everything-places/src/e_mod_main.h
+++ b/everything-places/src/e_mod_main.h
@@ -3,11 +3,11 @@
#ifdef ENABLE_NLS
# include <libintl.h>
-# define _(string) dgettext(PACKAGE, string)
+# define D_(string) dgettext(PACKAGE, string)
#else
# define bindtextdomain(domain,dir)
# define bind_textdomain_codeset(domain,codeset)
-# define _(string) (string)
+# define D_(string) (string)
#endif
#define N_(str) (str)
diff --git a/places/src/e_mod_main.c b/places/src/e_mod_main.c
index b275979..447fc14 100644
--- a/places/src/e_mod_main.c
+++ b/places/src/e_mod_main.c
@@ -295,7 +295,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
static const char *
_gc_label(const E_Gadcon_Client_Class *client_class)
{
- return "Places";
+ return D_("Places");
}
static const char *
--
1.7.12.1
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
