Hello Thank you for your translation work on aptitude in the past. Recently aptitude received two different updates for zh_CN. One is from Aron Xu[1], the other YunQiang Su[2]. [1] http://bugs.debian.org/594526 [2] http://bugs.debian.org/630955 We are currently using [1]. I have now merged the changes from [2], which includes many more translations (thanks), but there are some conflicts. I attach the merged file (zh_CN.po.gz) and also a .diff containing the conflicts (aptitude_zh_CN.po.diff). Could someone please review the .diff to identify the changes which are preferred. I suspect that some will be and others not. Please provide an updated .po file with the final changes. Regards
Attachment:
zh_CN.po.gz
Description: GNU Zip compressed data
Attachment:
aptitude_zh_CN.po.diff
Description: Binary data