mx_lang
commit #2
before words replacing
test#1
part of admin-side i18n
some texts
translate shop module
translate admin pages
tatsdtasd
translate admin
delete exchange
translate admin
switcher
pull commit
Merge branch 'development' into i18n

Conflicts:
	application/modules/admin/admin.php
	application/modules/admin/admin_search.php
	application/modules/admin/languages.php
	application/modules/admin/settings.php
	application/modules/auth/auth.php
	application/modules/cfcm/templates/admin/group_list.tpl
	application/modules/comments/assets/comments_api.tpl
	application/modules/exchange/admin.php
	application/modules/exchange/exchange.php
	application/modules/exchange/module_info.php
	application/modules/exchange/templates/admin/settings.tpl
	application/modules/feedback/templates/feedback.tpl
	application/modules/gallery/gallery.php
	application/modules/gallery/templates/admin/album_list.tpl
	application/modules/gallery/templates/admin/edit_image.tpl
	application/modules/menu/templates/category_selector.tpl
	application/modules/menu/templates/create_item.tpl
	application/modules/menu/templates/edit_item.tpl
	application/modules/menu/templates/edit_item_origin.tpl
	application/modules/menu/templates/main.tpl
	application/modules/menu/templates/module_selector.tpl
	application/modules/menu/templates/url_selector.tpl
	application/modules/navigation/templates/widget_navigation.tpl
	application/modules/sample_module/assets/admin/settings.tpl
	application/modules/star_rating/admin.php
	application/modules/star_rating/assets/product_star_rating.tpl
	application/modules/star_rating/star_rating.php
	application/modules/tags/tags.php
	application/modules/user_manager/admin.php
	application/modules/user_manager/templates/create_group.tpl
	application/modules/user_manager/templates/create_user.tpl
	application/modules/user_manager/templates/edit_perms.tpl
	application/modules/user_manager/templates/edit_user.tpl
	application/modules/user_manager/templates/genreroletable.tpl
	application/modules/user_manager/templates/groups.tpl
	application/modules/user_manager/templates/groups_edit.tpl
	application/modules/user_manager/templates/main.tpl
	application/modules/user_manager/templates/users_table_search.tpl
	templates/administrator/_catlistitem.tpl
	templates/administrator/add_page.tpl
	templates/administrator/category_edit.tpl
	templates/administrator/category_list.tpl
	templates/administrator/cats_sidebar.tpl
	templates/administrator/cats_tree_css.tpl
	templates/administrator/create_cat.tpl
	templates/administrator/dashboard.tpl
	templates/administrator/desktop.tpl
	templates/administrator/edit_page.tpl
	templates/administrator/inc/menus.php
	templates/administrator/js/scripts.js
	templates/administrator/login.tpl
	templates/administrator/main.tpl
	templates/administrator/pages.tpl
	templates/administrator/roleEdit.tpl
	templates/administrator/settings.tpl
	templates/administrator/widget_edit_module.tpl
	templates/commerce/shop/_cart.tpl
	templates/commerce/shop/cart.tpl
	templates/commerce/shop/product.tpl
	templates/commerce/shop/profile.tpl
	templates/commerce/shop/sidebar.tpl
	templates/commerce4x/main.tpl
	templates/commerce4x/shop/brand.tpl
	templates/commerce4x/shop/cart.tpl
	templates/commerce4x/shop/category.tpl
	templates/commerce4x/shop/compare.tpl
	templates/commerce4x/shop/order_view.tpl
	templates/commerce4x/shop/product.tpl
	templates/commerce4x/shop/profile.tpl
	templates/commerce4x/shop/search.tpl
	templates/commerce4x/shop/wish_list.tpl
	templates/commerce4x/widgets/action_products.tpl
	templates/commerce4x/widgets/latest_news.tpl
	templates/commerce4x/widgets/new_products.tpl
	templates/commerce4x/widgets/popular_products.tpl
	templates/commerce4x/widgets/similar.tpl
	templates/commerce4x/widgets/similar_products.tpl
	templates/commerce4x/widgets/view_product.tpl
	templates/commerce_mobiles_new/shop/default/category.tpl
	templates/commerce_mobiles_new/shop/default/product.tpl
	templates/default/blog.tpl
	templates/default/main.tpl
fix
translate
translate
i18n conflicts
lang