styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "more translate strings for evry." 

This reverts commit r82049.

Those messages are already translatable.
See r81049 and r79658 and discussion on the ML.


SVN revision: 82083
This commit is contained in:
Igor Murzov 2013-01-03 15:27:10 +00:00
parent 1efe2a4802
commit 8a94eff0ae
14 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,10 +4,6 @@
* Added conf2 module
* Added e_configure_option API
2013-01-03 Carsten Haitzler
* Fix translation of evrything strigns to include many more
2013-01-03 Cedric Bail
* Fix restart of E17 after manually monitoring it.

1
NEWS
View File

@ -31,7 +31,6 @@ Improvements:
* Mixer settings dialog is now resizable
* Increased maximum menu size, improved menu autoscrolling
* Various #defines in e_int_menus.h are now enums
* Everything module strings are much more translatable now.
Fixes:
* Force check changed upon confirmation dialog closure for engine settings.

8
src/modules/everything/e_mod_main.c
View File

@ -46,8 +46,8 @@ e_modapi_init(E_Module *m)
act->func.go = _e_mod_action_cb;
act->func.go_edge = _e_mod_action_cb_edge;
e_action_predef_name_set
(_("Everything Launcher"),
_("Show Everything Launcher"),
(N_("Everything Launcher"),
N_("Show Everything Launcher"),
"everything", "", NULL, 0);
}
@ -195,8 +195,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
if (act)
{
e_action_predef_name_del(_("Everything Launcher"),
_("Show Everything Launcher"));
e_action_predef_name_del("Everything Launcher",
"Show Everything Launcher");
e_action_del("everything");
}

2
src/modules/everything/evry_plug_actions.c
View File

@ -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("Actions", NULL, EVRY_TYPE_ACTION,
_begin, _finish, _fetch);
_plug->browse = &_browse;

4
src/modules/everything/evry_plug_aggregator.c
View File

@ -299,7 +299,7 @@ _begin(Evry_Plugin *plugin, const Evry_Item *it __UNUSED__)
/* GET_PLUGIN(base, plugin); */
EVRY_PLUGIN_INSTANCE(p, plugin);
p->warning = evry_item_new(NULL, EVRY_PLUGIN(p), _("No plugins loaded"), NULL, NULL);
p->warning = evry_item_new(NULL, EVRY_PLUGIN(p), N_("No plugins loaded"), NULL, NULL);
p->warning->type = EVRY_TYPE_NONE;
return EVRY_PLUGIN(p);
@ -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("All", NULL, 0, _begin, _finish, _fetch);
if (evry_plugin_register(p, type, -1))
{

26
src/modules/everything/evry_plug_apps.c
View File

@ -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("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("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("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("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("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("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("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("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("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("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("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("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("Run Executable",
EVRY_TYPE_FILE, 0,
"system-run",
_run_executable,

2
src/modules/everything/evry_plug_calc.c
View File

@ -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("Calculator", _module_icon, EVRY_TYPE_TEXT,
_begin, _finish, _fetch);
_plug->history = EINA_FALSE;

2
src/modules/everything/evry_plug_collection.c
View File

@ -169,7 +169,7 @@ evry_plug_collection_init(void)
COLLECTION_PLUGIN = evry_type_register("COLLECTION_PLUGIN");
p = _add_plugin(_("Plugins"));
p = _add_plugin("Plugins");
p->begin = &_begin_all;
EVRY_ITEM_ICON_SET(p, "preferences-plugin");

20
src/modules/everything/evry_plug_files.c
View File

@ -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("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("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("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("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("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("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("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("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("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("Recent Files", _module_icon, EVRY_TYPE_FILE,
_recentf_begin, _finish, _recentf_fetch);
p->browse = &_recentf_browse;
p->config_path = eina_stringshare_ref(config_path);

4
src/modules/everything/evry_plug_settings.c
View File

@ -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("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("Show Dialog", E_SETTINGS, 0,
"preferences-advanced", _action, _action_check);
evry->action_register(act, 0);

4
src/modules/everything/evry_plug_text.c
View File

@ -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("Text", "accessories-text-editor",
EVRY_TYPE_TEXT, _begin, _finish, _fetch);
p2 = EVRY_PLUGIN_BASE(_("Text"), "accessories-text-editor",
p2 = EVRY_PLUGIN_BASE("Text", "accessories-text-editor",
EVRY_TYPE_TEXT, _begin, _finish, _fetch);
if (evry_plugin_register(p1, EVRY_PLUGIN_OBJECT, 999))

12
src/modules/everything/evry_plug_windows.c
View File

@ -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("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("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("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("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("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("Send to Desktop",
EVRY_TYPE_BORDER, 0, "go-previous",
_act_border, _check_border);
EVRY_ITEM_DATA_INT_SET(act, BORDER_TODESK);

4
src/modules/everything/evry_plugin.c
View File

@ -176,7 +176,7 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
char buf[256];
snprintf(buf, sizeof(buf), _("Show %s Plugin"), p->name);
e_action_predef_name_set(_("Everything Launcher"), buf,
e_action_predef_name_set(N_("Everything Launcher"), buf,
"everything", p->name, NULL, 1);
}
@ -207,7 +207,7 @@ evry_plugin_unregister(Evry_Plugin *p)
char buf[256];
snprintf(buf, sizeof(buf), _("Show %s Plugin"), p->name);
e_action_predef_name_del(_("Everything Launcher"), buf);
e_action_predef_name_del("Everything Launcher", buf);
}
}

2
src/modules/everything/evry_view.c
View File

@ -1615,7 +1615,7 @@ _view_create(Evry_View *ev, const Evry_State *s, const Evas_Object *swallow)
{
if ((s->selector->states->next) &&
((s->plugin->config->view_mode < 0) ||
(!strcmp(s->plugin->name, _("All")))))
(!strcmp(s->plugin->name, N_("All")))))
v->mode = parent->mode;
else if (s->plugin->config->view_mode >= 0)
v->mode = s->plugin->config->view_mode;