[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9ef1e5: Merge remote-tracking branch 'origin/QA_4_1' into ...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9ef1e5ce0f7575bce29c33f7084f6847082dcb2a
      https://github.com/phpmyadmin/phpmyadmin/commit/9ef1e5ce0f7575bce29c33f7084f6847082dcb2a
  Author: Weblate <noreply at weblate.org>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M libraries/display_structure.inc.php
    M libraries/structure.lib.php

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


  Commit: 1a0d553a181c84be16dc0d3c0eff069d86670f9c
      https://github.com/phpmyadmin/phpmyadmin/commit/1a0d553a181c84be16dc0d3c0eff069d86670f9c
  Author: Jozef Pistej <pistej2 at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M po/sk.po

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

Currently translated at 80.2% (2205 of 2749)


  Commit: dc2ce8d4d701e5b0d457c28d45c774e8ce5623ec
      https://github.com/phpmyadmin/phpmyadmin/commit/dc2ce8d4d701e5b0d457c28d45c774e8ce5623ec
  Author: Yungu Kim <crimsonpi at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M po/ko.po

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

Currently translated at 74.0% (2037 of 2749)


  Commit: b872ebf9249e00e0ed83e10f18e9a607978ac3c0
      https://github.com/phpmyadmin/phpmyadmin/commit/b872ebf9249e00e0ed83e10f18e9a607978ac3c0
  Author: Oleksandr <chesterroy at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M po/uk.po

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

Currently translated at 94.3% (2595 of 2749)


  Commit: 59e3c9474acc807d068d2e6734bd06ca23d3e3b8
      https://github.com/phpmyadmin/phpmyadmin/commit/59e3c9474acc807d068d2e6734bd06ca23d3e3b8
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  bug #4278 reCaptcha re-login requires double effort

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: f65ac8803e1006b0f9d0b5b142e318e9aa242dc7
      https://github.com/phpmyadmin/phpmyadmin/commit/f65ac8803e1006b0f9d0b5b142e318e9aa242dc7
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Merge branch 'QA_4_1'


  Commit: 7eae60f326fa40952c8884767c043c19836e1469
      https://github.com/phpmyadmin/phpmyadmin/commit/7eae60f326fa40952c8884767c043c19836e1469
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1b25c79d2a5f...7eae60f326fa