Merge branch '2.0.x' of https://github.com/evolution-cms/evolution into evolution-cms-2.0.x

# Conflicts:
#	assets/plugins/updater/lang/japanese-utf8.php
#	commitizen.config.js
#	core/config/cms/observers.php
#	core/src/Controllers/AccessPermissions.php
#	core/src/Controllers/EventLogDetails.php
#	core/src/Controllers/ExportSite.php
#	core/src/Controllers/MoveDocument.php
#	core/src/Controllers/PluginPriority.php
#	core/src/Controllers/RoleManagment.php
#	core/src/Controllers/WebAccessPermissions.php
#	core/src/Core.php
#	core/src/Legacy/Phx.php
#	core/src/Observers/SiteContentObserver.php
#	core/src/Parser.php
#	core/src/Providers/BladeServiceProvider.php
#	core/src/Providers/ComposerServiceProvider.php
#	core/src/Providers/ObserversServiceProvider.php
#	core/src/Providers/PaginationServiceProvider.php
#	core/src/Support/BladeDirective.php
#	core/vendor/agelxnash/modx-evo-database/install/data/site_content.sql
#	install/stubs/sql/setup.sql
#	manager/includes/actionlist.inc.php
#	manager/includes/controls/datagrid.class.php
#	manager/includes/extenders/modxmailer.class.inc.php
#	manager/includes/version.inc.php
#	manager/media/browser/mcpuk/config.php
#	manager/media/browser/mcpuk/core/autoload.php
#	manager/media/browser/mcpuk/core/browser.php
#	manager/media/script/mutate_settings.js
#	manager/media/style/default/snippets/welcome/RecentInfo.php
#	manager/processors/login.processor.php
#	manager/processors/save_content.processor.php
#	manager/processors/save_settings.processor.php
#	manager/processors/save_user.processor.php
#	manager/processors/save_web_user.processor.php
#	manager/views/frame/1.blade.php
#	manager/views/page/move_document.blade.php
#	manager/views/page/plugin_priority.blade.php
#	manager/views/page/role_management.blade.php
#	package.json

Author: Dmi3yy

.tx/config

@@ -11,13 +11,13 @@ lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, f
 
 [modx-evolution.countrylist]
 file_filter = manager/includes/lang/country/<lang>_country.inc.php
-source_file = manager/includes/lang/country/english_country.inc.php
+source_file = manager/includes/country/english_country.inc.php
 source_lang = en
 type = PHP_ALT_ARRAY
 
 [modx-evolution.manager]
-file_filter = manager/includes/lang/<lang>.inc.php
-source_file = manager/includes/lang/english.inc.php
+file_filter = manager/includes/<lang>.inc.php
+source_file = manager/includes/english.inc.php
 source_lang = en
 type = PHP_ALT_ARRAY