Remove old vcs-clobbering-avoider comment

Unneeded in current development

(cherry picked from commit 67832e47cdac01e1bfc5d866f258b3b5ac401dee)

Change-Id: I6444fef4f0d652082c5f19067cd0a9a6a5634fbb
Add l10n stanzas to Makefile

Using work from SteveMc

(cherry picked from commit 97f94f2f3b0b4caee2982064019867cf15193b17)

Conflicts:
	Makefile

Change-Id: Ib1f48e38e88347471e5f2797861786dc9d9852d4