remove git conflict string in properties file
translate utility // do not use this tool, use crowdin instead
Merge remote-tracking branch 'upstream/master'