Update debian directory which was out of date (Daniel German)
Add Japanese translation (by Hiroshi Saito)
Merge branch 'upstream' into gtk3

Conflicts:
	po/Makefile.in.in