zhaopingsun avatar zhaopingsun committed 8325801

5.8 first 2 paras zh translated

Comments (0)

Files changed (1)

 msgstr ""
 "这个选项在以下情况下十分有用,否则就很令人费解:一个文件如果用<command role="
 "\"hg-cmd\">hg status</command>查看,显示的状态是被修改了,但是如果用<command "
-"role=\"hg-cmd\">hg diff</command>检查,却什么输出也没有。如果我们修改了文件的执行"
-"属性就会出现这种情况。"
+"role=\"hg-cmd\">hg diff</command>检查,却什么输出也没有。如果我们修改了文件的"
+"执行属性就会出现这种情况。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:710
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch05-daily.xml:720
 msgid "Which files to manage, and which to avoid"
-msgstr "需要管理哪些文件,应该避免的事情"
+msgstr "哪些文件需要管理,那些不需要"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:722
 "from one revision to the next.  Some centralized revision control systems can "
 "also deal tolerably well with binary files, such as bitmap images."
 msgstr ""
+"版本控制系统最擅长管理人们书写的文本文件,例如源代码,不同的版本间文件的改动不"
+"会很大。集中式版本控制系统可以很好的出来二进制文件,例如位图文件。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:728
 "code and all of its binary assets (e.g. geometry data, textures, map layouts) "
 "in a revision control system."
 msgstr ""
+"例如,一个典型的游戏开发团队不仅要在版本控制系统中管理源代码,还要管理二进制财"
+"产(像地理数据,贴图,地图布局)。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:733
 "allow a user to say <quote>I am the only person who can edit this file</"
 "quote>."
 msgstr ""
+"因为一般不可能合并两个冲突的二进制文件,集中式系统通常提供文件锁机制来解决这个"
+"问题。它允许一个用户说 <quote> 我是唯一能修改这个文件的人</quote>。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:739
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.