9e2b883d9998b947b9442a8c63e1c32b4edbac03 should be applied only to thumbs
update Japanese
French update : 1 typo
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.mo
	zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.po
	zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.mo
	zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.po

	modified:   zp-core/zp-extensions/cacheManager/cacheImages.php