Translation - Separating AOSP and CM strings

Change-Id: I18b8456d2fe74181402c9fa9f6cab8e996434cfc
Merge remote branch 'cm/cm-10.1' into cm-10.1