summaryrefslogtreecommitdiff
path: root/lang/zh/conflict.txt
Commit message (Expand)AuthorAge
* zh translationandi2005-01-19