add l10n to time/date of comments
resolve merge conflicts