bug 1042826 - string re-org

grouping strings & fixing capitalization