Merge branch 'translate-ja' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 9 Oct 2012 18:03:08 +0000 (20:03 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 9 Oct 2012 18:03:08 +0000 (20:03 +0200)

Trivial merge