The branch, master has been updated via 8c6e88002232949f539b989b73cb97a6e5ff3eca (commit) via 7f817f50eba7d7bc8bab407000c7f7e0cb2ba914 (commit) from 4aa470e27e354c30865d6c78eec4de7653759859 (commit)

- Log ----------------------------------------------------------------- commit 8c6e88002232949f539b989b73cb97a6e5ff3eca Merge: 4aa470e27e354c30865d6c78eec4de7653759859 7f817f50eba7d7bc8bab407000c7f7e0cb2ba914 Author: Michal Čihař mcihar@suse.cz Date: Wed Jun 22 11:17:52 2011 +0200

Merge remote-tracking branch 'pootle/master'

commit 7f817f50eba7d7bc8bab407000c7f7e0cb2ba914 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Jun 22 11:17:40 2011 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: po/ja.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ja.po b/po/ja.po index 88a6d19..983e7c6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-22 10:16+0200\n" -"PO-Revision-Date: 2011-06-21 12:38+0200\n" +"PO-Revision-Date: 2011-06-22 11:17+0200\n" "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n" "Language-Team: japanese jp@li.org\n" "Language: ja\n" @@ -290,7 +290,7 @@ msgstr "データベース %s を削除しました"

#: db_operations.php:457 msgid "Drop the database (DROP)" -msgstr "データベースを削除する(DROP)" +msgstr "データベースを削除する (DROP)"

#: db_operations.php:487 msgid "Copy database to"

hooks/post-receive