Bug #3960 NavigationBarIconic config not honored
Translated using Weblate (Hindi)

Currently translated at 57.0% (1484 of 2603)
Translated using Weblate (Traditional Chinese)

Currently translated at 98.3% (2559 of 2603)
Translated using Weblate (Uighur)

Currently translated at 14.9% (388 of 2603)
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Merge pull request #440 from lem9/bug_3960_B

Bug #3960 NavigationBarIconic config not honored
Merge remote-tracking branch 'origin/QA_4_0'
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Merge remote-tracking branch 'origin/QA_4_0'

Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php