[svnbook commit] r3494 - * src/zh/po/svnbook.po:
codesite-noreply at google.com
codesite-noreply at google.com
Sat Apr 18 01:49:44 CDT 2009
Author: songdongsheng at live.cn
Date: Fri Apr 17 23:49:24 2009
New Revision: 3494
Modified:
trunk/src/zh/po/svnbook.po
Log:
* src/zh/po/svnbook.po:
2164 translated messages, 1145 fuzzy translations, 329 untranslated
messages.
Modified: trunk/src/zh/po/svnbook.po
==============================================================================
--- trunk/src/zh/po/svnbook.po (original)
+++ trunk/src/zh/po/svnbook.po Fri Apr 17 23:49:24 2009
@@ -37,7 +37,7 @@
msgstr ""
"Project-Id-Version: svnbook 1.6\n"
"POT-Creation-Date: 2009-04-17 13:51+0800\n"
-"PO-Revision-Date: 2009-04-17 14:17+0800\n"
+"PO-Revision-Date: 2009-04-18 14:37+0800\n"
"Last-Translator: 宋冬生 <songdonogsheng at live.cn>\n"
"Language-Team: Simplified Chinese <i18n-zh at googlegroups.com >\n"
"MIME-Version: 1.0\n"
@@ -5955,7 +5955,6 @@
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
#: ../../en/book/ch02-basic-usage.xml:686
-#, fuzzy
msgid ""
"You can use the commands <command>svn status</command>, <command>svn
diff</"
"command>, and <command>svn revert</command> without any network access
even "
@@ -5964,10 +5963,11 @@
"network connection, such as traveling on an airplane, riding a commuter "
"train, or hacking on the beach. <placeholder type=\"footnote\"
id=\"0\"/>"
msgstr ""
-"这三个命令(<command>svn status</command>, <command>svn diff</command>和"
-"<command>svn revert</command>)都可以在没有网络的情况下工作(假定你的版本库
是通"
-"过网络而不是本地访问的),这让你在没有网络连接时的管理修改过程更加容易,像
在飞"
-"机上旅行,乘坐火车往返或是在海滩上奋力工作时。<placeholder-1/>"
+"你可以在没有网络的情况下使用 <command>svn status</command>, <command>svn "
+"diff</command> 和 <command>svn revert</command>,纵然你的版本库
<emphasis>是</"
+"emphasis>通过网络而不是本地访问的)。这让你在没有网络连接时的管理修改过程更
加容"
+"易,像在飞机上旅行,乘坐火车往返或是在海滩上奋力工作时。<placeholder
type="
+"\"footnote\" id=\"0\"/>"
#. type: Content of:
<book><chapter><sect1><sect2><sidebar><para><footnote><para>
#: ../../en/book/ch02-basic-usage.xml:695
@@ -5976,7 +5976,6 @@
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
#: ../../en/book/ch02-basic-usage.xml:700
-#, fuzzy
msgid ""
"Subversion does this by keeping private caches of pristine versions of
each "
"versioned file inside the <filename>.svn</filename> administrative
areas. "
@@ -5989,15 +5988,14 @@
"you have a fast Internet connection, it's much faster to send only a
file's "
"changes rather than the whole file to the server."
msgstr ""
-"Subversion通过在<filename>.svn</filename>管理区域使用原始的版本缓存来做到
这一"
-"点,这使得报告和恢复本地修改而<emphasis>不必访问网络</emphasis>,这个缓存
(叫做"
-"<quote>text-base</quote>)也允许Subversion可以根据原始版本生成一个压缩的增
量"
-"(<quote>区别</quote>) 提交―即使你有个非常快的网络,有这样一个缓存有极大的
好"
-"处,只向服务器提交修改的部分而不是整个文件。"
+"Subversion 通过在 <filename>.svn</filename> 管理区域使用原始的版本缓存来做
到这"
+"一点。这使得报告和恢复本地修改而<emphasis>不必访问网络</emphasis>。这个缓
存(称"
+"为 <quote>text-base</quote>)也允许 Subversion 根据原始版本生成一个压缩的增
量"
+"(<quote>差异</quote>)提交本地修改。即使你有个非常快的网络,这个缓存也有极
大的"
+"好处—只向服务器提交修改的部分而不是整个文件的操作更快。"
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:717
-#, fuzzy
msgid ""
"Subversion has been optimized to help you with this task, and it is able
to "
"do many things without communicating with the repository. In
particular, "
@@ -6007,10 +6005,10 @@
"changed or even allow you to undo your changes without contacting the "
"repository."
msgstr ""
-"Subversion已经被优化来帮助你完成这个任务,可以在不与版本库通讯的情况下做许
多事"
-"情,详细来说,对于每一个文件,你的的工作副本在<filename>.svn</filename>包
含了"
-"一个<quote>原始的</quote>拷贝,所以Subversion可以快速的告诉你那些文件修改
了,"
-"甚至允许你在不与版本库通讯的情况下恢复修改。"
+"Subversion 已经被优化来帮助你完成这个任务,可以在不与版本库通讯的情况下做
许多"
+"事情。详细来说,对于每一个文件,你的的工作副本在
<filename>.svn</filename> 包"
+"含了一个<quote>原始的</quote>副本,所以 Subversion 可以快速的告诉你哪些文
件修"
+"改了,甚至允许你在不与版本库通讯的情况下恢复修改。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
#: ../../en/book/ch02-basic-usage.xml:728
@@ -6019,14 +6017,13 @@
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch02-basic-usage.xml:730
-#, fuzzy
msgid ""
"To get an overview of your changes, you'll use the <command>svn status</"
"command> command. You'll probably use <command>svn status</command>
more "
"than any other Subversion command."
msgstr ""
-"为了浏览修改的内容,你会使用这个<command>svn status</command>命令,在所有"
-"Subversion命令里,<command>svn status</command>可能会是你用的最多的命令。"
+"为了浏览你的修改,可以使用 <command>svn status</command> 命令。在所有的 "
+"Subversion 命令中,<command>svn status</command> 可能会是你使用最多的命
令。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sidebar><title>
#: ../../en/book/ch02-basic-usage.xml:736
@@ -6035,7 +6032,6 @@
#. type: Content of: <book><chapter><sect1><sect2><sect3><sidebar><para>
#: ../../en/book/ch02-basic-usage.xml:738
-#, fuzzy
msgid ""
"You're probably used to using <command>cvs update</command> to see what "
"changes you've made to your working copy. <command>svn status</command>
will "
@@ -6043,13 +6039,12 @@
"working copy—without accessing the repository or potentially "
"incorporating new changes published by other users."
msgstr ""
-"你也许使用<command>cvs update</command>来看你做了哪些修改,<command>svn "
-"status</command>会给你所有你做的改变―而不需要访问版本库,并且不会在不知情
的情"
-"况下与其他用户作的更改比较。"
+"你可能会使用 <command>cvs update</command> 来看看你做了哪些修改。
<command>svn "
+"status</command> 会给你所有的修改信息―而不需要访问版本库,并且不会在不知情
的情"
+"况下与其它用户作的修改合并。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><sidebar><para>
#: ../../en/book/ch02-basic-usage.xml:746
-#, fuzzy
msgid ""
"In Subversion, <command>svn update</command> does just that—it
updates "
"your working copy with any changes committed to the repository since the
last "
@@ -6057,12 +6052,12 @@
"the <command>update</command> command to see what local modifications
you've "
"made."
msgstr ""
-"在Subversion,<command>update</command>只是做这件事―将工作副本更新到版本库
的最"
-"新版本,你可以消除使用<command>update</command>察看本地修改的习惯。"
+"在 Subversion 中,<command>svn update</command> 只做这件事―将工作副本更新
到版"
+"本库的最新版本。你应该抛弃使用 <command>update</command> 命令来察看本地修
改的"
+"习惯。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch02-basic-usage.xml:755
-#, fuzzy
msgid ""
"If you run <command>svn status</command> at the top of your working copy
with "
"no arguments, it will detect all file and tree changes you've made. Here
are "
@@ -6070,22 +6065,21 @@
"command> can return. (Note that the text following <literal>#</literal>
is "
"not actually printed by <command>svn status</command>.)"
msgstr ""
-"如果你在工作副本的顶级目录运行不带参数的<command>svn status</command>命
令,它"
-"会检测你做的所有的文件或目录的修改,以下的例子是来展示<command>svn
status</"
-"command>可能返回的状态码(注意,<literal>#</literal>之后的不是
<command>svn "
-"status</command>打印的)。"
+"如果你在工作副本的顶级目录运行不带参数的 <command>svn status</command> 命
令,"
+"它会检测你对所有文件或目录作出的修改。以下的例子是来展示 <command>svn
status</"
+"command> 可能返回的状态代码(注意 <literal>#</literal> 之后的内容不是 "
+"<command>svn status</command> 打印的信息)。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch02-basic-usage.xml:771
-#, fuzzy
msgid ""
"In this output format, <command>svn status</command> prints six columns
of "
"characters, followed by several whitespace characters, followed by a file
or "
"directory name. The first column tells the status of a file or directory
and/"
"or its contents. The codes we listed are:"
msgstr ""
-"在这种格式下,<command>svn status</command>打印6列字符,紧跟一些空格,接着
是文"
-"件或者目录名。第一列告诉一个文件或目录的状态或它的内容,返回代码如下:"
+"在这种输出格式中,<command>svn status</command> 打印 6 列字符,紧跟一些空
格,"
+"接着是文件或目录名。第一列告诉文件或目录的状态或它的内容。返回代码如下:"
#. type: Content of:
<book><chapter><sect1><sect2><sect3><variablelist><varlistentry><term>
#: ../../en/book/ch02-basic-usage.xml:780
@@ -6106,7 +6100,6 @@
#. type: Content of:
<book><chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para>
#: ../../en/book/ch02-basic-usage.xml:792
-#, fuzzy
msgid ""
"The file <filename>item</filename> is in a state of conflict. That is, "
"changes received from the server during an update overlap with local
changes "
@@ -6114,8 +6107,8 @@
"You must resolve this conflict before committing your changes to the "
"repository."
msgstr ""
-"文件<filename>item</filename>发生冲突,在从服务器更新时与工作副本(如果更新
时没"
-"有解决)的本地版本发生交迭,在你提交到版本库前,必须手工的解决冲突。"
+"文件 <filename>item</filename> 发生了冲突。从服务器收到的修改与工作副本的
本地"
+"修改发生交迭(在更新期间不会被解决)。在你提交到版本库前,必须手工解决冲
突。"
#. type: Content of:
<book><chapter><sect1><sect2><sect3><variablelist><varlistentry><term>
#: ../../en/book/ch02-basic-usage.xml:804
@@ -6160,20 +6153,17 @@
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch02-basic-usage.xml:850
-#, fuzzy
msgid ""
"This is the <quote>long form</quote> output of <command>svn status</"
"command>. The letters in the first column mean the same as before, but
the "
"second column shows the working revision of the item. The third and
fourth "
"columns show the revision in which the item last changed, and who changed
it."
msgstr ""
-"这是<command>svn status</command>的<quote>加长形式</quote>,第一列保持相
同,第"
-"二列显示一个工作版本号,第三和第四列显示最后一次修改的版本号和修改人(这些
列不"
-"会与我们刚才提到的字符混淆)。"
+"这是 <command>svn status</command> 的<quote>长形式</quote>。第一列的含义不
变,"
+"第二列显示工作版本号。第三列和第四列显示最后一次修改的版本号和修改者。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch02-basic-usage.xml:857
-#, fuzzy
msgid ""
"None of the prior invocations to <command>svn status</command> contact
the "
"repository—instead, they compare the metadata in the
<filename>.svn</"
@@ -6181,13 +6171,13 @@
"show-updates</option> (<option>-u</option>) option, which contacts the "
"repository and adds information about things that are out of date:"
msgstr ""
-"上面所有的<command>svn status</command>调用并没有联系版本库,只是与
<filename>."
-"svn</filename>中的原始数据进行比较的结果,最后,是
<option>--show-updates</"
-"option>(<option>-u</option>)选项,它将会联系版本库为已经过时的数据添加新信
息:"
+"上面所有的 <command>svn status</command >调用并没有联系版本库—只是
与 "
+"<filename>.svn</filename> 中的原始数据进行比较。最后,使用
<option>--show-"
+"updates</option>(<option>-u</option>) 选项,它将会联系版本库,为已经过时的
数据"
+"增加新信息:"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch02-basic-usage.xml:875
-#, fuzzy
msgid ""
"Notice the two asterisks: if you were to run <userinput>svn update</"
"userinput> at this point, you would receive changes to <filename>README</"
@@ -6196,24 +6186,23 @@
"<filename>README</filename> before you commit, or the repository will
reject "
"your commit for being out of date (more on this subject later)."
msgstr ""
-"注意这两个星号:如果你现在执行<command>svn update</command>,你的"
-"<filename>README</filename>和<filename>trout.c</filename>会被更新,这告诉
你许"
-"多有用的信息―你可以在提交之前,需要使用更新操作得到文件<filename>README</"
-"filename>的更新,或者说文件已经过时,版本库会拒绝了你的提交。(后面还有更多
关于"
-"此主题)。"
+"注意这两个星号:如果你现在执行 <command>svn update</command>,你的 "
+"<filename>README</filename> 和 <filename>trout.c</filename> 会被更新。这告
诉你"
+"许多有用的信息―你需要在提交之前,使用更新操作得到服务器中文件 "
+"<filename>README</filename> 的更新,否则服务器会说文件已经过时,拒绝你的提
交"
+"(后面还有更多关于此主题的信息)。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch02-basic-usage.xml:884
-#, fuzzy
msgid ""
"<command>svn status</command> can display much more information about
the "
"files and directories in your working copy than we've shown
here—for an "
"exhaustive description of <command>svn status</command> and its output,
see "
"<xref linkend=\"svn.ref.svn.c.status\"/>."
msgstr ""
-"关于文件和目录,<command>svn status</command>可以比我们的展示显示更多的内
容,"
-"<command>svn status</command>完整的描述可以看<xref
linkend=\"svn.ref.svn.c."
-"status\"/>。"
+"<command>svn status</command> 可以比我们的展示显示更多关于文件和目录的内
容"
+"—<command>svn status</command> 的完整描述可以参见<xref
linkend=\"svn."
+"ref.svn.c.status\"/>。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
#: ../../en/book/ch02-basic-usage.xml:894
@@ -7779,7 +7768,7 @@
#: ../../en/book/ch02-basic-usage.xml:2354
msgid ""
"Suppose a software project you were working on currently looked like
this:"
-msgstr ""
+msgstr "假定你正在工作的软件项目布局如下:"
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:2368
@@ -7789,6 +7778,9 @@
"filename> in your working copy, but you don't know yet that the file has
been "
"renamed in the repository."
msgstr ""
+"你的协作者 Harry 已经将 <filename>bar.c</filename> 改名为
<filename>baz.c</"
+"filename>。你仍旧使用 <filename>bar.c</filename> 工作,不知道它在版本库中
已经"
+"改名。"
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:2374
@@ -7805,7 +7797,7 @@
msgid ""
"Your changes are all based on revision 4. They cannot be committed
because "
"Harry has already checked in revision 5:"
-msgstr ""
+msgstr "你的修改完全基于版本 4。因为 Harry 已经检入了版本 5,所以它不能被提
交。"
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:2428
@@ -7815,6 +7807,8 @@
"this also flags a tree conflict so you have the opportunity to evaluate
and "
"properly resolve it."
msgstr ""
+"这时候你需要执行 <command>svn update</command> 命令。此外,更新工作目录后
你可"
+"以看到 Harry 的修改,发现产生了树冲突,从而你有机会评估和正确处理它。"
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:2443
@@ -7823,6 +7817,8 @@
"capital C in the fourth output column. <command>svn status</command>
reveals "
"additional details of the conflict:"
msgstr ""
+"在输出中,<command>svn update</command> 在第四列使用大写字母 C 标记树冲
突。"
+"<command>svn status</command> 展现了冲突的额外信息:"
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:2456
More information about the svnbook-dev
mailing list