Conflicts: modules/locale/views_handler_field_locale_language.inc modules/translation/views_handler_field_node_language.inc