Merge branch 'translation' of...

Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation

Merge branch 'translation' of...
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
546d286e · unknown · dbd0a99a · e2431c02 · 546d286e · 546d286e
Commit 546d286e authored Mar 04, 2011 by unknown
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
--- a/cockatrice/translations/cockatrice_ja.ts
+++ b/cockatrice/translations/cockatrice_ja.ts