enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl: drop deprecated Encoding key from desktop files 

Summary:
The Encoding key is no longer required, all desktop files are assumed to
be UTF-8 encoded.  See details at:
https://standards.freedesktop.org/desktop-entry-spec/1.1/apc.html

Fix various typos and misspellings

lintian, Debian's package checker, uses strings to check for common typos
in compiled binaries.  This change fixes the ones it identified in 1.20.6.

Reviewers: cedric

Reviewed By: cedric

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D5584

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Ross Vandegrift 2017-12-13 09:53:33 -08:00 committed by Cedric BAIL
parent 750e45e287
commit 71e5c74eb6
36 changed files with 76 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/default/profile.desktop
View File

@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=Link
Name=Default
Name[ab]=默认

1
config/mobile/profile.desktop
View File

@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=Link
Name=Mobile
Name[ca]=Mòbil

1
config/standard/profile.desktop
View File

@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=Link
Name=Standard
Name[ab]=标准

1
data/elementary/desktop/elementary_config.desktop
View File

@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Elementary Configuration
Name[ca]=Configuració Elementary

1
data/elementary/desktop/elementary_test.desktop
View File

@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Elementary Test
Name[ca]=Test bàsic

4
src/bin/edje/edje_player.c
View File

@ -484,9 +484,9 @@ _slave_mode_help(Evas_Object *edje EINA_UNUSED, char *args EINA_UNUSED)
"\t * STRING_SET <set length> \"string1\" \"string2\" ...\n"
"\t * INT_SET <set length> integer1 integer2 integer3 ...\n"
"\t * FLOAT_SET <set length> float1 float2 float3 ...\n"
"\t * STRING_INT \"message\" interger\n"
"\t * STRING_INT \"message\" integer\n"
"\t * STRING_FLOAT \"message\" float\n"
"\t * STRING_INT_SET \"string\" <set length> interger1 ...\n"
"\t * STRING_INT_SET \"string\" <set length> integer1 ...\n"
"\t * STRING_FLOAT_SET \"string\" <set length> float1 float2 ...\n"
"\tinfo <part>\n"
"\t Print part geometry: <x>,<y>,<w>,<h>\n"

2
src/bin/elementary/config.c
View File

@ -4316,7 +4316,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
{
printf("Usage:\n"
" -h This help\n"
" -q Quiet mode (dont show window)\n"
" -q Quiet mode (don't show window)\n"
" -t THEME Set theme to THEME (ELM_THEME spec)\n"
" -f SIZE Set finger size to SIZE pixels\n"
" -s SCALE Set scale factor to SCALE\n"

2
src/bin/elementary/test_ctxpopup.c
View File

@ -32,7 +32,7 @@ _print_current_dir(Evas_Object *obj)
printf("ctxpopup direction: down!\n");
break;
case ELM_CTXPOPUP_DIRECTION_UNKNOWN:
printf("ctxpopup direction: unknow!\n");
printf("ctxpopup direction: unknown!\n");
break;
}
printf(" [%s : %d] auto_hide_mode=%d\n", __func__, __LINE__, elm_ctxpopup_auto_hide_disabled_get(obj));

2
src/bin/elementary/test_entry.c
View File

@ -2185,7 +2185,7 @@ test_entry6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(en,
"input_panel_enabled: FALSE.<br>"
"This entry doesn't allow to show virtual keyboard automatically.<br>"
"This entry doesn't allow one to show virtual keyboard automatically.<br>"
"it is used in case that wants its own keypad such as calculator.");
elm_entry_input_panel_enabled_set(en, EINA_FALSE);
elm_box_pack_end(bx, en);

2
src/bin/ethumb_client/ethumbd.c
View File

@ -286,7 +286,7 @@ _ethumbd_hang_cb(void *data)
ed->hang_timer = NULL;
if (ed->processing)
{
ERR("timout while processing thumb");
ERR("timeout while processing thumb");
if (ed->slave.exe) ecore_exe_kill(ed->slave.exe);
}
return EINA_FALSE;

2
src/examples/ecore/ecore_exe_example.c
View File

@ -76,7 +76,7 @@ main(void)
childPid = ecore_exe_pid_get(childHandle);
if (childPid == -1)
fprintf(stderr, "Could not retrive the PID!\n");
fprintf(stderr, "Could not retrieve the PID!\n");
else
printf("The child process has PID:%u\n", (unsigned int)childPid);

2
src/lib/ecore/ecore_timer.c
View File

@ -469,7 +469,7 @@ _efl_loop_timer_util_instanciate(Efl_Loop_Timer_Data *timer)
if (!timer->initialized)
{
ERR("Trying to instanciate an uninitialized timer is impossible.");
ERR("Trying to instantiate an uninitialized timer is impossible.");
return ;
}

6
src/lib/ecore_buffer/ecore_buffer_consumer.c
View File

@ -169,7 +169,7 @@ ecore_buffer_consumer_buffer_dequeue(Ecore_Buffer_Consumer *consumer)
// This should not happen.
if (_shared_buffer_state_get(sb) != SHARED_BUFFER_STATE_ENQUEUE)
{
ERR("Unknown error occured - Not on Enqueued State: buffer %p, state %s",
ERR("Unknown error occurred - Not on Enqueued State: buffer %p, state %s",
sb, _shared_buffer_state_string_get(sb));
return NULL;
}
@ -357,7 +357,7 @@ _ecore_buffer_consumer_cb_add_buffer(void *data, struct bq_consumer *bq_consumer
if (!sb)
{
ERR("Unknown Error occured - maybe this buffer is not shared yet");
ERR("Unknown Error occurred - maybe this buffer is not shared yet");
return;
}
@ -365,7 +365,7 @@ _ecore_buffer_consumer_cb_add_buffer(void *data, struct bq_consumer *bq_consumer
if ((state != SHARED_BUFFER_STATE_IMPORT) &&
(state != SHARED_BUFFER_STATE_RELEASE))
{
ERR("Unknown Error occured - Could not enqueued this state of buffer: buffer %p, state %s",
ERR("Unknown Error occurred - Could not enqueued this state of buffer: buffer %p, state %s",
sb, _shared_buffer_state_string_get(sb));
return;
}

6
src/lib/ecore_con/efl_net_control_access_point-connman.c
View File

@ -621,7 +621,7 @@ _efl_net_control_access_point_configuration_ipv6_set(Eo *o, Efl_Net_Control_Acce
break;
case EFL_NET_CONTROL_ACCESS_POINT_IPV6_METHOD_AUTO_PRIVACY_TEMPORARY:
_append_dict_entry(array, "Method", "s", "auto");
_append_dict_entry(array, "Privacy", "s", "prefered");
_append_dict_entry(array, "Privacy", "s", "preferred");
break;
}
@ -1238,7 +1238,7 @@ _efl_net_control_access_point_property_actual_ipv6_changed(Eo *o EINA_UNUSED, Ef
pd->actual.ipv6.method = EFL_NET_CONTROL_ACCESS_POINT_IPV6_METHOD_AUTO_PRIVACY_NONE;
else if (strcmp(str, "enabled") == 0)
pd->actual.ipv6.method = EFL_NET_CONTROL_ACCESS_POINT_IPV6_METHOD_AUTO_PRIVACY_PUBLIC;
else if (strcmp(str, "prefered") == 0)
else if (strcmp(str, "preferred") == 0)
pd->actual.ipv6.method = EFL_NET_CONTROL_ACCESS_POINT_IPV6_METHOD_AUTO_PRIVACY_TEMPORARY;
else
WRN("Unexpected IPV6 Privacy value '%s'", str);
@ -1460,7 +1460,7 @@ _efl_net_control_access_point_property_configured_ipv6_changed(Eo *o EINA_UNUSED
pd->configured.ipv6.method = EFL_NET_CONTROL_ACCESS_POINT_IPV6_METHOD_AUTO_PRIVACY_NONE;
else if (strcmp(str, "enabled") == 0)
pd->configured.ipv6.method = EFL_NET_CONTROL_ACCESS_POINT_IPV6_METHOD_AUTO_PRIVACY_PUBLIC;
else if (strcmp(str, "prefered") == 0)
else if (strcmp(str, "preferred") == 0)
pd->configured.ipv6.method = EFL_NET_CONTROL_ACCESS_POINT_IPV6_METHOD_AUTO_PRIVACY_TEMPORARY;
else
WRN("Unexpected IPV6 Privacy value '%s'", str);

6
src/lib/eet/eet_data.c
View File

@ -2149,7 +2149,7 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
if (type < EET_T_UNKNOW ||
type >= EET_T_LAST)
{
CRI("Preventing later bug due to unknow type: %i", type);
CRI("Preventing later bug due to unknown type: %i", type);
return;
}
if (offset < 0)
@ -2869,7 +2869,7 @@ _eet_data_dump_token_get(const char *src,
TOK_ADD(p[0]);
break;
default:
ERR("Unknow escape character %#x (%c). Append as is",
ERR("Unknown escape character %#x (%c). Append as is",
p[0], p[0]);
TOK_ADD(p[0]);
}
@ -4585,7 +4585,7 @@ case Eet_Type: \
return eet_node_null_new(name);
default:
ERR("Unknow type passed to eet_data_node_simple_type");
ERR("Unknown type passed to eet_data_node_simple_type");
return NULL;
}
}

4
src/lib/eeze/eeze_disk_mount.c
View File

@ -122,7 +122,7 @@ _eeze_disk_mount_result_handler(void *data EINA_UNUSED, int type EINA_UNUSED, Ec
else
{
disk->mount_fail_count = 0;
_eeze_disk_mount_error_handler(disk, "Maximimum number of mount-related failures reached");
_eeze_disk_mount_error_handler(disk, "Maximum number of mount-related failures reached");
}
return ECORE_CALLBACK_RENEW;
}
@ -158,7 +158,7 @@ _eeze_disk_mount_result_handler(void *data EINA_UNUSED, int type EINA_UNUSED, Ec
else
{
disk->mount_fail_count = 0;
_eeze_disk_mount_error_handler(disk, "Maximimum number of mount-related failures reached");
_eeze_disk_mount_error_handler(disk, "Maximum number of mount-related failures reached");
}
return ECORE_CALLBACK_RENEW;
}

2
src/lib/eina/eina_array.c
View File

@ -310,7 +310,7 @@ eina_array_step_set(Eina_Array *array,
if (sizeof (Eina_Array) != sizeof_eina_array)
{
ERR("Unknow Eina_Array size ! Got %i, expected %i !\n",
ERR("Unknown Eina_Array size ! Got %i, expected %i !\n",
sizeof_eina_array,
(int) sizeof (Eina_Array));
/* Force memory to zero to provide a small layer of security */

2
src/lib/eina/eina_inarray.c
View File

@ -373,7 +373,7 @@ eina_inarray_step_set(Eina_Inarray *array,
if (sizeof (Eina_Inarray) != sizeof_eina_inarray)
{
ERR("Unknow Eina_Inarray size ! Got %i, expected %i\n",
ERR("Unknown Eina_Inarray size ! Got %i, expected %i\n",
sizeof_eina_inarray,
(int) sizeof (Eina_Inarray));
/* Force memory to zero to provide a small layer of security */

2
src/lib/elementary/efl_ui_image.c
View File

@ -40,7 +40,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_DOWNLOAD_ERROR, ""},
{SIG_LOAD_OPEN, "Triggered when the file has been opened (image size is known)"},
{SIG_LOAD_READY, "Triggered when the image file is ready for display"},
{SIG_LOAD_ERROR, "Triggered whenener an I/O or decoding error occured"},
{SIG_LOAD_ERROR, "Triggered whenener an I/O or decoding error occurred"},
{SIG_LOAD_CANCEL, "Triggered whenener async I/O was cancelled"},
{NULL, NULL}
};

2
src/lib/elementary/elm_atspi_bridge.c
View File

@ -1890,7 +1890,7 @@ _editable_text_text_insert(const Eldbus_Service_Interface *iface, const Eldbus_M
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
if (!eldbus_message_arguments_get(msg, "isi", &pos, &text, &len))
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Postion, string, length expected.");
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Position, string, length expected.");
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);

6
src/lib/elementary/elm_transit.c
View File

@ -589,7 +589,7 @@ elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb tr
EINA_INLIST_FOREACH(transit->effect_list, effect_module)
if ((effect_module->transition_cb == transition_cb) && (effect_module->effect == effect))
{
WRN("elm_transit does not allow to add the duplicated effect! : transit=%p", transit);
WRN("elm_transit does not allow one to add the duplicated effect! : transit=%p", transit);
return;
}
@ -792,7 +792,7 @@ elm_transit_duration_set(Elm_Transit *transit, double duration)
ELM_TRANSIT_CHECK_OR_RETURN(transit);
if (transit->animator)
{
WRN("elm_transit does not allow to set the duration time in operating! : transit=%p", transit);
WRN("elm_transit does not allow one to set the duration time in operating! : transit=%p", transit);
return;
}
transit->time.duration = duration;
@ -918,7 +918,7 @@ elm_transit_objects_final_state_keep_set(Elm_Transit *transit, Eina_Bool state_k
if (transit->state_keep == state_keep) return;
if (transit->animator)
{
WRN("elm_transit does not allow to change final state keep mode in operating! : transit=%p", transit);
WRN("elm_transit does not allow one to change final state keep mode in operating! : transit=%p", transit);
return;
}
transit->state_keep = !!state_keep;

2
src/lib/elocation/elocation.c
View File

@ -985,7 +985,7 @@ _name_owner_changed(void *data EINA_UNUSED, const char *bus EINA_UNUSED, const c
}
else
{
DBG("unknow change from %s to %s", old, new);
DBG("unknown change from %s to %s", old, new);
}
}

2
src/lib/emotion/emotion_smart.c
View File

@ -355,7 +355,7 @@ _efl_canvas_video_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *
if (!sd->engine_instance) _engine_init(obj, sd);
if (!sd->engine_instance)
{
WRN("No engine choosen. Please set an engine.");
WRN("No engine chosen. Please set an engine.");
return EINA_FALSE;
}

2
src/lib/evas/canvas/evas_object_image.c
View File

@ -3462,7 +3462,7 @@ _evas_image_data_convert_internal(Evas_Image_Data *o, void *data, Evas_Colorspac
break;
default:
WRN("unknow colorspace: %i\n", o->cur->cspace);
WRN("unknown colorspace: %i\n", o->cur->cspace);
break;
}

4
src/lib/evas/canvas/evas_object_table.c
View File

@ -405,13 +405,13 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data *
if (o_minw < 1)
{
ERR("homogeneous table based on item size but no "
"horizontal mininum size specified! Using expand.");
"horizontal minimum size specified! Using expand.");
expand_h = 1;
}
if (o_minh < 1)
{
ERR("homogeneous table based on item size but no "
"vertical mininum size specified! Using expand.");
"vertical minimum size specified! Using expand.");
expand_v = 1;
}
}

2
src/lib/evas/common3d/save_load/evas_model_load_save_common.c
View File

@ -165,7 +165,7 @@ evas_model_load_aabb_add_to_frame(Evas_Canvas3D_Mesh *mesh,
if (!evas_canvas3d_mesh_aabb_add_to_frame(pd, frame, stride.positions))
{
ERR("Axis-Aligned Bounding Box wan't added in frame %d ", 0);
ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", 0);
}
}

2
src/lib/evas/filters/evas_filter_parser.c
View File

@ -889,7 +889,7 @@ _lua_buffer_new(lua_State *L)
if (!_lua_instruction_run(L, instr))
{
_instruction_del(instr);
return luaL_error(L, "buffer instanciation failed");
return luaL_error(L, "buffer instantiation failed");
}
else
{

2
src/modules/ecore_imf/wayland/wayland_module.c
View File

@ -166,7 +166,7 @@ im_module_init(void)
ecore_imf_module_register(&wayland_im_info, im_module_create,
im_module_exit);
EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initalized");
EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initialized");
return EINA_TRUE;

46
src/modules/evas/engines/gl_common/evas_gl_api.c
View File

@ -226,7 +226,7 @@ _evgl_glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
ctx = evas_gl_common_current_context_get();
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -522,14 +522,14 @@ _evgl_glClear(GLbitfield mask)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -766,14 +766,14 @@ _evgl_glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -814,14 +814,14 @@ _evgl_glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget,
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -873,14 +873,14 @@ _evgl_glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderb
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -939,7 +939,7 @@ _evgl_glGetFloatv(GLenum pname, GLfloat* params)
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1082,7 +1082,7 @@ _evgl_glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GL
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1136,14 +1136,14 @@ _evgl_glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint* params)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1190,7 +1190,7 @@ _evgl_glGetIntegerv(GLenum pname, GLint* params)
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1424,7 +1424,7 @@ _evgl_glGetStringi(GLenum name, GLuint index)
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return NULL;
}
@ -1463,14 +1463,14 @@ _evgl_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum forma
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1517,14 +1517,14 @@ _evgl_glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1605,14 +1605,14 @@ _evgl_glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1720,7 +1720,7 @@ _evgl_glDrawBuffers(GLsizei n, const GLenum *bufs)
ctx = evas_gl_common_current_context_get();
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1776,7 +1776,7 @@ _evgl_glReadBuffer(GLenum src)
ctx = evas_gl_common_current_context_get();
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}

12
src/modules/evas/engines/gl_common/evas_gl_api_ext.c
View File

@ -277,14 +277,14 @@ _evgl_glEvasGLImageTargetTexture2D(GLenum target, EvasGLImage image)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -313,14 +313,14 @@ _evgl_glEvasGLImageTargetRenderbufferStorage(GLenum target, EvasGLImage image)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -432,14 +432,14 @@ _evgl_glDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenu
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}

22
src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
View File

@ -515,14 +515,14 @@ _evgl_gles1_glClear(GLbitfield mask)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -806,7 +806,7 @@ _evgl_gles1_glDisable(GLenum cap)
ctx = evas_gl_common_current_context_get();
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -860,7 +860,7 @@ _evgl_gles1_glEnable(GLenum cap)
ctx = evas_gl_common_current_context_get();
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1030,7 +1030,7 @@ _evgl_gles1_glGetIntegerv(GLenum pname, GLint *params)
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1472,14 +1472,14 @@ _evgl_gles1_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1571,14 +1571,14 @@ _evgl_gles1_glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}
@ -1818,14 +1818,14 @@ _evgl_gles1_glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
if (!rsc->current_eng)
{
ERR("Unable to retrive Current Engine");
ERR("Unable to retrieve Current Engine");
return;
}
ctx = rsc->current_ctx;
if (!ctx)
{
ERR("Unable to retrive Current Context");
ERR("Unable to retrieve Current Context");
return;
}

2
src/modules/evas/engines/gl_x11/evas_x_main.c
View File

@ -1359,7 +1359,7 @@ eng_gl_context_use(Context_3D *ctx)
#else
if (!__glXMakeContextCurrent(ctx->display, ctx->glxwin, ctx->context))
{
ERR("glXMakeContextCurrent(%p, %p, %p, %p) faild.",
ERR("glXMakeContextCurrent(%p, %p, %p, %p) failed.",
(void *)ctx->display, (void *)ctx->glxwin,
(void *)ctx->win, (void *)ctx->context);
}

2
src/modules/evas/model_loaders/obj/evas_model_load_obj.c
View File

@ -450,7 +450,7 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
if (!evas_canvas3d_mesh_aabb_add_to_frame(pd, 0, stride_pos))
{
ERR("Axis-Aligned Bounding Box wan't added in frame %d ", 0);
ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", 0);
}
if (map)

1
src/tests/efreet/data/sub/test.desktop
View File

@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Sub
Name[ca]=Sub

1
src/tests/efreet/data/test.desktop
View File

@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Efreet Test Application
Name[ca]=Aplicació de prova Efreet

1
src/tests/efreet/data/test_type.desktop
View File

@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=My_Type
Name=Efreet Test Application
Name[ca]=Aplicació de prova Efreet