Translated using Weblate (Norwegian Bokmål)

Currently translated at 77.3% (1981 of 2562)
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
4.0.0-beta3
Translated using Weblate (Malay)

Currently translated at 13.8% (359 of 2606)
Merge remote-tracking branch 'origin/master'
Bug #3863 The column name 'name' is a MySQL reserved keyword.
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Translated using Weblate (Catalan)

Currently translated at 100.0% (2562 of 2562)
Translated using Weblate (Catalan)

Currently translated at 100.0% (2606 of 2606)
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Bug #3858 Incomplete error message when creating a foreign key constraint
Do not show table as tracked if request for deactivation has been submitted
Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (2606 of 2606)
Incorrect comment
Change mysqlDie() to return the error message when $exit parameter is false
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Conflicts:
	libraries/Util.class.php
Display the error returned by MySQL rather than the ambiguous "Error" message.
Translated using Weblate (Malay)

Currently translated at 14.5% (371 of 2562)
Update rte_triggers.lib.php

Editing a trigger with special characters
Merge pull request #221 from Rupreht/patch-1

Update rte_triggers.lib.php