Update Notifications strings
Merge remote-tracking branch 'upstream/master'