made notifications localization friendly.
Merge branch 'notifications_fix'