Apparantly I was messed with a repo-copy I have did in our local

repository, fix the mismerge with the real version of this file.
This commit is contained in:
Xin LI 2006-03-15 20:10:09 +00:00
parent 827fa0cbc0
commit 816c915689
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=27349

View file

@ -1,69 +1,24 @@
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Documentation Project
$FreeBSD$
Names and email address of contributing authors and CVS committers.
Entity names for committers should be the same as their login names on
freefall.FreeBSD.org.
Use these entities when referencing people.
Please keep this list in alphabetical order by entity names.
IMPORTANT: If you delete names from this file you *must* ensure that
all references to them have been removed from the handbook's
translations. If they haven't then you *will* break the
builds for the other languages, and we will poke fun of you
in public.
Names to be inserted into <author>...</author>.
XXX So far DocBook does NOT allow <email>...</email> in them.
-->
<!--
Chinese Names delphij is aware of. Please contact delphij@FreeBSD.org
if you know more.
-->
<!ENTITY author.cn.delphij "<firstname>Àî</firstname><surname>öÎ</surname>">
<!ENTITY a.clive "주땜尿 <email>clive@FreeBSD.org</email>">
<!ENTITY author.cn.intron "<firstname>intron@intron.ac</firstname>">
<!ENTITY a.clsung "芥漣징 <email>clsung@FreeBSD.org</email>">
<!ENTITY author.cn.spellar "<firstname>spellar</firstname><surname>@SMTH</surname>">
<!ENTITY a.davidxu "其惱룡 <email>davidxu@FreeBSD.org</email>">
<!ENTITY author.cn.coolcoold "<firstname>coolcoold</firstname>">
<!ENTITY a.delphij "쟀則 <email>delphij@FreeBSD.org</email>">
<!ENTITY author.cn.jerome "<firstname>Shi</firstname><surname>Jerome</surname>">
<!ENTITY a.foxfair "빚磎봉 <email>foxfair@FreeBSD.org</email>">
<!ENTITY author.cn.stoneboy "<firstname>Jokhva</firstname>">
<!ENTITY a.hsu "其츌쌤 <email>hsu@FreeBSD.org</email>">
<!ENTITY author.cn.susn "<firstname>susn</firstname><surname>@NewSMTH</surname>">
<!ENTITY a.ijliao "죔亶쌤 <email>ijliao@FreeBSD.org</email>">
<!ENTITY a.keichii "喬쓴禱 <email>keichii@FreeBSD.org</email>">
<!ENTITY a.kevlo "쭈剋소寬 <email>kevlo@FreeBSD.org</email>">
<!ENTITY a.leeym "쟀珞츠 <email>leeym@FreeBSD.org</email>">
<!ENTITY a.pat "쟀暾씰 <email>pat@FreeBSD.org</email>">
<!ENTITY a.vanilla "其힛揭 <email>vanilla@FreeBSD.org</email>">
<!--
Names and email address of Chinese local contributing authors and
cvs.freebsd.org.cn CVS committers.
Entity names for committers should be the same as their login
names on cvs.freebsd.org.cn.
-->
<!ENTITY a.cn.alu "쩍베洛 <email>alu@FreeBSD.org.cn</email>">
<!ENTITY a.cn.delphij "쟀則 <email>delphij@FreeBSD.org.cn</email>">
<!ENTITY a.cn.gavin "컫접낚 <email>gavin@FreeBSD.org.cn</email>">
<!ENTITY a.cn.ld "쟀뵈都 <email>ld@FreeBSD.org.cn</email>">
<!ENTITY a.cn.wjf "侊에룟 <email>wjf@FreeBSD.org.cn</email>">
<!ENTITY a.cn.yarshure "왝卷꺼 <email>yarshure@FreeBSD.org.cn</email>">
<!ENTITY author.cn.suntosun "<firstname>sunlecn@gmail.com</firstname>">