[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6c5867: Translated using Weblate (Hindi)

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6c5867a781a61d6caadfd4274ef9222f471ba420
      https://github.com/phpmyadmin/phpmyadmin/commit/6c5867a781a61d6caadfd4274ef9222f471ba420
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2015-08-23 (Sun, 23 Aug 2015)

  Changed paths:
    M po/hi.po

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

Currently translated at 41.5% (1262 of 3040 strings)

[CI skip]


  Commit: 2277628094a4c6c9fde9304e9309b165f6c43e5b
      https://github.com/phpmyadmin/phpmyadmin/commit/2277628094a4c6c9fde9304e9309b165f6c43e5b
  Author: Weblate <noreply at weblate.org>
  Date:   2015-08-23 (Sun, 23 Aug 2015)

  Changed paths:
    M ChangeLog
    M js/functions.js

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


  Commit: 8923d579ba26752e03f100eca555b59cf94816f9
      https://github.com/phpmyadmin/phpmyadmin/commit/8923d579ba26752e03f100eca555b59cf94816f9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ChangeLog
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  Fix #11421 Stored-proc / routine - broken parameter parsing

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


  Commit: 014e9bfe5b5d7b01ca34752eaf561fd941c9adf9
      https://github.com/phpmyadmin/phpmyadmin/commit/014e9bfe5b5d7b01ca34752eaf561fd941c9adf9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_4'

Conflicts:
	libraries/rte/rte_routines.lib.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bd707b871d15...014e9bfe5b5d