1.1 --- a/po/zh.po	Tue Mar 17 16:09:57 2009 +0800
     1.2 +++ b/po/zh.po	Tue Mar 17 16:25:30 2009 +0800
     1.3 @@ -65,12 +65,12 @@
     1.4  #. type: Content of: <book><bookinfo><authorgroup><author><firstname>
     1.5  #: ../en/00book.xml:50
     1.6  msgid "Bryan"
     1.7 -msgstr ""
     1.8 +msgstr "Bryan"
     1.9  
    1.10  #. type: Content of: <book><bookinfo><authorgroup><author><surname>
    1.11  #: ../en/00book.xml:51
    1.12  msgid "O'Sullivan"
    1.13 -msgstr ""
    1.14 +msgstr "O'Sullivan"
    1.15  
    1.16  #. type: Content of: <book><bookinfo>
    1.17  #: ../en/00book.xml:55
    1.18 @@ -79,6 +79,9 @@
    1.19  "<copyright> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</"
    1.20  "year> <holder>Bryan O'Sullivan</holder> </copyright>"
    1.21  msgstr ""
    1.22 +"<editor> <firstname>Mike</firstname> <surname>Loukides</surname> </editor> "
    1.23 +"<copyright> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</"
    1.24 +"year> <holder>Bryan O'Sullivan</holder> </copyright>"
    1.25  
    1.26  #. type: Content of: <book><appendix><title>
    1.27  #: ../en/appA-cmdref.xml:4
    1.28 @@ -1665,27 +1668,27 @@
    1.29  #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
    1.30  #: ../en/ch01-intro.xml:104
    1.31  msgid "Revision control (RCS)"
    1.32 -msgstr ""
    1.33 +msgstr "版本控制(RCS)"
    1.34  
    1.35  #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
    1.36  #: ../en/ch01-intro.xml:105
    1.37  msgid "Software configuration management (SCM), or configuration management"
    1.38 -msgstr ""
    1.39 +msgstr "软件配置管理(SCM)，或配置管理"
    1.40  
    1.41  #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
    1.42  #: ../en/ch01-intro.xml:107
    1.43  msgid "Source code management"
    1.44 -msgstr ""
    1.45 +msgstr "源代码管理"
    1.46  
    1.47  #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
    1.48  #: ../en/ch01-intro.xml:108
    1.49  msgid "Source code control, or source control"
    1.50 -msgstr ""
    1.51 +msgstr "源代码控制，或源控制"
    1.52  
    1.53  #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
    1.54  #: ../en/ch01-intro.xml:110
    1.55  msgid "Version control (VCS)"
    1.56 -msgstr ""
    1.57 +msgstr "版本控制(VCS)"
    1.58  
    1.59  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.60  #: ../en/ch01-intro.xml:112
    1.61 @@ -15786,7 +15789,7 @@
    1.62  msgstr ""
    1.63  
    1.64  #
    1.65 -#. 	&example.hg-interdiff; 
    1.66 +#. 	&example.hg-interdiff;
    1.67  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.68  #: ../en/ch13-mq-collab.xml:465
    1.69  msgid ""