[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 47c8d8: Merge remote-tracking branch 'origin/master'

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 47c8d85e81f6ee8e25e216591f687e41d9287bbf
      https://github.com/phpmyadmin/phpmyadmin/commit/47c8d85e81f6ee8e25e216591f687e41d9287bbf
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M js/server_privileges.js
    M libraries/DisplayResults.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/server_privileges.lib.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.po
    M po/ko.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/zh_CN.po
    M po/zh_TW.po

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 92cf5a5ee95236f73ca54751064ea3058cb7f7e3
      https://github.com/phpmyadmin/phpmyadmin/commit/92cf5a5ee95236f73ca54751064ea3058cb7f7e3
  Author: Dadan Setia <da2n_s at yahoo.co.id>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M po/id.po

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

Currently translated at 75.0% (2003 of 2672)


  Commit: dc180b4c15395c69ea04571404a8c3704c8dcc5b
      https://github.com/phpmyadmin/phpmyadmin/commit/dc180b4c15395c69ea04571404a8c3704c8dcc5b
  Author: Tony Chen <tonychen at finenet.com.tw>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M po/zh_TW.po

  Log Message:
  -----------
  Translated using Weblate (Traditional Chinese)

Currently translated at 90.4% (2410 of 2665)


  Commit: 6839a4c1b350cf59b7dea1c627f937da8e47a32e
      https://github.com/phpmyadmin/phpmyadmin/commit/6839a4c1b350cf59b7dea1c627f937da8e47a32e
  Author: Tony Chen <tonychen at finenet.com.tw>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M po/zh_TW.po

  Log Message:
  -----------
  Translated using Weblate (Traditional Chinese)

Currently translated at 90.2% (2410 of 2673)


  Commit: e22bbfd598c5fc650c81d42b534214b65568acf7
      https://github.com/phpmyadmin/phpmyadmin/commit/e22bbfd598c5fc650c81d42b534214b65568acf7
  Author: Dadan Setia <da2n_s at yahoo.co.id>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M po/id.po

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

Currently translated at 75.2% (2010 of 2672)


  Commit: a605fe4afc607ff683ac4dfcc78993538c106de2
      https://github.com/phpmyadmin/phpmyadmin/commit/a605fe4afc607ff683ac4dfcc78993538c106de2
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M po/id.po
    M po/zh_TW.po

  Log Message:
  -----------
  Merge remote-tracking branch 'weblate/master'

Conflicts:
	po/id.po
	po/zh_TW.po


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fd9588b37277...a605fe4afc60