Settings: Modify AOSP EL translations

Change-Id: I7e3a59412a2884c26a5eb165676e381d003f0fca
Settings: Fix the failing strings

Change-Id: I93865d793eef711f8738e00e843e9d4670724c66

Conflicts:

	res/values/strings.xml
Moove some string vanirifications to vanir_strings.xml

Change-Id: I53de8a37a24b1ce206dc1be3b1d36087e8edf916