Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
Translated using Weblate (Slovak)

Currently translated at 80.2% (2205 of 2749)
Translated using Weblate (Korean)

Currently translated at 74.0% (2037 of 2749)
Translated using Weblate (Ukrainian)

Currently translated at 94.3% (2595 of 2749)
Translated using Weblate (Spanish)

Currently translated at 100.0% (2741 of 2741)
Remove commented debugging code. Replace tabs with spaces

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Remove trailing whitespaces

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Translated using Weblate (Turkish)

Currently translated at 100.0% (2741 of 2741)
Merge remote-tracking branch 'origin/master'
bug #4278 reCaptcha re-login requires double effort

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'QA_4_1'
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Rearange the order of export sql related user preferences

Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
#4272 Contest-4

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
Merge pull request #902 from vpowerrc/bug-#4272

#4272 Contest-4
ChangeLog entry for fix of bug #4272

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '1156b57'
Merge commit '65a56a8'
Merge branch 'QA_4_1'
bug fix 4271

Signed-off-by: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>