Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c690f60f503c06d52b2bf32d51e6a85fef33fa5c https://github.com/phpmyadmin/phpmyadmin/commit/c690f60f503c06d52b2bf32d51e6... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 78.0% (2505 of 3211 strings) [CI skip] Commit: c8422b970063fae93e189e8b12758261f47ead1e https://github.com/phpmyadmin/phpmyadmin/commit/c8422b970063fae93e189e8b1275... Author: Weblate <noreply@weblate.org> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M ChangeLog M libraries/DisplayResults.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 07710e9aef5bf5890ddd8e0ebf5e9f907e787c12 https://github.com/phpmyadmin/phpmyadmin/commit/07710e9aef5bf5890ddd8e0ebf5e... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Log Message: ----------- Merge branch 'QA_4_6' Commit: 4ed47fc4b4f335849f66f026c57ce9364e225c30 https://github.com/phpmyadmin/phpmyadmin/commit/4ed47fc4b4f335849f66f026c57c... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M export.php A libraries/Encoding.php R libraries/charset_conversion.lib.php M libraries/common.inc.php M libraries/export.lib.php R libraries/iconv_wrapper.lib.php M libraries/import.lib.php A test/classes/EncodingTest.php M test/classes/plugin/export/ExportSqlTest.php R test/libraries/PMA_charset_conversion_test.php M test/libraries/PMA_display_export_test.php R test/libraries/PMA_iconv_wrapper_test.php M test/libraries/database_interface_test.php Log Message: ----------- Move charset conversion to a class Also removes ancient support for AIX iconv. Issue #11731 Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1b9ea10f11e1...4ed47fc4b4f3