Merge "Updates string resource" into tizen_2.2