# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql
#   interface/web/admin/lib/lang/ar_server_config.lng
#   interface/web/admin/lib/lang/ar_system_config.lng
#   interface/web/admin/lib/lang/bg_server_config.lng
#   interface/web/admin/lib/lang/br_server_config.lng
#   interface/web/admin/lib/lang/ca_server_config.lng
#   interface/web/admin/lib/lang/cn_server_config.lng
#   interface/web/admin/lib/lang/cz_server_config.lng
#   interface/web/admin/lib/lang/de_server_config.lng
#   interface/web/admin/lib/lang/dk_server_config.lng
#   interface/web/admin/lib/lang/el_server_config.lng
#   interface/web/admin/lib/lang/en_server_config.lng
#   interface/web/admin/lib/lang/es_server_config.lng
#   interface/web/admin/lib/lang/fi_server_config.lng
#   interface/web/admin/lib/lang/fr_server_config.lng
#   interface/web/admin/lib/lang/hr_server_config.lng
#   interface/web/admin/lib/lang/hu_server_config.lng
#   interface/web/admin/lib/lang/id_server_config.lng
#   interface/web/admin/lib/lang/it_server_config.lng
#   interface/web/admin/lib/lang/ja_server_config.lng
#   interface/web/admin/lib/lang/nl_server_config.lng
#   interface/web/admin/lib/lang/pl_server_config.lng
#   interface/web/admin/lib/lang/pt_server_config.lng
#   interface/web/admin/lib/lang/ro_server_config.lng
#   interface/web/admin/lib/lang/ru_server_config.lng
#   interface/web/admin/lib/lang/se_server_config.lng
#   interface/web/admin/lib/lang/sk_server_config.lng
#   interface/web/admin/lib/lang/tr_server_config.lng