Merge remote branch 'rtripault/fr-release-2.2' into release-2.2

* rtripault/fr-release-2.2:
  Updating French lexicon files
[#7063] Fix issue with retreiving Element Media Source cache data

$options needed to be sent to the methods for retrieving the media_sources
cache. Without this, xPDOFileCache is looking in 'default' folder while
we want it to look in 'media_sources' folder.
[#7066] Allow search locally in Package Management if cURL is not installed
[#7070] Do not overwrite user changes in default media sources during upgrade process
[#6611] Fix issue where MODx.Browser did not sort files by name by default
[#3818] Change modWebLink default responseCode to 301
Merge branch 'release-2.2' into develop

* release-2.2:
  [#3818] Change modWebLink default responseCode to 301
  [#6611] Fix issue where MODx.Browser did not sort files by name by default
  [#7070] Do not overwrite user changes in default media sources during upgrade process
  [#7066] Allow search locally in Package Management if cURL is not installed
  [#7063] Fix issue with retreiving Element Media Source cache data
  Updating French lexicon files

Conflicts:
	core/docs/changelog.txt
Improved some phrases in default.inc.php (stopgap not necessary anymore)

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
added option to limit to resource related context
added option to limit to resource related context
update lexion for tv input type resourcelist related values with option to limit to resource related context
[#7194] Fix issue where save button did not enable when reordering groups on user edit screen
[#7191] Fix invalid api doc link in link_tag_scheme description
[#7102] Improve memory_limit checks to properly check for values that are not formatted to PHP standards
[#7088] Tweak column widths for settings grids
Merge remote-tracking branch 'enigmatic-user/german_translation' into release-2.2
Merge remote-tracking branch 'alanpich/develop' into release-2.2

* alanpich/develop:
  [#6577] Fix incorrect MediaSource name in file manager
  It helps to use the most recent commit as a base...
  Corrected MediaSource name in File Manager drop-down
Merge branch 'release-2.2' into develop

* release-2.2:
  [#7088] Tweak column widths for settings grids
  [#7102] Improve memory_limit checks to properly check for values that are not formatted to PHP standards
  [#7191] Fix invalid api doc link in link_tag_scheme description
  [#7194] Fix issue where save button did not enable when reordering groups on user edit screen
  Improved some phrases in default.inc.php (stopgap not necessary anymore)
  [#6577] Fix incorrect MediaSource name in file manager
  It helps to use the most recent commit as a base...
  Corrected MediaSource name in File Manager drop-down
Fix media source dropdown in files tree
[#7061] Prevent Static Element access to the core/config/ directory