Fix language string. The correct key is "timestamp" and not "date".
Merge branch 'master' into dev