Japanese translation 2014
Japanese translation few update
French Update
Prevent non-integer numbers in links
Merge pull request #641 from SubJunk/master

Prevent non-integer numbers in links
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
	zp-core/template-functions.php