update
Merge branch 'master' of github.com:henrich/ja.po

Conflicts:
	debhelper/ja.po
Merge branch 'master' of github.com:henrich/ja.po