Commits

zhaopingsun committed d338b1e

part of chap 1 and 2 translated

Comments (0)

Files changed (1)

 "You can enable the extension in the usual way, by editing your <filename>~/."
 "hgrc</filename> file."
 msgstr ""
+"你可以通过常用的方式,编辑<filename>~./hgrc</filename>文件来使用这个扩展。"
 
 #. type: Content of: <book><appendix><sect1><para>
 #: ../en/appA-svn.xml:59
 "<option role=\"hg-ext-mq-cmd-qfold-opt\">-e</option>: Edit the commit message "
 "and patch description for the newly folded patch."
 msgstr ""
+"<option role=\"hg-ext-mq-cmd-qfold-opt\">-e</option>:为新创建的补丁编辑提交信"
+"息和补丁说明。"
 
 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/appB-mq-ref.xml:116
 "given file as the new commit message and patch description for the folded "
 "patch."
 msgstr ""
+"<option role=\"hg-ext-mq-cmd-qfold-opt\">-l</option>: 使用给定文件的内容作为创"
+"建补丁新的提交信息和补丁说明。"
 
 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/appB-mq-ref.xml:121
 "revision control is important, the field was then so new that there was "
 "almost no published literature to refer people to."
 msgstr ""
+"数年之前,当我想解释为什么我相信分布式版本控制非常重要的时候,这个领域实在太新"
+"了,几乎没有公开的文献供人们参考。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:15
 "idea that revision control ought to be distributed in nature.  I publish the "
 "book online under a liberal license for the same reason: to get the word out."
 msgstr ""
+"虽然在那个时候,我已经在Mercurial的内核上花了一些时间,我转而写这本书是因为我"
+"发现这可能是帮助软件吸引更多用户,和让大家接受版本控制本质上就应该是分布式的最"
+"有效的方式,我把这本书在网上以自由许可的方式发布也是基于同样的原因:让大家都了"
+"解。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:23
 "How do I use it? In this book, I try to answer those questions for "
 "distributed revision control in general, and for Mercurial in particular."
 msgstr ""
+"一本好的关于软件的书应该和讲故事类似:这是个什么东西?为什么需要它?它会怎样帮"
+"助我?我怎么使用它?本书中,我会为分布式版本控制回答这些问题,特别是"
+"Mercurial。"
 
 #. type: Content of: <book><preface><sect1><title>
 #: ../en/ch00-preface.xml:31
 "which provides clerical and legal support to Mercurial and a number of other "
 "prominent and worthy open source software projects."
 msgstr ""
+"通过购买此书,你支持了开源和自由软件的持续发展和自由,特别是Mercurial。"
+"O'Reilly Media和我将本书的收入捐献给Software Freedom Conservancy (<ulink url="
+"\"http://www.softwarefreedom.org/\">http://www.softwarefreedom.org/</ulink>) ,"
+"这个组织为Mercurial和其他一些有潜力和价值的开源软件项目提供了办公和法律支持。"
 
 #. type: Content of: <book><preface><sect1><title>
 #: ../en/ch00-preface.xml:45
 "author and project lead of Mercurial.  He is ably assisted by hundreds of "
 "volunteer contributors across the world."
 msgstr ""
+"没有Matt Mackall,Mercurial项目的开发者和领导的努力,这本书不可能存在。他得到"
+"了全球数以百计的志愿者的帮助。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:52
 "Ritter, Bonnie Corwin, James Vasile, Matt Norwood, Eben Moglen, Bradley Kuhn, "
 "Robert Walsh, Jeremy Fitzhardinge, Rachel Chalmers."
 msgstr ""
+"我的同事和朋友以各种方式提供了帮助和支持,这里的名单非常不全:Stephen Hahn, "
+"Karyn Ritter, Bonnie Corwin, James Vasile, Matt Norwood, Eben Moglen, Bradley "
+"Kuhn, Robert Walsh, Jeremy Fitzhardinge, Rachel Chalmers."
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:62
 "the comment system was live for only about two months towards the end of the "
 "writing process."
 msgstr ""
+"我以开放的方式完成了本书,当我完成各章的草稿后,就将其放在了网上。读者可以使用"
+"我开发的一个网络程序提交反馈。到我完成本书时,有100多人提交了评论。考虑到评论"
+"系统是在写作完成之前两个月才开放的,这是一个惊人的数字。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:70
 "contributed over a third of the total number of comments.  I would like to "
 "thank them for their care and effort in providing so much detailed feedback."
 msgstr ""
+"我特别希望认识以下人员,他们中有的人提交了超过总数三分之一的评论。我要感谢他们"
+"的关心和努力,提供了那么多详细的反馈。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:75
 msgid ""
 "I also want to acknowledge the help of the many people who caught errors and "
 "provided helpful suggestions throughout the book."
-msgstr ""
+msgstr "我同样要感谢许多在书中找出错误和提供了有帮助的建议的人。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:84
 "hand: every time you modify a file, save it under a new name that contains a "
 "number, each one higher than the number of the preceding version."
 msgstr ""
+"版本控制是管理一些信息的多个版本的过程。它最简单的形式莫过于:每次你修改一个文"
+"件后都重新命名保存,文件名中包含一个数字,每次修改后这个数字都增加。这通常是许"
+"多人手工完成的。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch01-intro.xml:16
 "modern revision control tools have no problem coping with thousands of people "
 "working together on projects that consist of hundreds of thousands of files."
 msgstr ""
+"然而,手工管理即使是一个文件的多个版本也是很容易出错的,所以很早就有软件工具来"
+"使这个过程自动化。最早的自动化软件管理工具的目标是帮助一个用户管理一个文件的版"
+"本。在过去的几十年里,版本控制工具的范围得到极大扩展;现在它们可以管理多个文"
+"件,帮助许多人一起工作。最新的版本控制工具可以支持上包含成数十万个文件,几千个"
+"人一起工作的项目。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch01-intro.xml:27
 "this new field has grown due to people's willingness to explore ill-charted "
 "territory."
 msgstr ""
+"分布式版本控制是最近才出现的,但是由于人们愿意探索新的疆域,目前这一新的领域已"
+"经得到了长足的发展"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch01-intro.xml:31
 "yet it scales to the demands of real, challenging environments where many "
 "other revision control tools buckle."
 msgstr ""
+"我写这本关于分布式版本控制的书是因为我相信这个领域应该有一个指南。我选择"
+"Mercurial是因为它是在这个领域中学习最容易上手的工具,并且它能够满足真实的,挑"
+"战性的环境的要求,而其他版本控制工具只能望而兴叹。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch01-intro.xml:39
 "There are a number of reasons why you or your team might want to use an "
 "automated revision control tool for a project."
 msgstr ""
+"为什么你或者你的团队可能需要在项目中使用自动化版本控制工具呢?有很多理由。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch01-intro.xml:46
 "<emphasis>why</emphasis> they made it; <emphasis>when</emphasis> they made "
 "it; and <emphasis>what</emphasis> the change was."
 msgstr ""
+"因为它能记录你的项目的历史和演化,所以你不必再给每个变更都记录日志,<emphasis>"
+"谁</emphasis>做的;<emphasis>为什么</emphasis>他们这样做;<emphasis>什么时候</"
+"emphasis>做的;做了<emphasis>什么</emphasis>修改。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch01-intro.xml:53
 "simultaneously make potentially incompatible changes, the software will help "
 "you to identify and resolve those conflicts."
 msgstr ""
+"当你和其他人一起工作的时候,版本控制工具让你合作的更容易。例如,当许多人或多或"
+"少的同时进行有可能冲突的修改的时候,软件可以帮助你确定和解决这些冲突。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch01-intro.xml:59
 "will even help you to efficiently figure out exactly when a problem was "
 "introduced (see <xref linkend=\"sec:undo:bisect\"/> for details)."
 msgstr ""
+"它能帮助你修正错误。如果你做了一个修改,但是后来发现这是个错误,你能恢复到一个"
+"或者多个文件以前的版本。实际上,一个<emphasis>相当</emphasis>好的版本控制工具"
+"甚至会帮助你找出什么什么是时候引入的这个问题(详细信息参考<xref linkend=\"sec:"
+"undo:bisect\"/>)。 "
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch01-intro.xml:66
 msgid ""
 "It will help you to work simultaneously on, and manage the drift between, "
 "multiple versions of your project."
-msgstr ""
+msgstr "它能帮助你同时工作于项目的多个版本,并管理它们的差异。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:71
 "whether you're working on a project by yourself, or with a hundred other "
 "people."
 msgstr ""
+"大多数这些理由都是等效的&emdash;至少在理论上&emdash;不管你是一个人做项目还是和"
+"几百个人一起。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:76
 "emphasis>.  A revision control tool that's difficult to understand or use is "
 "going to impose a high cost."
 msgstr ""
+"版本控制在在不同尺度上(<quote>单个黑客</quote>和<quote>一个大项目组</quote>)"
+"实践的一个关键问题是它的<emphasis>性价</emphasis>比怎么样。一个很难理解和使用"
+"的版本控制工具会让你的代价很高。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:84
 "the cost of using revision control might hardly seem worth considering, since "
 "<emphasis>without</emphasis> it, failure is almost guaranteed."
 msgstr ""
+"如果没有版本控制工具和过程,一个五百人的项目很快就可能就将自己压垮。在这种情况"
+"下,版本控制的代价基本上不用考虑,因为没有它,失败几乎是一定的。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:91
 "poor place to use a revision control tool, because surely the cost of using "
 "one must be close to the overall cost of the project.  Right?"
 msgstr ""
+"另一方面,一个人的<quote>快速编程</quote>看起来并不适合使用版本控制工具,因为"
+"使用一个版本控制工具的代价就是整个项目的代价,对吧?"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:96
 "performance and peer-to-peer nature let you scale painlessly to handle large "
 "projects."
 msgstr ""
+"Mercurial的独特之处就是它<emphasis>同时</emphasis>支持这两种尺度的开发。你可以"
+"在几分钟之内学会基本的使用,因为代价很小,你可以很方便的在最小的项目上应用版本"
+"管理。它的简洁性意味着不会有很多艰深的概念和命令干扰你<emphasis>真正</"
+"emphasis>的工作。同时,Mercurial高性能和点对点的特性可以让你轻易的应对大的项"
+"目。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:106
 "of tools can make a huge difference to the fluidity with which you can work "
 "on a project."
 msgstr ""
+"没有一个版本控制工具能拯救一个糟糕的项目,但是在项目中选择好的工具会大大的提高"
+"效率,正是工欲善其事,必先利其器。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch01-intro.xml:113
 "many names and acronyms.  Here are a few of the more common variations you'll "
 "encounter:"
 msgstr ""
+"版本控制是一个各自为政的领域,以至于有很多名称和缩略语,下面是你可能遇到的一些"
+"常用的术语:"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch01-intro.xml:119
 "practice they overlap so much that there's no agreed or even useful way to "
 "tease them apart."
 msgstr ""
+"有些人声称这些术语有不同的含义,但实际上它们的含义太重叠了,根本没有一致的,甚"
+"至有用的方式来区别它们。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch01-intro.xml:135
 "times you see in the output of commands.  But <emphasis>do</emphasis> be "
 "confident that the behavior you're seeing is consistent and reproducible."
 msgstr ""
+"所以当你研究这些例子的时候,不要太注意命令输出的日期和时间。但是<emphasis>要</"
+"emphasis>保证你看到的行为是一致的和可以再现的。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch01-intro.xml:173
 "control tools over the past four decades, as people have become familiar with "
 "the capabilities of their tools and constrained by their limitations."
 msgstr ""
+"在过去的四十年中,随着人们越来越熟悉他们的工具的能力和限制,开发和使用版本控制"
+"工具出现了明确的趋势。 "
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch01-intro.xml:180
 "control, their locking model and reliance on a single computer limited them "
 "to small, tightly-knit teams."
 msgstr ""
+"在第一代软件开始于在个人计算机上管理单个文件。虽然这些工具比手工管理版本有了巨"
+"大的飞跃。但是加锁模型和依赖于单个计算机限制了他们之能用于小的,组织严密的团"
+"队。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch01-intro.xml:186
 "found that they could not use the tools to interact with a project in a "
 "natural way, as they could not record their changes."
 msgstr ""
+"第二代软件因为采用以网络为中心的结构,一次性管理整个项目而放松了这些限制。随着"
+"项目增长,又出现了新的问题。客户需要频繁的和服务器交互,服务器的可伸缩性成为大"
+"项目的主要问题。不可靠的网络会妨碍客户和服务器的交互。随着开源项目开始开放只读"
+"权限给匿名用户,没有提交权限的用户发现他们不能以自然的方式使用工具和项目交互,"
+"因为他们不能记录他们的修改。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch01-intro.xml:198
 "offline indefinitely and autonomously, with a network connection only needed "
 "when syncing changes with another repository."
 msgstr ""
+"新一代的版本控制工具本质上是点对点的。所有的这些系统都抛弃了对单个中央服务器的"
+"依赖,允许用户发布他们的版本控制数据到任何需要的地方。通过互联网的协作摆脱了技"
+"术的限制,走向选择和审查。现代的工具可以进行自治的,不受限制的离线操作。只需要"
+"在有网络的时候和其他的仓库同步即可。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch01-intro.xml:210
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.