[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0e2bd8: Translated using Weblate.

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0e2bd8098dbe6fc50fa2c80cdc5684ee3931000b
      https://github.com/phpmyadmin/phpmyadmin/commit/0e2bd8098dbe6fc50fa2c80cdc5684ee3931000b
  Author: Yuichiro Takahashi <yuichiro at pop07.odn.ne.jp>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M po/ja.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 6c8de87a89a45eeac6dd6e6e7daf8608f581bc0d
      https://github.com/phpmyadmin/phpmyadmin/commit/6c8de87a89a45eeac6dd6e6e7daf8608f581bc0d
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M libraries/Table.class.php
    M libraries/dbi/drizzle.dbi.lib.php

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


  Commit: 2cca49a9df0043e538aeea68dbbefc9f4fe41418
      https://github.com/phpmyadmin/phpmyadmin/commit/2cca49a9df0043e538aeea68dbbefc9f4fe41418
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M po/ja.po

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

Conflicts:
	po/ja.po


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fcfd974...2cca49a