[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a5839b: Start to fix bug #3921

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a5839bf23649f8c927d02d9d09b977e7fbbc70c3
      https://github.com/phpmyadmin/phpmyadmin/commit/a5839bf23649f8c927d02d9d09b977e7fbbc70c3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M libraries/Menu.class.php

  Log Message:
  -----------
  Start to fix bug #3921


  Commit: 50e01992067b2401310688da027a10ee652fd61d
      https://github.com/phpmyadmin/phpmyadmin/commit/50e01992067b2401310688da027a10ee652fd61d
  Author: Pl P <plamen_mbx at yahoo.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M po/bg.po

  Log Message:
  -----------
  Translated using Weblate (Bulgarian)

Currently translated at 76.8% (1998 of 2603)


  Commit: 168fa47420b921e7fb3c2430c5dbb04e71b26b3b
      https://github.com/phpmyadmin/phpmyadmin/commit/168fa47420b921e7fb3c2430c5dbb04e71b26b3b
  Author: Yungu Kim <crimsonpi at gmail.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 69.0% (1795 of 2603)


  Commit: f94103628de72414f28065a1643055fb93e11856
      https://github.com/phpmyadmin/phpmyadmin/commit/f94103628de72414f28065a1643055fb93e11856
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M libraries/Menu.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0


  Commit: e0d15c496c7fa0859dcfc70b043244d25841be77
      https://github.com/phpmyadmin/phpmyadmin/commit/e0d15c496c7fa0859dcfc70b043244d25841be77
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Log Message:
  -----------
  Merge commit 'f941036'


  Commit: c690e5279a66c1967ef4543b959fff956e1fd211
      https://github.com/phpmyadmin/phpmyadmin/commit/c690e5279a66c1967ef4543b959fff956e1fd211
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M libraries/Menu.class.php

  Log Message:
  -----------
  Fix merge conflict


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/541161bbcc7c...c690e5279a66