Translation feedback - Add contextual marker for short strings

This commit add contextual markers to some short strings
which turned out difficult to distinguish during translations.

The detail descriptions are available in the bug report.
Closes-Bug: #1367104

Change-Id: I5ec2045b12542c8474356023bed73d583dc8dccd
Merge "Translation feedback - Add contextual marker for short strings"