reformat and reorder de-values/strings.xml part 2