Make Everything's plugins and action names translatable v2

v2: Mark messages for translation explicitly as suggested by Raster.
This is a more straightforward version of r79658.

SVN revision: 82292

diff --git a/po/Makevars b/po/Makevars
index 090dd05..bdc4a63 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -10,8 +10,6 @@ top_builddir = ..
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = --keyword=_ --keyword=d_:1 --keyword=P_:1,2 \
        --keyword=dP_:1,2 --keyword=N_ --keyword=NP_:1,2 \
-       --keyword=EVRY_PLUGIN_BASE:1 --keyword=EVRY_ACTION_NEW:1 \
-       --keyword=ACTION_NEW:1 \
        --from-code=UTF-8 --foreign-user
 
 # This is the copyright holder that gets inserted into the header of the

diff --git a/src/modules/everything/evry_plug_actions.c b/src/modules/everything/evry_plug_actions.c
index c9006d7..075d8f4 100644 (file)
--- a/src/modules/everything/evry_plug_actions.c
+++ b/src/modules/everything/evry_plug_actions.c
@@ -169,7 +169,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
 int
 evry_plug_actions_init()
 {
-   _plug = EVRY_PLUGIN_BASE("Actions", NULL, EVRY_TYPE_ACTION,
+   _plug = EVRY_PLUGIN_BASE(N_("Actions"), NULL, EVRY_TYPE_ACTION,
                             _begin, _finish, _fetch);
 
    _plug->browse = &_browse;

diff --git a/src/modules/everything/evry_plug_aggregator.c b/src/modules/everything/evry_plug_aggregator.c
index c5c1603..3102591 100644 (file)
--- a/src/modules/everything/evry_plug_aggregator.c
+++ b/src/modules/everything/evry_plug_aggregator.c
@@ -310,7 +310,7 @@ evry_aggregator_new(int type)
 {
    Evry_Plugin *p;
 
-   p = EVRY_PLUGIN_BASE("All", NULL, 0, _begin, _finish, _fetch);
+   p = EVRY_PLUGIN_BASE(N_("All"), NULL, 0, _begin, _finish, _fetch);
 
    if (evry_plugin_register(p, type, -1))
      {

diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c
index 62ec632..a589b70 100644 (file)
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -1137,7 +1137,7 @@ _plugins_init(const Evry_API *api)
 
    config_path = eina_stringshare_add("launcher/everything-apps");
 
-   p = EVRY_PLUGIN_BASE("Applications", _module_icon, EVRY_TYPE_APP,
+   p = EVRY_PLUGIN_BASE(N_("Applications"), _module_icon, EVRY_TYPE_APP,
                         _begin, _finish, _fetch);
    p->complete = &_complete;
    p->browse = &_browse;
@@ -1145,7 +1145,7 @@ _plugins_init(const Evry_API *api)
    evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 1);
    _plugins = eina_list_append(_plugins, p);
 
-   p = EVRY_PLUGIN_BASE("Exebuf", _module_icon, EVRY_TYPE_APP,
+   p = EVRY_PLUGIN_BASE(N_("Exebuf"), _module_icon, EVRY_TYPE_APP,
                         _begin_exe, _finish_exe, _fetch_exe);
    p->complete = &_complete;
    p->config_path = eina_stringshare_ref(config_path);
@@ -1153,74 +1153,74 @@ _plugins_init(const Evry_API *api)
    if (evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 3))
      p->config->min_query = 3;
 
-   p = EVRY_PLUGIN_BASE("Applications", _module_icon, EVRY_TYPE_APP,
+   p = EVRY_PLUGIN_BASE(N_("Applications"), _module_icon, EVRY_TYPE_APP,
                         _begin_mime, _finish, _fetch);
    p->complete = &_complete;
    p->config_path = eina_stringshare_ref(config_path);
    evry->plugin_register(p, EVRY_PLUGIN_OBJECT, 1);
    _plugins = eina_list_append(_plugins, p);
 
-   p = EVRY_PLUGIN_BASE("Open with...", _module_icon, EVRY_TYPE_APP,
+   p = EVRY_PLUGIN_BASE(N_("Open with..."), _module_icon, EVRY_TYPE_APP,
                         _begin_mime, _finish_mime, _fetch_mime);
    p->config_path = eina_stringshare_ref(config_path);
    evry->plugin_register(p, EVRY_PLUGIN_ACTION, 1);
    _plugins = eina_list_append(_plugins, p);
 
-   act = EVRY_ACTION_NEW("Launch",
+   act = EVRY_ACTION_NEW(N_("Launch"),
                          EVRY_TYPE_APP, 0,
                          "system-run",
                          _exec_app_action,
                          _exec_app_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("Open File...",
+   act = EVRY_ACTION_NEW(N_("Open File..."),
                          EVRY_TYPE_APP, EVRY_TYPE_FILE,
                          "document-open",
                          _exec_app_action,
                          _exec_app_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("Run in Terminal",
+   act = EVRY_ACTION_NEW(N_("Run in Terminal"),
                          EVRY_TYPE_APP, 0,
                          "system-run",
                          _exec_term_action,
                          _exec_term_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("Edit Application Entry",
+   act = EVRY_ACTION_NEW(N_("Edit Application Entry"),
                          EVRY_TYPE_APP, 0,
                          "everything-launch",
                          _edit_app_action,
                          _edit_app_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("New Application Entry",
+   act = EVRY_ACTION_NEW(N_("New Application Entry"),
                          EVRY_TYPE_APP, 0,
                          "everything-launch",
                          _new_app_action,
                          _new_app_check_item);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("Run with Sudo",
+   act = EVRY_ACTION_NEW(N_("Run with Sudo"),
                          EVRY_TYPE_APP, 0,
                          "system-run",
                          _exec_sudo_action, NULL);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("Open with...",
+   act = EVRY_ACTION_NEW(N_("Open with..."),
                          EVRY_TYPE_FILE, EVRY_TYPE_APP,
                          "everything-launch",
                          _exec_file_action, NULL);
    _act_open_with = EVRY_ITEM(act);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("Open Terminal here",
+   act = EVRY_ACTION_NEW(N_("Open Terminal here"),
                          EVRY_TYPE_FILE, 0,
                          "system-run",
                          _open_term_action, NULL);
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("Run Executable",
+   act = EVRY_ACTION_NEW(N_("Run Executable"),
                          EVRY_TYPE_FILE, 0,
                          "system-run",
                          _run_executable,

diff --git a/src/modules/everything/evry_plug_calc.c b/src/modules/everything/evry_plug_calc.c
index ad26aa9..80fbc08 100644 (file)
--- a/src/modules/everything/evry_plug_calc.c
+++ b/src/modules/everything/evry_plug_calc.c
@@ -262,7 +262,7 @@ _plugins_init(const Evry_API *_api)
    action_handler = evry->event_handler_add(EVRY_EVENT_ACTION_PERFORMED,
                                             _cb_action_performed, NULL);
 
-   _plug = EVRY_PLUGIN_BASE("Calculator", _module_icon, EVRY_TYPE_TEXT,
+   _plug = EVRY_PLUGIN_BASE(N_("Calculator"), _module_icon, EVRY_TYPE_TEXT,
                             _begin, _finish, _fetch);
 
    _plug->history = EINA_FALSE;

diff --git a/src/modules/everything/evry_plug_clipboard.c b/src/modules/everything/evry_plug_clipboard.c
index 3a221f9..1256165 100644 (file)
--- a/src/modules/everything/evry_plug_clipboard.c
+++ b/src/modules/everything/evry_plug_clipboard.c
@@ -30,7 +30,7 @@ evry_plug_clipboard_init(void)
    if (!win) return EINA_FALSE;
 
 //FIXME: Icon name doesn't follow FDO Spec
-   act = EVRY_ACTION_NEW("Copy to Clipboard",
+   act = EVRY_ACTION_NEW(N_("Copy to Clipboard"),
                          EVRY_TYPE_TEXT, 0,
                          "everything-clipboard",
                          _action, _check_item);

diff --git a/src/modules/everything/evry_plug_collection.c b/src/modules/everything/evry_plug_collection.c
index 5d334d0..fdc6db2 100644 (file)
--- a/src/modules/everything/evry_plug_collection.c
+++ b/src/modules/everything/evry_plug_collection.c
@@ -169,7 +169,7 @@ evry_plug_collection_init(void)
 
    COLLECTION_PLUGIN = evry_type_register("COLLECTION_PLUGIN");
 
-   p = _add_plugin("Plugins");
+   p = _add_plugin(N_("Plugins"));
    p->begin = &_begin_all;
    EVRY_ITEM_ICON_SET(p, "preferences-plugin");
 

diff --git a/src/modules/everything/evry_plug_files.c b/src/modules/everything/evry_plug_files.c
index a13f0ff..d8ea5d2 100644 (file)
--- a/src/modules/everything/evry_plug_files.c
+++ b/src/modules/everything/evry_plug_files.c
@@ -1314,37 +1314,37 @@ _plugins_init(const Evry_API *api)
   if (_register) evry->action_register(act, prio++);                         \
   _actions = eina_list_append(_actions, act);                                \
 
-   ACTION_NEW("Copy To ...", EVRY_TYPE_FILE, "go-next",
+   ACTION_NEW(N_("Copy To ..."), EVRY_TYPE_FILE, "go-next",
               _file_copy_action, NULL, 1);
    act->it2.subtype = EVRY_TYPE_DIR;
    EVRY_ITEM_DATA_INT_SET(act, ACT_COPY);
 
-   ACTION_NEW("Move To ...", EVRY_TYPE_FILE, "go-next",
+   ACTION_NEW(N_("Move To ..."), EVRY_TYPE_FILE, "go-next",
               _file_copy_action, NULL, 1);
    act->it2.subtype = EVRY_TYPE_DIR;
    EVRY_ITEM_DATA_INT_SET(act, ACT_MOVE);
 
-   ACTION_NEW("Move to Trash", 0, "user-trash",
+   ACTION_NEW(N_("Move to Trash"), 0, "user-trash",
               _file_trash_action, NULL, 1);
    EVRY_ITEM_DATA_INT_SET(act, ACT_TRASH);
 
-   ACTION_NEW("Open Directory", 0, "folder-open",
+   ACTION_NEW(N_("Open Directory"), 0, "folder-open",
               _open_folder_action, _open_folder_check, 1);
    act->remember_context = EINA_TRUE;
 
-   ACTION_NEW("Sort by Date", 0, "go-up",
+   ACTION_NEW(N_("Sort by Date"), 0, "go-up",
               _file_sort_action, NULL, 0);
    EVRY_ITEM_DATA_INT_SET(act, ACT_SORT_DATE);
    act_sort_date = act;
 
-   ACTION_NEW("Sort by Name", 0, "go-up",
+   ACTION_NEW(N_("Sort by Name"), 0, "go-up",
               _file_sort_action, NULL, 0);
    EVRY_ITEM_DATA_INT_SET(act, ACT_SORT_NAME);
    act_sort_name = act;
 
 #undef ACTION_NEW
 
-   p = EVRY_PLUGIN_BASE("Files", _module_icon, EVRY_TYPE_FILE,
+   p = EVRY_PLUGIN_BASE(N_("Files"), _module_icon, EVRY_TYPE_FILE,
                         _begin, _finish, _fetch);
    p->input_type = EVRY_TYPE_FILE;
    p->cb_key_down = &_cb_key_down;
@@ -1357,7 +1357,7 @@ _plugins_init(const Evry_API *api)
    if (evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 2))
      p->config->min_query = 1;
 
-   p = EVRY_PLUGIN_BASE("Files", _module_icon, EVRY_TYPE_FILE,
+   p = EVRY_PLUGIN_BASE(N_("Files"), _module_icon, EVRY_TYPE_FILE,
                         _begin, _finish, _fetch);
    p->cb_key_down = &_cb_key_down;
    p->browse = &_browse;
@@ -1370,7 +1370,7 @@ _plugins_init(const Evry_API *api)
    if (!_conf->show_recent && !_conf->search_recent)
      return EINA_TRUE;
 
-   p = EVRY_PLUGIN_BASE("Recent Files", _module_icon, EVRY_TYPE_FILE,
+   p = EVRY_PLUGIN_BASE(N_("Recent Files"), _module_icon, EVRY_TYPE_FILE,
                         _recentf_begin, _finish, _recentf_fetch);
    p->browse = &_recentf_browse;
    p->config_path = eina_stringshare_ref(config_path);
@@ -1382,7 +1382,7 @@ _plugins_init(const Evry_API *api)
      }
    _plugins = eina_list_append(_plugins, p);
 
-   p = EVRY_PLUGIN_BASE("Recent Files", _module_icon, EVRY_TYPE_FILE,
+   p = EVRY_PLUGIN_BASE(N_("Recent Files"), _module_icon, EVRY_TYPE_FILE,
                         _recentf_begin, _finish, _recentf_fetch);
    p->browse = &_recentf_browse;
    p->config_path = eina_stringshare_ref(config_path);

diff --git a/src/modules/everything/evry_plug_settings.c b/src/modules/everything/evry_plug_settings.c
index 4563b8c..af1e7b2 100644 (file)
--- a/src/modules/everything/evry_plug_settings.c
+++ b/src/modules/everything/evry_plug_settings.c
@@ -180,11 +180,11 @@ _plugins_init(const Evry_API *_api)
 
    E_SETTINGS = evry->type_register("E_SETTINGS");
 
-   p = EVRY_PLUGIN_BASE("Settings", "configure", E_SETTINGS, _begin, _finish, _fetch);
+   p = EVRY_PLUGIN_BASE(N_("Settings"), "configure", E_SETTINGS, _begin, _finish, _fetch);
    p->browse = &_browse;
    evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 10);
 
-   act = EVRY_ACTION_NEW("Show Dialog", E_SETTINGS, 0,
+   act = EVRY_ACTION_NEW(N_("Show Dialog"), E_SETTINGS, 0,
                          "preferences-advanced", _action, _action_check);
 
    evry->action_register(act, 0);

diff --git a/src/modules/everything/evry_plug_text.c b/src/modules/everything/evry_plug_text.c
index 5dfc9ee..5d0f356 100644 (file)
--- a/src/modules/everything/evry_plug_text.c
+++ b/src/modules/everything/evry_plug_text.c
@@ -60,10 +60,10 @@ _fetch(Evry_Plugin *plugin, const char *input)
 Eina_Bool
 evry_plug_text_init(void)
 {
-   p1 = EVRY_PLUGIN_BASE("Text", "accessories-text-editor",
+   p1 = EVRY_PLUGIN_BASE(N_("Text"), "accessories-text-editor",
                          EVRY_TYPE_TEXT, _begin, _finish, _fetch);
 
-   p2 = EVRY_PLUGIN_BASE("Text", "accessories-text-editor",
+   p2 = EVRY_PLUGIN_BASE(N_("Text"), "accessories-text-editor",
                          EVRY_TYPE_TEXT, _begin, _finish, _fetch);
 
    if (evry_plugin_register(p1, EVRY_PLUGIN_OBJECT, 999))

diff --git a/src/modules/everything/evry_plug_windows.c b/src/modules/everything/evry_plug_windows.c
index 5c4689a..4ff937a 100644 (file)
--- a/src/modules/everything/evry_plug_windows.c
+++ b/src/modules/everything/evry_plug_windows.c
@@ -422,12 +422,12 @@ _plugins_init(const Evry_API *_api)
    if (!evry->api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
 
-   _plug = EVRY_PLUGIN_BASE("Windows", "preferences-system-windows",
+   _plug = EVRY_PLUGIN_BASE(N_("Windows"), "preferences-system-windows",
                             EVRY_TYPE_BORDER, _begin, _finish, _fetch);
    _plug->transient = EINA_TRUE;
    evry->plugin_register(_plug, EVRY_PLUGIN_SUBJECT, 2);
 
-   act = EVRY_ACTION_NEW("Switch to Window",
+   act = EVRY_ACTION_NEW(N_("Switch to Window"),
                          EVRY_TYPE_BORDER, 0, "go-next",
                          _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_SHOW);
@@ -435,28 +435,28 @@ _plugins_init(const Evry_API *_api)
 
    _actions = eina_list_append(_actions, act);
 
-   act = EVRY_ACTION_NEW("Iconify",
+   act = EVRY_ACTION_NEW(N_("Iconify"),
                          EVRY_TYPE_BORDER, 0, "go-down",
                          _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_HIDE);
    _actions = eina_list_append(_actions, act);
    evry->action_register(act, 2);
 
-   act = EVRY_ACTION_NEW("Toggle Fullscreen",
+   act = EVRY_ACTION_NEW(N_("Toggle Fullscreen"),
                          EVRY_TYPE_BORDER, 0, "view-fullscreen",
                          _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_FULLSCREEN);
    _actions = eina_list_append(_actions, act);
    evry->action_register(act, 4);
 
-   act = EVRY_ACTION_NEW("Close",
+   act = EVRY_ACTION_NEW(N_("Close"),
                          EVRY_TYPE_BORDER, 0, "list-remove",
                          _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_CLOSE);
    _actions = eina_list_append(_actions, act);
    evry->action_register(act, 3);
 
-   act = EVRY_ACTION_NEW("Send to Desktop",
+   act = EVRY_ACTION_NEW(N_("Send to Desktop"),
                          EVRY_TYPE_BORDER, 0, "go-previous",
                          _act_border, _check_border);
    EVRY_ITEM_DATA_INT_SET(act, BORDER_TODESK);