Massimo Maiurana, il 19/04/2010 18:35, scrisse: > ok, I've just committed the previous patch as it seems to work, now it should > be time to translate everythings' modules in E-MODULES-EXTRA :) > > those modules are in a different domain, but looking in them I see that: > - EVRY_*_NEW macros are not redefined, so they are as in Evry.h and use _() > - dgettext(PACKAGE, str) is defined as _() in e_mod_main.h > > given this, would it be enough to use the N_() macro even there, without the > need to redefine anything in e_mod_main.h?
I've tested the attached patch and it seems to be working, can I commit it in
svn?
--
Massimo Maiurana massimo<at>ragusa.linux.it
http://massimo.solira.org GPG keyID #7044D601
Creare l'uomo fu un'idea bizzarra e originale,
ma aggiungere la pecora fu una tautologia.
[Mark Twain]
diff -Naur E-MODULES-EXTRA/everything-mpris/Makefile.am E-MODULES-EXTRA.new/everything-mpris/Makefile.am
--- E-MODULES-EXTRA/everything-mpris/Makefile.am 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-mpris/Makefile.am 2010-04-25 11:29:58.000000000 +0200
@@ -3,7 +3,7 @@
config.sub configure depcomp install-sh ltmain.sh \
missing module.desktop config.rpath mkinstalldirs
-SUBDIRS = src
+SUBDIRS = src po
EDJE_FLAGS = -v \
-id $(top_srcdir)/images
diff -Naur E-MODULES-EXTRA/everything-mpris/po/evry-mpris.pot E-MODULES-EXTRA.new/everything-mpris/po/evry-mpris.pot
--- E-MODULES-EXTRA/everything-mpris/po/evry-mpris.pot 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-mpris/po/evry-mpris.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Enlightenment development team
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-10 15:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/e_mod_config.c:44
-msgid "Skeleton Module"
-msgstr ""
-
-#: src/e_mod_config.c:84
-msgid "General"
-msgstr ""
-
-#: src/e_mod_config.c:86
-msgid "Use Switch 1"
-msgstr ""
-
-#: src/e_mod_main.c:99
-msgid ""
-"Mpriseton Module Configuration data needed upgrading. Your old "
-"configuration<br> has been wiped and a new set of defaults initialized. "
-"This<br>will happen regularly during development, so don't report a<br>bug. "
-"This simply means the module needs new configuration<br>data by default for "
-"usable functionality that your old<br>configuration simply lacks. This new "
-"set of defaults will fix<br>that by adding it in. You can re-configure "
-"things now to your<br>liking. Sorry for the inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:119
-msgid ""
-"Your Mpriseton Module configuration is NEWER than the module version. This "
-"is very<br>strange. This should not happen unless you downgraded<br>the "
-"module or copied the configuration from a place where<br>a newer version of "
-"the module was running. This is bad and<br>as a precaution your "
-"configuration has been now restored to<br>defaults. Sorry for the "
-"inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:265
-msgid "Mpriseton Configuration Updated"
-msgstr ""
diff -Naur E-MODULES-EXTRA/everything-mpris/po/LINGUAS E-MODULES-EXTRA.new/everything-mpris/po/LINGUAS
--- E-MODULES-EXTRA/everything-mpris/po/LINGUAS 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-mpris/po/LINGUAS 2010-04-25 11:38:53.000000000 +0200
@@ -1 +0,0 @@
-ar bg cs de el es eo fr he hr hu it ja lt nl pl pt_BR ru sk sv tr uk zh_CN
diff -Naur E-MODULES-EXTRA/everything-mpris/po/Makevars E-MODULES-EXTRA.new/everything-mpris/po/Makevars
--- E-MODULES-EXTRA/everything-mpris/po/Makevars 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-mpris/po/Makevars 2010-04-25 11:38:25.000000000 +0200
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
diff -Naur E-MODULES-EXTRA/everything-mpris/src/e_mod_main.c E-MODULES-EXTRA.new/everything-mpris/src/e_mod_main.c
--- E-MODULES-EXTRA/everything-mpris/src/e_mod_main.c 2010-04-25 10:09:03.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-mpris/src/e_mod_main.c 2010-04-25 11:37:21.000000000 +0200
@@ -1123,7 +1123,7 @@
if (!evry_api_version_check(EVRY_API_VERSION))
return EINA_FALSE;
- p = EVRY_PLUGIN_NEW(Plugin, "Playlist", type_subject, NULL, mpris_track,
+ p = EVRY_PLUGIN_NEW(Plugin, N_("Playlist"), type_subject, NULL, mpris_track,
_begin, _cleanup, _fetch, _icon_get, NULL);
p->aggregate = EINA_FALSE;
@@ -1135,73 +1135,73 @@
evry_plugin_register(p, 0);
_plug = (Plugin *) p;
- act = EVRY_ACTION_NEW("Play Track", mpris_track, NULL, "media-playback-start",
+ act = EVRY_ACTION_NEW(N_("Play Track"), mpris_track, NULL, "media-playback-start",
_mpris_play_track, _mpris_check_item);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "PlayTrack";
- act = EVRY_ACTION_NEW("Remove Track", mpris_track, NULL, "list-remove",
+ act = EVRY_ACTION_NEW(N_("Remove Track"), mpris_track, NULL, "list-remove",
_mpris_tracklist_remove_track, _mpris_check_item);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "RemoveTrack";
- act = EVRY_ACTION_NEW("Play", mpris_track, NULL, "media-playback-start",
+ act = EVRY_ACTION_NEW(N_("Play"), mpris_track, NULL, "media-playback-start",
_mpris_player_action, _mpris_check_item);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "Play";
- act = EVRY_ACTION_NEW("Pause", mpris_track, NULL, "media-playback-pause",
+ act = EVRY_ACTION_NEW(N_("Pause"), mpris_track, NULL, "media-playback-pause",
_mpris_player_action, _mpris_check_item);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "Pause";
- act = EVRY_ACTION_NEW("Stop", mpris_track, NULL, "media-playback-stop",
+ act = EVRY_ACTION_NEW(N_("Stop"), mpris_track, NULL, "media-playback-stop",
_mpris_player_action, _mpris_check_item);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "Stop";
- act = EVRY_ACTION_NEW("Forward", mpris_track, NULL, "media-seek-forward",
+ act = EVRY_ACTION_NEW(N_("Forward"), mpris_track, NULL, "media-seek-forward",
_mpris_player_position, _mpris_check_item);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "Forward";
- act = EVRY_ACTION_NEW("Rewind", mpris_track, NULL, "media-seek-backward",
+ act = EVRY_ACTION_NEW(N_("Rewind"), mpris_track, NULL, "media-seek-backward",
_mpris_player_position, _mpris_check_item);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "Rewind";
- act = EVRY_ACTION_NEW("Clear Playlist", mpris_track, NULL, "media-playlist-clear",
+ act = EVRY_ACTION_NEW(N_("Clear Playlist"), mpris_track, NULL, "media-playlist-clear",
_mpris_tracklist_action_clear , _mpris_check_item);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "Clear";
- act = EVRY_ACTION_NEW("Enqueue File", "FILE", NULL, "list-add",
+ act = EVRY_ACTION_NEW(N_("Enqueue File"), "FILE", NULL, "list-add",
_mpris_play_file, _mpris_check_file);
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
act->data = "e";
- act = EVRY_ACTION_NEW("Play File", "FILE", NULL, "media-playback-start",
+ act = EVRY_ACTION_NEW(N_("Play File"), "FILE", NULL, "media-playback-start",
_mpris_play_file, _mpris_check_file);
evry_action_register(act, 1);
actions = eina_list_append(actions, act);
act->data = "p";
- act = EVRY_ACTION_NEW("Add Files...", mpris_track, "FILE", "list-add",
+ act = EVRY_ACTION_NEW(N_("Add Files..."), mpris_track, "FILE", "list-add",
_mpris_add_files, NULL);
act->data = "e";
evry_action_register(act, prio--);
actions = eina_list_append(actions, act);
- act = EVRY_ACTION_NEW("Add Music...", mpris_track, "TRACKER_MUSIC", "list-add",
+ act = EVRY_ACTION_NEW(N_("Add Music..."), mpris_track, "TRACKER_MUSIC", "list-add",
_mpris_add_files, NULL);
act->data = "e";
evry_action_register(act, prio--);
diff -Naur E-MODULES-EXTRA/everything-pidgin/Makefile.am E-MODULES-EXTRA.new/everything-pidgin/Makefile.am
--- E-MODULES-EXTRA/everything-pidgin/Makefile.am 2010-04-11 20:52:42.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-pidgin/Makefile.am 2010-04-25 11:39:50.000000000 +0200
@@ -3,7 +3,7 @@
config.sub configure depcomp install-sh ltmain.sh \
missing module.desktop config.rpath mkinstalldirs
-SUBDIRS = src
+SUBDIRS = src po
EDJE_FLAGS = -v \
-id $(top_srcdir)/images
diff -Naur E-MODULES-EXTRA/everything-pidgin/po/evry-mpris.pot E-MODULES-EXTRA.new/everything-pidgin/po/evry-mpris.pot
--- E-MODULES-EXTRA/everything-pidgin/po/evry-mpris.pot 2010-04-11 20:52:42.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-pidgin/po/evry-mpris.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Enlightenment development team
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-10 15:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/e_mod_config.c:44
-msgid "Skeleton Module"
-msgstr ""
-
-#: src/e_mod_config.c:84
-msgid "General"
-msgstr ""
-
-#: src/e_mod_config.c:86
-msgid "Use Switch 1"
-msgstr ""
-
-#: src/e_mod_main.c:99
-msgid ""
-"Mpriseton Module Configuration data needed upgrading. Your old "
-"configuration<br> has been wiped and a new set of defaults initialized. "
-"This<br>will happen regularly during development, so don't report a<br>bug. "
-"This simply means the module needs new configuration<br>data by default for "
-"usable functionality that your old<br>configuration simply lacks. This new "
-"set of defaults will fix<br>that by adding it in. You can re-configure "
-"things now to your<br>liking. Sorry for the inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:119
-msgid ""
-"Your Mpriseton Module configuration is NEWER than the module version. This "
-"is very<br>strange. This should not happen unless you downgraded<br>the "
-"module or copied the configuration from a place where<br>a newer version of "
-"the module was running. This is bad and<br>as a precaution your "
-"configuration has been now restored to<br>defaults. Sorry for the "
-"inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:265
-msgid "Mpriseton Configuration Updated"
-msgstr ""
diff -Naur E-MODULES-EXTRA/everything-pidgin/po/it.po E-MODULES-EXTRA.new/everything-pidgin/po/it.po
--- E-MODULES-EXTRA/everything-pidgin/po/it.po 2010-04-11 20:52:42.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-pidgin/po/it.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Enlightenment development team
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-10 15:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/e_mod_config.c:44
-msgid "Skeleton Module"
-msgstr ""
-
-#: src/e_mod_config.c:84
-msgid "General"
-msgstr ""
-
-#: src/e_mod_config.c:86
-msgid "Use Switch 1"
-msgstr ""
-
-#: src/e_mod_main.c:99
-msgid ""
-"Mpriseton Module Configuration data needed upgrading. Your old "
-"configuration<br> has been wiped and a new set of defaults initialized. "
-"This<br>will happen regularly during development, so don't report a<br>bug. "
-"This simply means the module needs new configuration<br>data by default for "
-"usable functionality that your old<br>configuration simply lacks. This new "
-"set of defaults will fix<br>that by adding it in. You can re-configure "
-"things now to your<br>liking. Sorry for the inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:119
-msgid ""
-"Your Mpriseton Module configuration is NEWER than the module version. This "
-"is very<br>strange. This should not happen unless you downgraded<br>the "
-"module or copied the configuration from a place where<br>a newer version of "
-"the module was running. This is bad and<br>as a precaution your "
-"configuration has been now restored to<br>defaults. Sorry for the "
-"inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:265
-msgid "Mpriseton Configuration Updated"
-msgstr ""
diff -Naur E-MODULES-EXTRA/everything-pidgin/po/LINGUAS E-MODULES-EXTRA.new/everything-pidgin/po/LINGUAS
--- E-MODULES-EXTRA/everything-pidgin/po/LINGUAS 2010-04-11 20:52:42.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-pidgin/po/LINGUAS 2010-04-25 11:40:07.000000000 +0200
@@ -1 +0,0 @@
-ar bg cs de el es eo fr he hr hu it ja lt nl pl pt_BR ru sk sv tr uk zh_CN
diff -Naur E-MODULES-EXTRA/everything-pidgin/po/Makevars E-MODULES-EXTRA.new/everything-pidgin/po/Makevars
--- E-MODULES-EXTRA/everything-pidgin/po/Makevars 2010-04-11 20:52:42.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-pidgin/po/Makevars 2010-04-25 11:40:21.000000000 +0200
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
diff -Naur E-MODULES-EXTRA/everything-pidgin/src/e_mod_main.c E-MODULES-EXTRA.new/everything-pidgin/src/e_mod_main.c
--- E-MODULES-EXTRA/everything-pidgin/src/e_mod_main.c 2010-04-25 10:09:03.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-pidgin/src/e_mod_main.c 2010-04-25 11:43:26.000000000 +0200
@@ -592,18 +592,18 @@
if (!evry_api_version_check(EVRY_API_VERSION))
return EINA_FALSE;
- plug = EVRY_PLUGIN_NEW(Evry_Plugin, "Pidgin", type_subject, NULL, "PIDGINCONTACT",
+ plug = EVRY_PLUGIN_NEW(Evry_Plugin, N_("Pidgin"), type_subject, NULL, "PIDGINCONTACT",
_begin, _cleanup, _fetch, _icon_get, NULL);
evry_plugin_register(plug, 1);
- act = EVRY_ACTION_NEW("Chat", "PIDGINCONTACT", NULL, "go-next",
+ act = EVRY_ACTION_NEW(N_("Chat"), "PIDGINCONTACT", NULL, "go-next",
_action_chat, NULL);
- act2 = EVRY_ACTION_NEW("Send File", "PIDGINCONTACT", "FILE", NULL,
+ act2 = EVRY_ACTION_NEW(N_("Send File"), "PIDGINCONTACT", "FILE", NULL,
_action_send, NULL);
- act3 = EVRY_ACTION_NEW("Write Message", "PIDGINCONTACT", "TEXT", "go-next",
+ act3 = EVRY_ACTION_NEW(N_("Write Message"), "PIDGINCONTACT", "TEXT", "go-next",
_action_chat, NULL);
evry_action_register(act, 0);
diff -Naur E-MODULES-EXTRA/everything-tracker/Makefile.am E-MODULES-EXTRA.new/everything-tracker/Makefile.am
--- E-MODULES-EXTRA/everything-tracker/Makefile.am 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker/Makefile.am 2010-04-25 11:45:31.000000000 +0200
@@ -3,7 +3,7 @@
config.sub configure depcomp install-sh ltmain.sh \
missing module.desktop config.rpath mkinstalldirs
-SUBDIRS = src
+SUBDIRS = src po
EDJE_FLAGS = -v \
-id $(top_srcdir)/images
diff -Naur E-MODULES-EXTRA/everything-tracker/po/evry-mpris.pot E-MODULES-EXTRA.new/everything-tracker/po/evry-mpris.pot
--- E-MODULES-EXTRA/everything-tracker/po/evry-mpris.pot 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker/po/evry-mpris.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Enlightenment development team
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-10 15:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/e_mod_config.c:44
-msgid "Skeleton Module"
-msgstr ""
-
-#: src/e_mod_config.c:84
-msgid "General"
-msgstr ""
-
-#: src/e_mod_config.c:86
-msgid "Use Switch 1"
-msgstr ""
-
-#: src/e_mod_main.c:99
-msgid ""
-"Mpriseton Module Configuration data needed upgrading. Your old "
-"configuration<br> has been wiped and a new set of defaults initialized. "
-"This<br>will happen regularly during development, so don't report a<br>bug. "
-"This simply means the module needs new configuration<br>data by default for "
-"usable functionality that your old<br>configuration simply lacks. This new "
-"set of defaults will fix<br>that by adding it in. You can re-configure "
-"things now to your<br>liking. Sorry for the inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:119
-msgid ""
-"Your Mpriseton Module configuration is NEWER than the module version. This "
-"is very<br>strange. This should not happen unless you downgraded<br>the "
-"module or copied the configuration from a place where<br>a newer version of "
-"the module was running. This is bad and<br>as a precaution your "
-"configuration has been now restored to<br>defaults. Sorry for the "
-"inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:265
-msgid "Mpriseton Configuration Updated"
-msgstr ""
diff -Naur E-MODULES-EXTRA/everything-tracker/po/LINGUAS E-MODULES-EXTRA.new/everything-tracker/po/LINGUAS
--- E-MODULES-EXTRA/everything-tracker/po/LINGUAS 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker/po/LINGUAS 2010-04-25 11:52:21.000000000 +0200
@@ -1 +0,0 @@
-ar bg cs de el es eo fr he hr hu it ja lt nl pl pt_BR ru sk sv tr uk zh_CN
diff -Naur E-MODULES-EXTRA/everything-tracker/po/Makevars E-MODULES-EXTRA.new/everything-tracker/po/Makevars
--- E-MODULES-EXTRA/everything-tracker/po/Makevars 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker/po/Makevars 2010-04-25 11:52:07.000000000 +0200
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
diff -Naur E-MODULES-EXTRA/everything-tracker/po/POTFILES E-MODULES-EXTRA.new/everything-tracker/po/POTFILES
--- E-MODULES-EXTRA/everything-tracker/po/POTFILES 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker/po/POTFILES 2010-04-25 11:51:50.000000000 +0200
@@ -1,2 +1,3 @@
../src/e_mod_main.c \
- ../src/e_mod_main.h
+ ../src/e_mod_main.h \
+ ../src/evry_plug.c
diff -Naur E-MODULES-EXTRA/everything-tracker/po/POTFILES.in E-MODULES-EXTRA.new/everything-tracker/po/POTFILES.in
--- E-MODULES-EXTRA/everything-tracker/po/POTFILES.in 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker/po/POTFILES.in 2010-04-25 13:01:57.000000000 +0200
@@ -1,2 +1,3 @@
src/e_mod_main.c
src/e_mod_main.h
+src/evry_plug.c
diff -Naur E-MODULES-EXTRA/everything-tracker/src/e_mod_main.c E-MODULES-EXTRA.new/everything-tracker/src/e_mod_main.c
--- E-MODULES-EXTRA/everything-tracker/src/e_mod_main.c 2010-04-25 10:09:03.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker/src/e_mod_main.c 2010-04-25 11:51:19.000000000 +0200
@@ -823,21 +823,21 @@
if (!evry_api_version_check(EVRY_API_VERSION))
return EINA_FALSE;
- p = EVRY_PLUGIN_NEW(Plugin, "Tracker", type_subject, "TRACKER_QUERY", "FILE",
+ p = EVRY_PLUGIN_NEW(Plugin, N_("Tracker"), type_subject, "TRACKER_QUERY", "FILE",
_begin, _cleanup, _fetch, _icon_get, NULL);
PLUGIN(p1, p);
p1->query = query_files;
plugins = eina_list_append(plugins, p);
evry_plugin_register(p, _prio++);
- p = EVRY_PLUGIN_NEW(Plugin, "Tracker", type_object, "NONE", "FILE",
+ p = EVRY_PLUGIN_NEW(Plugin, N_("Tracker"), type_object, "NONE", "FILE",
_begin, _cleanup, _fetch, _icon_get, NULL);
PLUGIN(p2, p);
p2->query = query_files;
plugins = eina_list_append(plugins, p);
evry_plugin_register(p, _prio++);
- p = EVRY_PLUGIN_NEW(Plugin, "Albums", type_object, "TRACKER_MUSIC", "TRACKER_MUSIC",
+ p = EVRY_PLUGIN_NEW(Plugin, N_("Albums"), type_object, "TRACKER_MUSIC", "TRACKER_MUSIC",
_begin, _cleanup, _fetch, _icon_get, NULL);
p->history = EINA_FALSE;
PLUGIN(p3, p);
@@ -846,7 +846,7 @@
plugins = eina_list_append(plugins, p);
evry_plugin_register(p, _prio++);
- p = EVRY_PLUGIN_NEW(Plugin, "Artists", type_object, "TRACKER_MUSIC", "TRACKER_MUSIC",
+ p = EVRY_PLUGIN_NEW(Plugin, N_("Artists"), type_object, "TRACKER_MUSIC", "TRACKER_MUSIC",
_begin, _cleanup, _fetch, _icon_get, NULL);
p->history = EINA_FALSE;
PLUGIN(p4, p);
diff -Naur E-MODULES-EXTRA/everything-tracker/src/evry_plug.c E-MODULES-EXTRA.new/everything-tracker/src/evry_plug.c
--- E-MODULES-EXTRA/everything-tracker/src/evry_plug.c 2010-04-11 20:52:42.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker/src/evry_plug.c 2010-04-25 11:48:53.000000000 +0200
@@ -1005,67 +1005,67 @@
e_dbus_list_names(conn, _dbus_cb_list_names, NULL);
_plug = E_NEW(Plugin, 1);
- evry_plugin_new(EVRY_PLUGIN(_plug), "Playlist", type_subject, NULL, "MPRIS_TRACK",
+ evry_plugin_new(EVRY_PLUGIN(_plug), _("Playlist"), type_subject, NULL, "MPRIS_TRACK",
1, "emblem-sound", NULL,
_begin, _cleanup, _fetch, _action, _icon_get, NULL, NULL);
/* EVRY_PLUGIN(_plug)->cb_key_down = &_cb_key_down; */
EVRY_PLUGIN(_plug)->aggregate = EINA_FALSE;
evry_plugin_register(EVRY_PLUGIN(_plug), 0);
- act = evry_action_new("Play Track", "MPRIS_TRACK", NULL, NULL, "media-playback-start",
+ act = evry_action_new(_("Play Track"), "MPRIS_TRACK", NULL, NULL, "media-playback-start",
_mpris_play_track, _mpris_check_item, NULL, NULL,NULL);
act->data = "PlayTrack";
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Remove Track", "MPRIS_TRACK", NULL, NULL, "list-remove",
+ act = evry_action_new(_("Remove Track"), "MPRIS_TRACK", NULL, NULL, "list-remove",
_mpris_tracklist_remove_track, NULL, NULL, NULL,NULL);
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Play", "MPRIS_TRACK", NULL, NULL, "media-playback-start",
+ act = evry_action_new(_("Play"), "MPRIS_TRACK", NULL, NULL, "media-playback-start",
_mpris_player_action, _mpris_check_item, NULL, NULL,NULL);
act->data = "Play";
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Pause", "MPRIS_TRACK", NULL, NULL, "media-playback-pause",
+ act = evry_action_new(_("Pause"), "MPRIS_TRACK", NULL, NULL, "media-playback-pause",
_mpris_player_action, _mpris_check_item, NULL, NULL,NULL);
act->data = "Pause";
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Stop", "MPRIS_TRACK", NULL, NULL, "media-playback-stop",
+ act = evry_action_new(_("Stop"), "MPRIS_TRACK", NULL, NULL, "media-playback-stop",
_mpris_player_action, _mpris_check_item, NULL, NULL,NULL);
act->data = "Stop";
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Forward", "MPRIS_TRACK", NULL, NULL, "media-seek-forward",
+ act = evry_action_new(_("Forward"), "MPRIS_TRACK", NULL, NULL, "media-seek-forward",
_mpris_player_position, _mpris_check_item, NULL, NULL,NULL);
act->data = "Forward";
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Rewind", "MPRIS_TRACK", NULL, NULL, "media-seek-backward",
+ act = evry_action_new(_("Rewind"), "MPRIS_TRACK", NULL, NULL, "media-seek-backward",
_mpris_player_position, _mpris_check_item, NULL, NULL,NULL);
act->data = "Rewind";
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Clear Playlist", "MPRIS_TRACK", NULL, NULL, "media-playlist-clear",
+ act = evry_action_new(_("Clear Playlist"), "MPRIS_TRACK", NULL, NULL, "media-playlist-clear",
_mpris_tracklist_action_clear , _mpris_check_item, NULL, NULL,NULL);
act->data = "Clear";
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Enqueue File", "FILE", NULL, NULL, "list-add",
+ act = evry_action_new(_("Enqueue File"), "FILE", NULL, NULL, "list-add",
_mpris_play_file, _mpris_check_file, NULL, NULL,NULL);
act->data = "e";
evry_action_register(act, 0);
actions = eina_list_append(actions, act);
- act = evry_action_new("Play File", "FILE", NULL, NULL, "media-playback-start",
+ act = evry_action_new(_("Play File"), "FILE", NULL, NULL, "media-playback-start",
_mpris_play_file, _mpris_check_file, NULL, NULL,NULL);
act->data = "p";
evry_action_register(act, 1);
diff -Naur E-MODULES-EXTRA/everything-tracker-0.6/Makefile.am E-MODULES-EXTRA.new/everything-tracker-0.6/Makefile.am
--- E-MODULES-EXTRA/everything-tracker-0.6/Makefile.am 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker-0.6/Makefile.am 2010-04-25 11:53:10.000000000 +0200
@@ -3,7 +3,7 @@
config.sub configure depcomp install-sh ltmain.sh \
missing module.desktop config.rpath mkinstalldirs
-SUBDIRS = src
+SUBDIRS = src po
EDJE_FLAGS = -v \
-id $(top_srcdir)/images
diff -Naur E-MODULES-EXTRA/everything-tracker-0.6/po/evry-mpris.pot E-MODULES-EXTRA.new/everything-tracker-0.6/po/evry-mpris.pot
--- E-MODULES-EXTRA/everything-tracker-0.6/po/evry-mpris.pot 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker-0.6/po/evry-mpris.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Enlightenment development team
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-10 15:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/e_mod_config.c:44
-msgid "Skeleton Module"
-msgstr ""
-
-#: src/e_mod_config.c:84
-msgid "General"
-msgstr ""
-
-#: src/e_mod_config.c:86
-msgid "Use Switch 1"
-msgstr ""
-
-#: src/e_mod_main.c:99
-msgid ""
-"Mpriseton Module Configuration data needed upgrading. Your old "
-"configuration<br> has been wiped and a new set of defaults initialized. "
-"This<br>will happen regularly during development, so don't report a<br>bug. "
-"This simply means the module needs new configuration<br>data by default for "
-"usable functionality that your old<br>configuration simply lacks. This new "
-"set of defaults will fix<br>that by adding it in. You can re-configure "
-"things now to your<br>liking. Sorry for the inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:119
-msgid ""
-"Your Mpriseton Module configuration is NEWER than the module version. This "
-"is very<br>strange. This should not happen unless you downgraded<br>the "
-"module or copied the configuration from a place where<br>a newer version of "
-"the module was running. This is bad and<br>as a precaution your "
-"configuration has been now restored to<br>defaults. Sorry for the "
-"inconvenience.<br>"
-msgstr ""
-
-#: src/e_mod_main.c:265
-msgid "Mpriseton Configuration Updated"
-msgstr ""
diff -Naur E-MODULES-EXTRA/everything-tracker-0.6/po/LINGUAS E-MODULES-EXTRA.new/everything-tracker-0.6/po/LINGUAS
--- E-MODULES-EXTRA/everything-tracker-0.6/po/LINGUAS 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker-0.6/po/LINGUAS 2010-04-25 11:53:24.000000000 +0200
@@ -1 +0,0 @@
-ar bg cs de el es eo fr he hr hu it ja lt nl pl pt_BR ru sk sv tr uk zh_CN
diff -Naur E-MODULES-EXTRA/everything-tracker-0.6/po/Makevars E-MODULES-EXTRA.new/everything-tracker-0.6/po/Makevars
--- E-MODULES-EXTRA/everything-tracker-0.6/po/Makevars 2010-04-11 20:52:43.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker-0.6/po/Makevars 2010-04-25 11:53:38.000000000 +0200
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
diff -Naur E-MODULES-EXTRA/everything-tracker-0.6/src/e_mod_main.c E-MODULES-EXTRA.new/everything-tracker-0.6/src/e_mod_main.c
--- E-MODULES-EXTRA/everything-tracker-0.6/src/e_mod_main.c 2010-04-25 10:09:04.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-tracker-0.6/src/e_mod_main.c 2010-04-25 11:57:12.000000000 +0200
@@ -527,14 +527,14 @@
if (!evry_api_version_check(EVRY_API_VERSION))
return EINA_FALSE;
- _plugin_new("Folders", type_subject, "Folders", 20, 0);
- _plugin_new("Images", type_subject, "Images", 20, 0);
- _plugin_new("Music", type_subject, "Music", 20, 0);
- _plugin_new("Videos", type_subject, "Videos", 20, 0);
- _plugin_new("Documents", type_subject, "Documents", 20, 0);
+ _plugin_new(_("Folders"), type_subject, "Folders", 20, 0);
+ _plugin_new(_("Images"), type_subject, "Images", 20, 0);
+ _plugin_new(_("Music"), type_subject, "Music", 20, 0);
+ _plugin_new(_("Videos"), type_subject, "Videos", 20, 0);
+ _plugin_new(_("Documents"), type_subject, "Documents", 20, 0);
- _plugin_new("Find Files", type_object, "Files", 20, 1);
- _plugin_new("Folders", type_object, "Folders", 20, 0);
+ _plugin_new(_("Find Files"), type_object, "Files", 20, 1);
+ _plugin_new(_("Folders"), type_object, "Folders", 20, 0);
return EINA_TRUE;
}
diff -Naur E-MODULES-EXTRA/everything-websearch/Makefile.am E-MODULES-EXTRA.new/everything-websearch/Makefile.am
--- E-MODULES-EXTRA/everything-websearch/Makefile.am 2010-04-24 16:55:53.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-websearch/Makefile.am 2010-04-25 11:57:40.000000000 +0200
@@ -3,7 +3,7 @@
config.sub configure depcomp install-sh ltmain.sh \
missing module.desktop config.rpath mkinstalldirs
-SUBDIRS = src
+SUBDIRS = src po
EDJE_FLAGS = -v \
-id $(top_srcdir)/images
diff -Naur E-MODULES-EXTRA/everything-websearch/po/Makevars E-MODULES-EXTRA.new/everything-websearch/po/Makevars
--- E-MODULES-EXTRA/everything-websearch/po/Makevars 2010-04-24 16:55:53.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-websearch/po/Makevars 2010-04-25 11:57:57.000000000 +0200
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
diff -Naur E-MODULES-EXTRA/everything-websearch/src/e_mod_main.c E-MODULES-EXTRA.new/everything-websearch/src/e_mod_main.c
--- E-MODULES-EXTRA/everything-websearch/src/e_mod_main.c 2010-04-25 10:09:03.000000000 +0200
+++ E-MODULES-EXTRA.new/everything-websearch/src/e_mod_main.c 2010-04-25 11:59:53.000000000 +0200
@@ -283,7 +283,7 @@
if (!evry_api_version_check(EVRY_API_VERSION))
return EINA_FALSE;
- p = EVRY_PLUGIN_NEW(Plugin, "GSuggest", type_subject, "", "TEXT",
+ p = EVRY_PLUGIN_NEW(Plugin, N_("GSuggest"), type_subject, "", "TEXT",
_begin, _cleanup, _fetch, NULL, NULL);
p->trigger = _trigger_google;
@@ -295,7 +295,7 @@
_plug1->request = _request_goolge;
evry_plugin_register(p, 10);
- p = EVRY_PLUGIN_NEW(Plugin, "Wikipedia", type_subject, "", "TEXT",
+ p = EVRY_PLUGIN_NEW(Plugin, N_("Wikipedia"), type_subject, "", "TEXT",
_begin, _cleanup, _fetch, NULL, NULL);
p->trigger = _trigger_wiki;
p->icon = "text-html";
@@ -306,17 +306,17 @@
_plug2->request = _request_wiki;
evry_plugin_register(p, 9);
- _act1 = EVRY_ACTION_NEW("Google for it", "TEXT", NULL, "go-next", _action, NULL);
+ _act1 = EVRY_ACTION_NEW(N_("Google for it"), "TEXT", NULL, "go-next", _action, NULL);
evry_action_register(_act1, 1);
_act1->data = "google";
_act1->icon_get = &_act_icon_get;
- _act2 = EVRY_ACTION_NEW("Wikipedia Page", "TEXT", NULL, "go-next", _action, NULL);
+ _act2 = EVRY_ACTION_NEW(N_("Wikipedia Page"), "TEXT", NULL, "go-next", _action, NULL);
evry_action_register(_act2, 1);
_act2->data = "wikipedia";
_act2->icon_get = &_act_icon_get;
- _act3 = EVRY_ACTION_NEW("Feeling Lucky", "TEXT", NULL, "go-next", _action, NULL);
+ _act3 = EVRY_ACTION_NEW(N_("Feeling Lucky"), "TEXT", NULL, "go-next", _action, NULL);
evry_action_register(_act3, 1);
_act3->data = "feeling-lucky";
_act3->icon_get = &_act_icon_get;
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------
_______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
