Move translations I made in strings.xml to  custom_strings.xml

Change-Id: I63f0ae2840a34f44cb6a63c62db6703702501302
Merge "Move translations I made in strings.xml to  custom_strings.xml" into du44