2 # Simplified Chinese translation for TortoiseMerge
3 # Copyright (C) 2004-2008 the TortoiseGit team
4 # This file is distributed under the same license as TortoiseGit
8 # $Date: 2009-01-08 17:19:56 +0800 (Thu, 08 Jan 2009) $
12 # Dongsheng Song <dongsheng.song@gmail.com>, 2006-2008
13 # Xingyu.Wang <xingyu.wang@gmail.com>, 2006
14 # Stan J <thinkernel@yeah.net>, 2006
17 # msgmerge --update TortoiseMerge_zh_CN.po TortoiseMerge.pot
20 # msgfmt --statistics -c TortoiseMerge_zh_CN.po
22 # Please format your translation before commit:
23 # msgmerge --width=80 --sort-by-file -o TortoiseMerge_zh_CN_new.po TortoiseMerge_zh_CN.po TortoiseMerge.pot
24 # mv -f TortoiseMerge_zh_CN_new.po TortoiseMerge_zh_CN.po
47 "Project-Id-Version: TortoiseGit Documentation\n"
48 "POT-Creation-Date: 2008-11-17 00:14 +0000\n"
49 "PO-Revision-Date: 2008-12-24 09:36+0800\n"
50 "Last-Translator: Dongsheng Song <dongsheng@users.sourceforge.net>\n"
51 "Language-Team: TortoiseGit translation team <tortoisegit-dev@googlegroups.com >\n"
53 "Content-Type: text/plain; charset=UTF-8\n"
54 "Content-Transfer-Encoding: 8bit\n"
56 #. Put one translator per line, in the form of NAME <EMAIL>.
58 #: ../source/TortoiseMerge_en.xml:0
59 msgid "translator-credits"
61 "Dongsheng Song <dongsheng.song@gmail.com>, 2006-2008\n"
62 "xingyu.wang <xingyu.wang@gmail.com>, 2006\n"
63 "Stan J <thinkernel@yeah.net>, 2006"
65 #. Place the translation of 'translation' here.
67 #: ../source/TortoiseMerge_en.xml:0
68 msgid "translator-translation"
72 #: ../source/TortoiseMerge_en.xml:4
74 msgstr "TortoiseMerge"
77 #: ../source/TortoiseMerge_en.xml:6
78 msgid "A diff/merge tool for Windows"
79 msgstr "针对 Windows 平台的比较与合并工具"
81 #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated
83 #: ../source/TortoiseMerge_en.xml:7
84 msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$"
85 msgstr "版本 $MajorVersion$.$MinorVersion$.$MicroVersion$"
88 #: ../source/TortoiseMerge_en.xml:9
93 #: ../source/TortoiseMerge_en.xml:12
98 #: ../source/TortoiseMerge_en.xml:13
103 #: ../source/TortoiseMerge_en.xml:16
108 #: ../source/TortoiseMerge_en.xml:17
113 #: ../source/TortoiseMerge_en.xml:20
118 #: ../source/TortoiseMerge_en.xml:21
123 #: ../source/TortoiseMerge_en.xml:28
128 #: ../source/TortoiseMerge_en.xml:33
130 "When working on a project, either an open-source project where several people "
131 "review your code, or a commercial project where you sell a component with "
132 "your source code, there will be people and customers who find bugs or want to "
133 "improve your project. To do that they send you patches which you have to "
134 "review and decide if you want to apply them."
136 "当开发一个项目的时候,无论是只有几个人审察你的代码的开源项目还是包括源代码的商"
137 "业软件,总有一些人或客户会发现错误或希望改进你的项目。因此,他们发送给你补丁,"
141 #: ../source/TortoiseMerge_en.xml:41
142 msgid "TortoiseMerge helps you with both those tasks: <placeholder-1/>"
143 msgstr "TortoiseMerge 可以帮助你完成以下两件事情:<placeholder-1/>"
146 #: ../source/TortoiseMerge_en.xml:45
147 msgid "Reviewing patches"
151 #: ../source/TortoiseMerge_en.xml:50
152 msgid "Applying the patches"
156 #: ../source/TortoiseMerge_en.xml:56
158 "TortoiseMerge also helps you to sort out conflicted files which can occur if "
159 "you're working with a source control system and others are working on the "
162 "如果你使用源代码控制系统,并且和其他人共同处理相同文件时,TortoiseMerge也能帮"
166 #: ../source/TortoiseMerge_en.xml:66
167 msgid "TortoiseMerge is free!"
168 msgstr "TortoiseMerge 是免费的!"
171 #: ../source/TortoiseMerge_en.xml:67
173 "TortoiseMerge is free. You don't have to pay for it, you can use it any way "
174 "you want. It is developed under the GP license (GPL)."
176 "TortoiseMerge 是免费的。你不需要为它支付任何费用就可以任意使用。它是在GPL许可"
180 #: ../source/TortoiseMerge_en.xml:71
182 "TortoiseMerge is an Open Source project. That means you have full read access "
183 "to the source code of this program. You can browse it on this link <ulink url="
184 "\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://"
185 "TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. You will be "
186 "prompted to enter username and password. The username is <literal>guest</"
187 "literal>, and the password must be left blank. The most recent version (where "
188 "we're currently working) is located under <filename>/trunk/</filename>, and "
189 "the released versions are located under <filename>/tags/</filename>."
191 "TortoiseMerge 是一个开源软件项目。这意味着你可以取得它的全部源代码。你可以访问"
192 "以下链接得到源代码:<ulink url=\"http://TortoiseGit.tigris.org/svn/"
193 "TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</"
194 "citetitle></ulink>。你会被提示输入用户名称和密码。用户名称是 <literal>guest</"
195 "literal>,不能填写密码。最新的版本(我们当前正在开发的)放在 <filename>/trunk/</"
196 "filename> ,已发布版本放在 <filename>/tags/</filename> 。"
199 #: ../source/TortoiseMerge_en.xml:90
204 #: ../source/TortoiseMerge_en.xml:91
206 "Even though TortoiseGit and TortoiseMerge are free, you can support the "
207 "developers by sending in patches and play an active role in the development. "
208 "You can also help to cheer us up during the endless hours we spend in front "
211 "虽然 TortoiseGit 和 TortoiseMerge 是免费软件,但是你可以通过发送一些补丁和积极"
212 "参与开发来帮助开发者。此外,你还可以使我们在计算机前度过的漫长时间更加愉快。"
215 #: ../source/TortoiseMerge_en.xml:97
217 "While working on TortoiseGit we love to listen to music. And since we spend "
218 "many hours on the project we need a <emphasis>lot</emphasis> of music. "
219 "Therefore we have set up some wish-lists with our favourite music CDs and "
220 "DVDs: <ulink url=\"http://TortoiseGit.tigris.org/donate.html"
221 "\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> "
222 "Please also have a look at the list of people who contributed to the project "
223 "by sending in patches or translations."
225 "我们喜欢一边聆听音乐,一边开发 TortoiseGit。因为我们在这个项目上花费了大量时"
226 "间,所以我们需要<emphasis>很多</emphasis>音乐。因此,我们创建了喜欢的音乐 CD "
227 "和 DVD 列表:<ulink url=\"http://TortoiseGit.tigris.org/donate.html"
228 "\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> 。"
229 "此外,也请看一看那些为项目提供了补丁或翻译的人员名单。"
232 #: ../source/TortoiseMerge_en.xml:113
233 msgid "Acknowledgments"
237 #: ../source/TortoiseMerge_en.xml:117
242 #: ../source/TortoiseMerge_en.xml:121
243 msgid "for the hard work on TortoiseMerge"
244 msgstr "TortoiseMerge 的主要编程人"
247 #: ../source/TortoiseMerge_en.xml:127
252 #: ../source/TortoiseMerge_en.xml:131
254 "for the beautiful icons, logo, bug hunting and taking care of the "
256 msgstr "制作了漂亮的图标、LOGO,检查错误及维护文档"
259 #: ../source/TortoiseMerge_en.xml:138
260 msgid "The Tigris Style project"
261 msgstr "Tigris 网站设计风格项目"
264 #: ../source/TortoiseMerge_en.xml:142
265 msgid "for some of the styles which are reused in this documentation"
266 msgstr "他们的设计风格被用于本文档"
269 #: ../source/TortoiseMerge_en.xml:149
270 msgid "Our Contributors"
274 #: ../source/TortoiseMerge_en.xml:153
276 "for the patches, bug reports and new ideas, and for helping others by "
277 "answering questions on our mailing list."
278 msgstr "提供了补丁、错误汇报及新的想法,并且在邮件列表上回答了其他人的问题。"
281 #: ../source/TortoiseMerge_en.xml:160
286 #: ../source/TortoiseMerge_en.xml:164
287 msgid "for many hours of joy with the music they sent us"
288 msgstr "他们送给我们的音乐陪伴了我们许多时间"
291 #: ../source/TortoiseMerge_en.xml:175
296 #: ../source/TortoiseMerge_en.xml:184
301 #: ../source/TortoiseMerge_en.xml:185
303 "TortoiseMerge is a free/open-source application. It lets you see differences "
304 "in text files, merge those changes and even review and apply unified diff "
305 "files, often called <firstterm>patches</firstterm>."
307 "TortoiseMerge 是一个免费软件/开源软件。通过它你可以查看文本文件之间的差异,并"
308 "合并这些差异;甚至审查和采用这些标准差异文件——通常称之为 <firstterm>补丁</"
312 #: ../source/TortoiseMerge_en.xml:190
314 "While working on text files, e.g. source files in your favourite programming "
315 "language, or html/xml files for your documentation or website, you will often "
316 "have a situation where you need to compare different versions of those files. "
317 "Sometimes you get a different version from someone else, sometimes you just "
318 "want to see the changes you've made."
320 "当处理文本文件时,比如用你所喜欢的编程语言写的源代码,或者 Html/Xml 的文档或网"
321 "站,你经常会碰到需要比较文件的不同版本的情况:有时候你从别人那里得到了一个不同"
322 "版本的文件,或者有时候干脆就是你想知道你曾经做过什么修改。"
325 #: ../source/TortoiseMerge_en.xml:198
327 "If you're working with a version control system (e.g. Git) then you "
328 "sometimes get <emphasis>conflicts</emphasis> when you update your working "
329 "copy. This happens if someone else changed the same parts of the file you're "
330 "currently working on as you did. Then you have to resolve those conflicts "
331 "manually. This is where TortoiseMerge can help you."
333 "如果你使用版本控制系统(如 Git)时,当你更新工作副本时你可能会遇到“ "
334 "<emphasis>冲突</emphasis> ”。这种情况通常发生在其他人也修改了你当前正在处理的"
335 "文件的同一部分。当遇到冲突时,你必须手工来解决它——这就是 TortoiseMerge 能帮助"
339 #: ../source/TortoiseMerge_en.xml:206
341 "The following diagram shows you the relationships between the files involved "
343 msgstr "下图说明了存在冲突的文件之间的关系。"
347 #: ../source/TortoiseMerge_en.xml:211 ../source/TortoiseMerge_en.xml:347
348 msgid "File Conflict"
352 #: ../source/TortoiseMerge_en.xml:214
354 "A conflict can also occur if you try to apply an outdated patch file. In such "
355 "cases, without TortoiseMerge, you would either have to ask the person you got "
356 "that patch file from for a current version or try to apply that patch file "
359 "应用一个过时的补丁时也可能出现冲突。在这种情况下,没有 TortoiseMerge 时,你要"
360 "么向补丁提供者索取一个当前版本的补丁,要么手工的应用该补丁。"
363 #: ../source/TortoiseMerge_en.xml:220
365 "But now with TortoiseMerge this isn't necessary anymore - at least not if "
366 "you're working with a version control system like Git. TortoiseMerge "
367 "parses the patch file for the revision/version the patch was created for and "
368 "automatically tries to fetch that specific version from your source-control. "
369 "Then it applies the patch and lets you review both your changes to the file, "
370 "and theirs. Then you can decide which changes you want to keep."
372 "但是现在有了 TortoiseMerge,它就不再是必需的了 —— 至少当你使用类似 Git "
373 "这样的版本控制系统时不是必需的。TortoiseMerge 解析补丁文件创建的修订版/版本"
374 "号,并自动尝试从你的版本控制系统中获取对应的版本。然后应用该补丁,让你对比文件"
375 "的原始内容及其修改后的内容。因此你能决定是否接受那些修改。"
378 #: ../source/TortoiseMerge_en.xml:235
379 msgid "TortoiseMerge's History"
380 msgstr "TortoiseMerge 的历史"
383 #: ../source/TortoiseMerge_en.xml:236
385 "While working on <ulink url=\"http://TortoiseGit.tigris.org"
386 "\"><citetitle>TortoiseGit</citetitle></ulink> we found that whenever users "
387 "sent in patches to enhance the project or just to fix bugs, we had a lot of "
388 "work just applying those patches. And many times those patches were outdated "
389 "and couldn't be applied with the command line patch tool <ulink url=\"http://"
390 "unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</"
391 "citetitle></ulink> because we were working on those files and had sometimes "
392 "changed those files already."
394 "当我们开发 <ulink url=\"http://TortoiseGit.tigris.org"
395 "\"><citetitle>TortoiseGit</citetitle></ulink> 时发现,只要用户发送补丁增强这个"
396 "项目,或者只是修正问题,我们就需要为应用这些补丁付出许多工作量。并且很多时候,"
397 "这些补丁是过时的,不能使用命令行工具 <ulink url=\"http://unxutils.sourceforge."
398 "net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink> 打补"
399 "丁,因为我们正在修改这些文件,有时候已经修改了。"
402 #: ../source/TortoiseMerge_en.xml:251
404 "This was also the main reason why TortoiseGit did not originally have a "
405 "<menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create Patch</"
406 "guimenuitem></menuchoice> implemented: we preferred users to send us the "
407 "whole files because with those it was easier to apply patches."
409 "这也是最初的 TortoiseGit 没有实现 <menuchoice><guimenu>TortoiseGit</"
410 "guimenu><guimenuitem>创建补丁</guimenuitem></menuchoice> 的主要理由:我们期望"
411 "用户发送给我们整个文件,这样容易打补丁。"
414 #: ../source/TortoiseMerge_en.xml:261
416 "So we spent a lot of time, searching the Internet for a GUI tool which could "
417 "apply patch files, but all we found was that such a tool didn't exist. So to "
418 "cut a long story short: We decided that if no-one else could provide such a "
419 "tool we would have to write our own. That's when TortoiseMerge was born."
421 "于是我们花费了大量时间,在互联网搜索打补丁的图形工具,但是没有发现。简而言之:"
422 "既然没有人提供这样的工具,我们决定自行编写。就在那时,TortoiseMerge 出世了。"
425 #: ../source/TortoiseMerge_en.xml:268
427 "Since TortoiseGit already uses the Git library, which has a nice "
428 "diffing engine built in, it was just natural to use this library instead of "
431 "因为 TortoiseGit 已经使用了 Git 库,它内置了一个很好的差异比较工具。很"
432 "自然的,我们使用这个库代替 GNU diff。"
435 #: ../source/TortoiseMerge_en.xml:276
436 msgid "Basic Concepts"
440 #: ../source/TortoiseMerge_en.xml:278
441 msgid "TortoiseMerge has several different uses: <placeholder-1/>"
442 msgstr "TortoiseMerge 有几个不同的用途:<placeholder-1/>"
445 #: ../source/TortoiseMerge_en.xml:282
447 "Viewing the difference between two files and merging changes into one of "
448 "them, or removing unwanted changes."
449 msgstr "察看两个文件的差异,合并它们,或者删除不想要的修改。"
452 #: ../source/TortoiseMerge_en.xml:288
454 "Editing conflicts between local changes and changes in the Git "
455 "repository following an update."
456 msgstr "更新后,编辑本地修改和版本库修改之间的冲突。"
459 #: ../source/TortoiseMerge_en.xml:294
460 msgid "Applying patch files. This is the reason TortoiseMerge was created :)"
461 msgstr "应用补丁。这是创建 TortoiseMerge 的原因 :)"
464 #: ../source/TortoiseMerge_en.xml:303
465 msgid "Viewing and Merging Differences"
469 #: ../source/TortoiseMerge_en.xml:304
471 "In this mode you are comparing two files. The file in the left pane is "
472 "considered to be the original file (sometimes referred to as "
473 "<emphasis>Theirs</emphasis>, and the file in the right pane is the modified "
474 "file (sometimes referred to as <emphasis>Mine</emphasis>."
476 "此模式用于比较两个文件。左窗格中的文件认为是原始文件(有时称为 <emphasis>他人的"
477 "</emphasis),右窗格中的文件是已修改的文件(有时称为 <emphasis>我的</emphasis)。"
480 #: ../source/TortoiseMerge_en.xml:310
482 "You can make simple line-based changes to the file in the right pane which "
483 "include: <placeholder-1/>"
484 msgstr "你可以在右窗格的文件中做简单的基于行的修改,包含:<placeholder-1/>"
487 #: ../source/TortoiseMerge_en.xml:315
488 msgid "Reverting changed lines back to the text shown in the left pane."
489 msgstr "撤销这些修改行,恢复到左窗格的状态。"
492 #: ../source/TortoiseMerge_en.xml:320
494 "Using a combination of both blocks, either <emphasis>Theirs</emphasis> before "
495 "<emphasis>Mine</emphasis> or <emphasis>Mine</emphasis> before "
496 "<emphasis>Theirs</emphasis>."
498 "使用所有组合,不是<emphasis>他人的</emphasis>在<emphasis>我的</emphasis>之前,"
499 "就是<emphasis>我的</emphasis>在<emphasis>他人的</emphasis>之前。"
502 #: ../source/TortoiseMerge_en.xml:328
504 "You can also edit the file in the right pane just as you would in a text "
505 "editor. Such lines are marked using a pencil icon. Please note that if you "
506 "want to make any of the line/block-based changes described above, it is "
507 "better to do those first since once you start editing the file yourself it "
508 "becomes impossible for TortoiseMerge to keep track of the relationship to the "
511 "你可以象在文本编辑器中一样编辑在右边窗格中的文件。这些被修改的行用铅笔图标标"
512 "记。请注意,如果你要做上述基于行/块的修改,最好在开始编辑文件之前完成。因为在"
513 "你开始编辑之后,TortoiseMerge 已经不能跟踪它与原始文件的关联了。"
516 #: ../source/TortoiseMerge_en.xml:338
517 msgid "Editing Conflicts"
521 #: ../source/TortoiseMerge_en.xml:339
523 "This is sometimes referred to as a three-way merge, and is shown in three "
524 "panes. However there are actually four files involved. The file which is not "
525 "shown is the common base file, the last common ancestor of the two files "
526 "which are now in conflict. The relationships between the three files are "
527 "explained in the diagram below:"
529 "这有时称为三路合并,用三窗格显示。然而它实际上涉及到四个文件。没有显示的文件是"
530 "公共基础文件,是现在冲突的两个文件的最后祖先。这三个文件的关系用在下图解释:"
533 #: ../source/TortoiseMerge_en.xml:350
535 "The base file represents the oldest version of a file, from where "
536 "<emphasis>You</emphasis> and <emphasis>They</emphasis> start making changes. "
537 "<emphasis>Mine</emphasis> represents the base file with all the changes "
538 "<emphasis>you</emphasis> made, and <emphasis>Theirs</emphasis> is the file "
539 "with all the changes <emphasis>someone else</emphasis> made to the file. The "
540 "left pane shows the changes in <emphasis>Theirs</emphasis> relative to the "
541 "base file and the right pane shows the changes in <emphasis>Mine</emphasis> "
542 "relative to the base file. The bottom pane is the output file which is where "
543 "you are trying to resolve the conflicts."
545 "基础文件是最旧的版本,<emphasis>你的文件</emphasis>,<emphasis>他人的文件</"
546 "emphasis>,都是从这个文件开始修改的。<emphasis>我的文件</emphasis>表示"
547 "<emphasis>你</emphasis>对基础文件的修改结果,<emphasis>他人的文件</emphasis>是"
548 "<emphasis>其他人</emphasis>对基础文件的修改结果。左边的窗格显示<emphasis>他人"
549 "</emphasis>对基础文件的修改,右边的窗格显示<emphasis>我</emphasis>对基础文件的"
550 "修改。底部窗格是你尝试解决冲突的输出文件。"
553 #: ../source/TortoiseMerge_en.xml:362
555 "In conflict resolution view, you can choose to use blocks from "
556 "<emphasis>Mine</emphasis> or <emphasis>Theirs</emphasis> or both. But in this "
557 "case, the changes are shown in the bottom pane."
559 "在解决冲突视图,你可以选择使用<emphasis>我的</emphasis>块,或者<emphasis>他人"
560 "的</emphasis>块,或者两者兼有。此时,修改在底部窗格显示。"
565 #: ../source/TortoiseMerge_en.xml:369 ../source/TortoiseMerge_en.xml:478
566 #: ../source/TortoiseMerge_en.xml:866
567 msgid "Applying Patches"
571 #: ../source/TortoiseMerge_en.xml:370
573 "A patch file is a Git unified diff file, which contains the "
574 "information required to apply changes to a set of files. The patch may have "
575 "been supplied by another developer so that you can see changes he has made "
576 "and possibly commit them to the repository. Or it may have been generated "
577 "internally by TortoiseGit when comparing two folders. This happens when you "
578 "compare a repository revision with your working copy folder, or if you "
579 "compare two different repository revisions, or if you compare two different "
582 "补丁文件是 Git 统一差异格式,它包含了使用补丁的信息。补丁可能是其他人提"
583 "供的,所以你可以察看其修改,或许将它提交到版本库。或者补丁是 TortoiseGit 比较"
584 "两个目录生成的。例如你比较版本库中的版本与工作副本,或者比较两个版本库版本,或"
588 #: ../source/TortoiseMerge_en.xml:380
590 "In either case TortoiseMerge will show a small window listing the files "
591 "included in the patch. By double clicking on one of these files you fetch the "
592 "relevant file and apply the changes. The left pane shows the original file "
593 "content and the right pane shows it after the patch is applied."
595 "无论如何,TortoiseMerge 都会用小窗口列出补丁中的文件名称。双击其中一个文件,就"
596 "会对其打补丁。左窗格显示原始文件内容,右窗格显示打补丁之后的文件内容。"
599 #: ../source/TortoiseMerge_en.xml:387
601 "You can edit the file in the right pane exactly as you would in compare/edit "
603 msgstr "你可以象在比较/编辑方式一样,编辑右窗格中的文件。"
606 #: ../source/TortoiseMerge_en.xml:394
607 msgid "Using TortoiseMerge"
608 msgstr "使用 TortoiseMerge"
611 #: ../source/TortoiseMerge_en.xml:402
612 msgid "Viewing Modes"
616 #: ../source/TortoiseMerge_en.xml:403
618 "TortoiseMerge has three main viewing modes: one-pane, two-pane and three-pane "
619 "view. One/two-pane view is used to view changes and three-pane view is used "
620 "to resolve conflicts."
622 "TortoiseMerge 有三种主要视图方式:单窗格,两窗格和三窗格。单窗格/两窗格视图用"
627 #: ../source/TortoiseMerge_en.xml:409 ../source/TortoiseMerge_en.xml:843
628 msgid "Viewing / Merging"
632 #: ../source/TortoiseMerge_en.xml:411
633 msgid "One Pane View"
637 #: ../source/TortoiseMerge_en.xml:415
638 msgid "Two Pane View"
642 #: ../source/TortoiseMerge_en.xml:418
644 "The two pane view has some features which are not available in the one pane "
645 "view: <placeholder-1/>"
646 msgstr "两窗口方式有单窗口方式不具备的一些特性:<placeholder-1/>"
649 #: ../source/TortoiseMerge_en.xml:423
651 "Changes inside the modified lines are shown in different colors. Added string "
652 "parts are shown with a lighter color, but you can of course configure the "
653 "colors used here. Removed parts are indicated with a dark brown vertical line "
654 "in the string. Check out the screenshot above to see how this works."
656 "用不同的颜色来显示修改行。增加的部分使用浅色,当然你可以配置使用什么颜色。删除"
657 "部分使用深褐色删除线显示。检查屏幕快照了解它们如何工作。"
660 #: ../source/TortoiseMerge_en.xml:433
662 "Code reorganization usually means a lot of changes in whitespaces (space, "
663 "tab, newlines) but no actual code change. For example, you split up a very "
664 "long line into several lines, or you sometimes compact several lines together "
667 "代码重构经常意味着许多空白字符(空格,制表,新行)变化,但是没有实际上的代码改"
668 "变。举例来说,你可以将一个很长的行拆分为几行,或者将几行合并为一行。"
671 #: ../source/TortoiseMerge_en.xml:439
673 "Such changes are marked with a white circle symbol on the left side of the "
674 "views. If you see such a white circle, you know immediately that no real code "
675 "change is there and you don't have to check the changed block further."
677 "这些改变在视图的左边用白色圆形符号标记。如果你看到了这些白色圆形,就立即知道这"
678 "里没有实际代码改变,不需要进一步检查这个代码块"
681 #: ../source/TortoiseMerge_en.xml:447
683 "Hand editing of the file in the right pane is possible in two-pane view. Such "
684 "changes are marked with a pencil symbol."
685 msgstr "在两窗格视图中,可以在右边的窗格编辑文件。这些修改用铅笔符号标记。"
688 #: ../source/TortoiseMerge_en.xml:454
690 "If you want to compare/merge three files, TortoiseMerge will show you the "
691 "differences in a three pane view. This view is also used if you need to "
692 "resolve conflicted files."
694 "如果你要比较/合并三个文件,TortoiseMerge 将会使用三窗口方式显示差异。这个视图"
698 #: ../source/TortoiseMerge_en.xml:460
699 msgid "Three Pane View"
703 #: ../source/TortoiseMerge_en.xml:463
705 "The left pane shows you the differences between <emphasis>Their</emphasis> "
706 "file and the <emphasis>Base</emphasis> file, while the right pane shows you "
707 "the differences between <emphasis>Mine</emphasis> file and the "
708 "<emphasis>Base</emphasis> file. The bottom pane shows you the result of "
709 "merging <emphasis>Base</emphasis>, <emphasis>Mine</emphasis> and "
710 "<emphasis>Theirs</emphasis> with possible conflicts."
712 "左窗口显示<emphasis>他人的</emphasis>文件与<emphasis>基础</emphasis>文件的差"
713 "异,右窗口显示<emphasis>我的</emphasis>文件与<emphasis>基础</emphasis>文件的差"
714 "异。底部窗口显示<emphasis>基础文件</emphasis>,<emphasis>我的文件</emphasis>,"
715 "与 <emphasis>他人的文件</emphasis> 的合并结果,以及可能的冲突。"
718 #: ../source/TortoiseMerge_en.xml:472
720 "If you hover the mouse over the pane title, a tooltip will show the filenames "
721 "used for the diff in each pane."
723 "如果你的鼠标在窗格的标题栏逗留,会有工具提示显示此窗格用于比较的文件名称。"
726 #: ../source/TortoiseMerge_en.xml:479
728 "After TortoiseMerge parses the patch file it will show you a small window "
729 "with all the files which have changes according to the patch file. "
730 "<placeholder-1/> If the filename is shown in black, then the patch can be "
731 "applied without any problems. That means the file is not outdated according "
732 "to the patch. However, if the filename is shown in red, then the patch can't "
733 "get applied directly because you already changed that file."
735 "如果 TortoiseMerge 能解析补丁文件,它会显示一个小窗口,给出此补丁修改的文件列"
736 "表。<placeholder-1/> 如果文件名称用黑色显示,那么这个补丁可以没有任何问题的应"
737 "用。它表示此补丁针对的文件没有过时。如果文件名称用红色显示,那么这个补丁不能直"
738 "接应用,因为你的以往修改造成了这个文件出现冲突。"
741 #: ../source/TortoiseMerge_en.xml:484
742 msgid "Patch File List"
746 #: ../source/TortoiseMerge_en.xml:493
748 "But don't worry. If you're working with Git you can retrieve an older "
749 "version of the file and resolve the conflict. In fact, TortoiseMerge "
750 "automatically tries to get that older version of the file and then shows you "
751 "the diff between <emphasis>Base</emphasis> (the older version of the file), "
752 "<emphasis>Mine</emphasis> (the file as it is currently in your working copy) "
753 "and <emphasis>Theirs</emphasis> (the older version of the file with the patch "
754 "already applied). Then you can resolve possible conflicts manually."
756 "但是别担心。如果你使用 Git,可以取出这个文件的老版本来解决冲突。实际"
757 "上,TortoiseMerge 自动尝试取出老版本,给出<emphasis>基础版本</emphasis>(此文件"
758 "的老版本), <emphasis>我的版本</emphasis>(你的工作副本中的文件),和<emphasis>他"
759 "人的版本</emphasis>(已经打补丁的老版本)之间的差异。然后你可以手工解决冲突。"
762 #: ../source/TortoiseMerge_en.xml:504
764 "The patch file window has a context menu which allows you to preview the "
765 "effect of the patch on the current file (apply without saving), to apply and "
766 "save the changes for the selected file, or to apply and save changes to "
767 "<emphasis>all</emphasis> files in the list. The double-click action is to "
770 "补丁文件窗口有一个上下文菜单,允许你预览在当前文件打补丁的结果(没有保存),为选"
771 "择的文件打补丁和保存修改,或者为列表内的<emphasis>所有</emphasis>文件打补丁和"
775 #: ../source/TortoiseMerge_en.xml:512
777 "Depending on whether TortoiseMerge can apply the patch directly or by "
778 "fetching an older version of the file first, it shows you a two pane view "
779 "(patch can be applied directly) or a three pane view (older version of file "
782 "依赖于 TortoiseMerge 能直接使用补丁,或者先取出老版本文件,它显示双窗口视图(可"
783 "以直接打补丁),或者显示三窗口视图(取出了老版本文件)。"
786 #: ../source/TortoiseMerge_en.xml:521
787 msgid "Buttons and Other Controls"
791 #: ../source/TortoiseMerge_en.xml:522
793 "<placeholder-1/> Below the menu bar lies the tool bar. This provides easy "
794 "access to the most commonly used tools, which are <placeholder-2/>"
796 "<placeholder-1/>下列菜单显示在工具条里。可以方便地使用多数常见功能,它们分别"
800 #: ../source/TortoiseMerge_en.xml:524
805 #: ../source/TortoiseMerge_en.xml:531
806 msgid "<guibutton>Open</guibutton> accesses the file-open dialog. What else?"
807 msgstr "<guibutton>打开</guibutton> 除了打开文件对话框,还能是什么?"
810 #: ../source/TortoiseMerge_en.xml:537
811 msgid "<guibutton>Save</guibutton> saves any changes you have made."
812 msgstr "<guibutton>保存</guibutton> 保存你所做的任何修改。"
815 #: ../source/TortoiseMerge_en.xml:543
817 "<guibutton>Reload</guibutton> discards any changes you have made in "
818 "TortoiseMerge and reloads the files from disk."
820 "<guibutton>重载</guibutton> 放弃你在 TortoiseMerge 中所做的任何修改,重新载入"
824 #: ../source/TortoiseMerge_en.xml:550
826 "<guibutton>Undo</guibutton> implements a multi-level undo, allowing you to "
827 "reverse any changes you have made within TortoiseMerge."
829 "<guibutton>撤销</guibutton>实现多级撤销,允许你放弃在 TortoiseMerge 中所做的任"
833 #: ../source/TortoiseMerge_en.xml:557
835 "<guibutton>Prev/Next Difference</guibutton> jumps directly to the next point "
836 "where the files differ. This saves scrolling through all the unchanged parts "
839 "<guibutton>上一个/下一个差异</guibutton> 直接跳转到文件中的上一个/下一个不同的"
840 "地方。它可以快速地跳过文件未变化过的部分。"
843 #: ../source/TortoiseMerge_en.xml:563
845 "When you do this in 2-pane diff mode, the detail bar at the bottom of the "
846 "screen will show you the inline differences for the first line, regardless of "
847 "where the mouse is hovering."
849 "当你处于双窗口方式时,无论是否鼠标划过该区域,在屏幕底部的细节状态栏都将显示首"
853 #: ../source/TortoiseMerge_en.xml:570
855 "<guibutton>Prev/Next Conflict</guibutton> jumps directly to the next point "
856 "where the file differences are in conflict and need to be resolved."
858 "<guibutton>上一个/下一个冲突</guibutton> 直接跳转到文件中的上一个/下一个需要解"
862 #: ../source/TortoiseMerge_en.xml:577
864 "<guibutton>Use Theirs/Use Mine</guibutton> selects whether to use a block "
865 "from the left or the right pane. Refer to the next section for more "
866 "information about editing changes and conflicts."
868 "<guibutton>使用他人的/使用我的</guibutton> 从左边或右边的窗格选择块。参阅下节"
872 #: ../source/TortoiseMerge_en.xml:586
874 "<guibutton>Theirs before Mine/Mine before Theirs</guibutton> is used when you "
875 "want to combine changes in a conflicted file. Refer to the next section for "
876 "more information about editing changes and conflicts."
878 "<guibutton>他人的在前/我的在前</guibutton> 用于在冲突的文件中合并修改。参阅下"
879 "节以获得更多关于编辑改变和冲突的信息。"
882 #: ../source/TortoiseMerge_en.xml:594
884 "<guibutton>Mark as Resolved</guibutton> When you have resolved all the "
885 "conflicts in a file and saved the changes, you can mark it as resolved from "
886 "within TortoiseMerge, rather than going back to explorer and marking as "
887 "resolved from there."
889 "<guibutton>标记为已解决</guibutton> 当你解决了文件中的全部冲突并保存了修改后,"
890 "你可以在 TortoiseMerge 中标记为已解决冲突,而不用返回资源管理器去标记它们。"
893 #: ../source/TortoiseMerge_en.xml:603
895 "<guibutton>Show Whitespaces</guibutton> toggles the option to display space "
896 "and tab characters as symbols so you can distinguish white space changes."
898 "<guibutton>显示空白字符</guibutton> 切换是否使用符号显示空格和制表符,以便你能"
902 #: ../source/TortoiseMerge_en.xml:610
904 "<guibutton>Inline Diff Word-wise</guibutton> toggles the method used to "
905 "display inline diffs. In word-wise mode, when a character is changed, the "
906 "whole word is highlighted. In char-wise mode, each individual changed "
907 "character is highlighted."
909 "<guibutton>感知单词的内嵌差异</guibutton>切换内嵌差异的显示方法。在感知单词模"
910 "式,当改变字符时,整个单词高亮显示。在感知字符模式,高亮显示改变的字符。"
913 #: ../source/TortoiseMerge_en.xml:617
915 "Word-wise is the default and in most cases it works better. For example if "
916 "you change a variable name, the whole name is highlighted in word-wise mode, "
917 "whereas in char-wise mode you tend to get a mess of added and deleted "
918 "characters which doesn't make much sense. However, some content does not "
919 "resolve neatly into words, for example a hex file, and in that case, char-"
920 "wise display works better."
922 "感知单词是默认模式,在大多数情况下它工作的很好。例如你修改了变量名,在感知单词"
923 "模式下整个名称高亮显示,然而在感知字符模式下,你仅仅知道增加或删除了字符。但"
924 "是,一些内容不能解释为单词,例如二进制文件,这种情况下,感知字符模式工作的更"
928 #: ../source/TortoiseMerge_en.xml:628
930 "<guibutton>Switch View</guibutton> selects between one-pane and two-pane "
931 "view. Disabled in 3-pane view."
933 "<guibutton>切换窗口方式</guibutton> 在单窗口方式和双窗口方式间进行切换。在三窗"
937 #: ../source/TortoiseMerge_en.xml:635
939 "<guibutton>Switch Left and Right View</guibutton> In 2-pane view, swaps the "
940 "left and right windows. When you are comparing a file in 2 different trees, "
941 "as opposed to 2 revisions of the same file, TortoiseGit does not know which "
942 "one should go in the left pane as the <quote>original/base</quote> version. "
943 "If it gets this wrong, you can change it to make viewing easier."
945 "<guibutton>交换左右窗口</guibutton> 在双窗口方式中,互换左右窗口的内容。当你比"
946 "较两个不同分支中的两个文件时,而不是比较同一个文件的两个修订版本时,"
947 "TortoiseGit 并不知道哪个文件应该放在左边的窗口作为<quote>原始/基础版本</"
948 "quote>。如果放错了,为了便于查看,你能够互换它们。"
951 #: ../source/TortoiseMerge_en.xml:646
953 "<guibutton>Show/Hide Patch List</guibutton> When TortoiseMerge has a patch "
954 "list, this button allows you to hide it (so you can see both windows), or "
955 "show it (so you can review the file list)."
957 "<guibutton>显示/隐藏补丁列表</guibutton> 当 TortoiseMerge 有补丁列表时,这个按"
958 "钮允许你隐藏它(于是你可以看到两个窗口),或者显示它(于是你可以复审文件列表)。 "
961 #: ../source/TortoiseMerge_en.xml:654
963 "<guibutton>Settings</guibutton> takes you to TortoiseMerge's settings dialog."
964 msgstr "<guibutton>设置</guibutton> 弹出 TortoiseMerge 的设置对话框。"
967 #: ../source/TortoiseMerge_en.xml:661
969 "On the left side of the window is a locator bar. This provides a quick visual "
970 "reference as to where the changes lie within the file. The bar has three "
971 "columns. The left column refers to the left pane, the right column to the "
972 "right pane, and the centre column to the bottom pane (if present). In one-"
973 "pane view only the left column is used. The locator bar can also be used as a "
974 "scroll bar to scroll all the windows simultaneously."
976 "窗口的左边是定位拉杆。它提供了对文件改变的位置的快速可视化引用。这个拉杆有三"
977 "列。左列引用左边的窗口,右列引用右边的窗口,中间列引用底部窗口(如果存在)。在单"
978 "窗口模式下,只使用了左列。定位拉杆也可以作为滑杆使用,让所有窗口同时滑动。"
981 #: ../source/TortoiseMerge_en.xml:670
983 "Below the bottom window is the status bar. This shows the number of lines "
984 "added and deleted in <literal>Theirs</literal> and <literal>Mine</literal>, "
985 "and the number of unresolved conflicts remaining. You can also see which line-"
986 "ending style is in use, what encoding (ASCII, UTF-8, etc) is assumed by "
987 "TortoiseMerge, and whether there is a byte-order-mark (BOM) present in UTF-8 "
988 "files. The left side of the status bar is used to display hints when you "
989 "hover the mouse over a control."
991 "底部窗口下面是状态栏。它显示了<literal>他人</literal>与<literal>本人</literal>"
992 "增加和删除的行数,以及尚存的未解决冲突数目。你还可以看到使用的行结束符,编码"
993 "(ASCII,UTF-8等),以及在UTF-8编码的文件中是否有字节顺序标记(BOM)。当你的鼠标逗"
994 "留在控件上的时候,状态栏的左边会显示提示。"
997 #: ../source/TortoiseMerge_en.xml:683
998 msgid "Line Status Icons"
1002 #: ../source/TortoiseMerge_en.xml:684
1004 "Changed lines are marked with an icon to indicate what type of change has "
1006 msgstr "已经修改的行用图标指示发生了什么类型的修改。"
1009 #: ../source/TortoiseMerge_en.xml:688
1011 "<graphic fileref=\"images/TMerge_lineadded.png\"/> A line has been added."
1012 msgstr "<graphic fileref=\"images/TMerge_lineadded.png\"/> 已经增加一行。"
1015 #: ../source/TortoiseMerge_en.xml:692
1017 "<graphic fileref=\"images/TMerge_lineremoved.png\"/> A line has been removed."
1018 msgstr "<graphic fileref=\"images/TMerge_lineremoved.png\"/> 已经删除一行。"
1021 #: ../source/TortoiseMerge_en.xml:696
1023 "<graphic fileref=\"images/TMerge_lineequal.png\"/> A change has been undone "
1024 "by reverting to the original content of the line."
1026 "<graphic fileref=\"images/TMerge_lineequal.png\"/> 此行已经通过恢复到原始内容"
1030 #: ../source/TortoiseMerge_en.xml:700
1032 "<graphic fileref=\"images/TMerge_linewhitespace.png\"/> This line contains "
1033 "only whitespace changes. Where several consecutive lines are marked, the "
1034 "paragraph may have been re-wrapped, causing words to shuffle onto adjacent "
1037 "<graphic fileref=\"images/TMerge_linewhitespace.png\"/> 此行只有空白的修改。当"
1038 "有几行连续被标记时,此段可能被重新排版,从而造成修改。"
1041 #: ../source/TortoiseMerge_en.xml:706
1043 "<graphic fileref=\"images/TMerge_lineedited.png\"/> A line has been edited by "
1044 "hand, using TortoiseMerge as a text editor."
1046 "<graphic fileref=\"images/TMerge_lineedited.png\"/> 此行已经使用 "
1047 "TortoiseMerge 作为文本编辑器手工修改。"
1050 #: ../source/TortoiseMerge_en.xml:710
1052 "<graphic fileref=\"images/TMerge_lineconflicted.png\"/> This line is in "
1055 "<graphic fileref=\"images/TMerge_lineconflicted.png\"/> 此行处于冲突状态。"
1058 #: ../source/TortoiseMerge_en.xml:714
1060 "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> This line is "
1061 "conflicted, but the effect is hidden by whitespace or line-ending settings."
1063 "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> 此行处于冲突状"
1064 "态,但是被空白或行结束符的设置掩盖。"
1067 #: ../source/TortoiseMerge_en.xml:721
1068 msgid "Merging / Editing Conflicts"
1072 #: ../source/TortoiseMerge_en.xml:722
1074 "TortoiseMerge not only <emphasis>shows</emphasis> you the differences between "
1075 "files but also lets you resolve conflicts or apply changes."
1077 "TortoiseMerge 不仅 <emphasis>显示</emphasis> 了你文件间的不同,而且还能让你解"
1081 #: ../source/TortoiseMerge_en.xml:726
1083 "If you're in two pane view, then you can only edit the file in the right pane "
1084 "(<literal>Mine</literal>). To apply changes made in the left file "
1085 "(<literal>Theirs</literal>), <action>right-click</action> on the changed "
1086 "lines and select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use "
1087 "text block from <quote>theirs</quote></guimenuitem></menuchoice>. Then the "
1088 "changes from the left file are added to the right file."
1090 "如果你在双窗口模式,你只能编辑右窗口中的文件(<literal>我的</literal>)。要应用"
1091 "左边的文件修改(<literal>他人的</literal>),在修改行上<action>右击</action>,选"
1092 "择<menuchoice><guimenu>上下文菜单</guimenu><guimenuitem>使用<quote>他人的</"
1093 "quote>文本块</guimenuitem></menuchoice>。于是左边文件的修改就增加到右边的文"
1097 #: ../source/TortoiseMerge_en.xml:738
1099 "Sometimes you actually want both text blocks, and the context menu also "
1100 "offers you <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use both "
1101 "text blocks (this one first)</guimenuitem></menuchoice> and "
1102 "<menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use both text blocks "
1103 "(this one last)</guimenuitem></menuchoice>."
1105 "有时候,你实际上需要双方的文本块,<menuchoice><guimenu>上下文菜单 </"
1106 "guimenu><guimenuitem>使用双方的文本块 (这个先出现)</guimenuitem></menuchoice> "
1107 "和 <menuchoice><guimenu>上下文菜单</guimenu><guimenuitem>使用双方的文本块 (这"
1108 "个后出现)</guimenuitem></menuchoice>可以满足你的要求。"
1111 #: ../source/TortoiseMerge_en.xml:751
1113 "You can also edit the output file just as you would in a text editor. Such "
1114 "lines are marked using a pencil icon. Please note that if you want to make "
1115 "any of the line/block-based changes described above, it is better to do those "
1116 "first since once you start editing the file yourself it becomes impossible "
1117 "for TortoiseMerge to keep track of the relationship to the original files."
1119 "你可以象在文本编辑器中一样编辑输出文件。这些被修改的行用铅笔图标标记。请注意,"
1120 "如果你要做上述基于行/块的修改,最好在开始编辑文件之前完成。因为在你开始编辑之"
1121 "后,TortoiseMerge 已经不能跟踪它与原始文件的关联了。"
1124 #: ../source/TortoiseMerge_en.xml:759
1126 "If you're in three pane view (sometimes called <emphasis>merge view</"
1127 "emphasis>) you can only edit the file in the bottom view (<literal>Merged</"
1128 "literal>). As in two pane view, you can <action>right-click</action> on "
1129 "conflicted lines and either select <menuchoice><guimenu>Context Menu</"
1130 "guimenu><guimenuitem>Use text block from <quote>theirs</quote></guimenuitem></"
1131 "menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use "
1132 "text block from <quote>mine</quote></guimenuitem></menuchoice>. In addition, "
1133 "if you want <emphasis>both</emphasis> blocks, you can select "
1134 "<menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Use text block from "
1135 "<quote>mine</quote> before <quote>theirs</quote></guimenuitem></menuchoice> "
1136 "or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Use text block "
1137 "from <quote>theirs</quote> before <quote>mine</quote></guimenuitem></"
1138 "menuchoice>. According to the command you've selected, the changes are used "
1139 "in the resulting <literal>Merged</literal> file."
1141 "如果你在三窗口模式(有时称为<emphasis>合并视图</emphasis>),你只能编辑底部窗口"
1142 "中的文件(<literal>已合并</literal>)。象在两窗口模式那样,你可以在冲突行上"
1143 "<action>右击</action>,或者选择<menuchoice><guimenu>上下文菜单</"
1144 "guimenu><guimenuitem>使用<quote>他人的</quote>文本块</guimenuitem></"
1145 "menuchoice>,或者<menuchoice><guimenu>上下文菜单</guimenu><guimenuitem>使用"
1146 "<quote>我的</quote>文本块</guimenuitem></menuchoice>。此外,如果你要<emphasis>"
1147 "两者的</emphasis>文本块,可以选择<menuchoice><guimenu>上下文菜单</"
1148 "guimenu><guimenuitem>在<quote>他人的</quote>前面使用<quote>我的</quote>文本块"
1149 "</guimenuitem></menuchoice>,或者 <menuchoice><guimenu>上下文菜单</"
1150 "guimenu><guimenuitem>在<quote>我的</quote>前面使用<quote>他人的</quote>文本块"
1151 "</guimenuitem></menuchoice>。通过你选择的命令,改变结果在<literal>已合并</"
1155 #: ../source/TortoiseMerge_en.xml:796
1157 "Sometimes a file will be marked as conflicted in Git, yet when you "
1158 "view it using TortoiseMerge there are no conflicts shown. This may be due to "
1159 "the whitespace handling you have chosen. If you choose to ignore line-endings "
1160 "or whitespace changes, those lines will be marked using the "
1161 "<emphasis>Conflict-Ignored</emphasis> icon. To resolve the conflict you still "
1162 "need to pick which version you want to use."
1164 "有时候在 Git 中的文件会被标记为冲突,但是当你用 TortoiseMerge 察看时,"
1165 "却没有显示冲突。这可能是你选择的空白处理方式造成的。如果你选择忽略行结束符或空"
1166 "白改变,这些行会用 <emphasis>冲突被忽略</emphasis> 图标标记。为了解决冲突,你"
1170 #: ../source/TortoiseMerge_en.xml:804
1172 "Sometimes the conflict is too difficult to resolve by simply picking "
1173 "<literal>Theirs</literal> and <literal>Mine</literal> and it requires hand "
1174 "editing. TortoiseMerge allows you to do all the easy changes visually first "
1175 "and then save the file, leaving only the difficult changes to be resolved by "
1178 "有时冲突很难通过简单选择<literal>他人的</literal>和<literal>我的</literal>来解"
1179 "决,需要手工编辑。TortoiseMerge 允许你先在可视化模式做所有容易的合并,然后保存"
1183 #: ../source/TortoiseMerge_en.xml:812
1185 "Note that if you use TortoiseMerge on the same files again, any changes to "
1186 "your working copy, whether in TortoiseMerge, or by hand-editing, "
1187 "<emphasis>will be discarded</emphasis> and the file will appear as it did "
1188 "when conflict-editing first started."
1190 "注意:如果你在同一文件重新使用 TortoiseMerge,你对工作版本做的任何修改,无论"
1191 "是 TortoiseMerge,还是手工编辑,都<emphasis>将被丢弃</emphasis>,文件恢复到开"
1195 #: ../source/TortoiseMerge_en.xml:822
1200 #: ../source/TortoiseMerge_en.xml:824
1202 "When you start TortoiseMerge without any command line switches then you have "
1203 "to open the files manually, using <menuchoice><guimenu>File</"
1204 "guimenu><guimenuitem>Open</guimenuitem></menuchoice>."
1206 "当不使用任何命令行参数启动 TortoiseMerge 时,你必须使用<menuchoice><guimenu>文"
1207 "件</guimenu><guimenuitem>打开</guimenuitem></menuchoice>来手工打开文件。"
1210 #: ../source/TortoiseMerge_en.xml:833
1211 msgid "The Open Dialog"
1215 #: ../source/TortoiseMerge_en.xml:836
1217 "The first thing you have to do is to decide whether you just want to compare/"
1218 "merge files, or whether you want to apply a patch file. Depending on what you "
1219 "choose, the corresponding edit boxes and browse buttons are activated."
1221 "你要作的第一件事,就是决定是否比较/合并文件,或者是否使用补丁。根据你的选择,"
1225 #: ../source/TortoiseMerge_en.xml:844
1227 "If you want to compare / merge files you have to set at least two of the "
1228 "three possible paths for <literal>Base</literal>, <literal>Mine</literal> and "
1229 "<literal>Theirs</literal>. If you select only two files, then TortoiseMerge "
1230 "will show you the differences between those two files, either in a two pane "
1231 "view or in a one pane view."
1233 "如果你要比较/合并文件,必须设置两个路径,或三个路径,即<emphasis>基础文件路径"
1234 "</emphasis>, <emphasis>我的文件路径</emphasis>与<emphasis>别人的文件路径</"
1235 "emphasis>。如果你只选择两个文件,那么 TortoiseMerge 会使用两窗口方式或单窗口方"
1239 #: ../source/TortoiseMerge_en.xml:852
1241 "If you want to merge three files, TortoiseMerge will show you the differences "
1242 "in a three pane view. This view is generally used if you need to resolve "
1243 "conflicted files. The output file is not named in this case and you will have "
1244 "to use the <menuchoice><guimenu>File</guimenu><guimenuitem>Save As...</"
1245 "guimenuitem></menuchoice>. to save the results."
1247 "如果你要合并三个文件,TortoiseMerge 将会使用三窗口方式显示差异。这个视图也用来"
1248 "解决冲突文件。输出文件没有命名,你必须使用<menuchoice><guimenu>File</"
1249 "guimenu><guimenuitem>另存为 ...</guimenuitem></menuchoice>来保存结果。"
1252 #: ../source/TortoiseMerge_en.xml:867
1254 "If you want to apply a patch file you have to set both the path to the patch "
1255 "file itself and the path to the folder where the patch file should be applied."
1257 "如果你想应用一个补丁文件,你要设置补丁文件的路径,以及在哪个路径打补丁。"
1260 #: ../source/TortoiseMerge_en.xml:873
1262 "Currently, only patch files in <emphasis>Unified Diff Format</emphasis> are "
1263 "supported. And only files which were generated from a Git working "
1264 "copy. Other formats like patch files generated by CVS are currently not "
1267 "当前仅支持<emphasis>标准差异格式</emphasis>。并且是在 Git 工作副本中生"
1268 "成的补丁。其它格式,例如 CVS 生成的补丁文件不受支持!"
1271 #: ../source/TortoiseMerge_en.xml:884
1276 #: ../source/TortoiseMerge_en.xml:886
1277 msgid "Main Settings Page"
1281 #: ../source/TortoiseMerge_en.xml:889
1282 msgid "The Settings Main Page"
1286 #: ../source/TortoiseMerge_en.xml:892
1288 "Most of the options here are self-explanatory, but a few points need "
1290 msgstr "多数选项是不需要过多解释,只需要稍微明确一下。"
1293 #: ../source/TortoiseMerge_en.xml:896
1295 "<guilabel>Backup original file</guilabel> renames the original file in the WC "
1296 "to <literal>filename.bak</literal> before saving the modified version."
1298 "<guilabel>备份原始文件</guilabel> 在保存修改后的版本时,先将工作拷贝中的原始文"
1299 "件重命名为<literal>filename.bak</literal>。"
1302 #: ../source/TortoiseMerge_en.xml:901
1304 "<guilabel>Ignore line endings</guilabel> hides changes which are due solely "
1305 "to difference in line-end style."
1306 msgstr "<guilabel>忽略换行类型</guilabel> 隐藏换行类型的改变。"
1309 #: ../source/TortoiseMerge_en.xml:905
1311 "<guilabel>Ignore case changes</guilabel> hides changes which are due solely "
1312 "to case changes within the text. This can be useful with apps such as Visual "
1313 "Basic, which changes case in variables without warning."
1315 "<guilabel>忽略大小写变化</guilabel> 隐藏仅文本大小写变化的差异。这对于像 "
1316 "Visual Basic 等忽略变量大小写的应用程序比较有用。"
1319 #: ../source/TortoiseMerge_en.xml:911
1321 "<guilabel>Colour code in-line changes</guilabel> uses the same scheme as the "
1322 "line diff bar to show the detailed in-line changes within the main display "
1323 "panes. Lines which have been heavily modified will not be shown using this "
1324 "method as the results are simply confusing. In this case the line will be "
1325 "shown as replaced (old line deleted, new line added)."
1327 "<guilabel>为改变的嵌入代码着色</guilabel>在主窗口,使用与行差异拉杆相同的方案"
1328 "显示代码改变的细节。修改很多的行不会这样显示,因为它会让人糊涂。这时会用替换方"
1332 #: ../source/TortoiseMerge_en.xml:919
1334 "<guilabel>Compare whitespaces</guilabel> shows all changes in indentation and "
1335 "inline whitespace as added/removed lines (which is how Git treats such "
1338 "<guilabel>比较空白字符</guilabel> 将全部缩进变化,或行内空白字符的变化按照添"
1339 "加/删除的行显示(即 Git 处理变化的方式)。"
1342 #: ../source/TortoiseMerge_en.xml:924
1344 "<guilabel>Ignore whitespace changes</guilabel> hides changes which are due "
1345 "solely to a change in the amount or type of whitespace, eg. changing the "
1346 "indentation or changing tabs to spaces. Adding whitespace where there was "
1347 "none before, or removing a whitespace completely is still shown as a change."
1349 "<guilabel>忽略空白字符变化</guilabel> 隐藏仅仅只是空白字符数量和类型的变化。例"
1350 "如,缩进,制表符变成了空格。在以前没有空白字符的地方增加空白字符,或者完全删除"
1354 #: ../source/TortoiseMerge_en.xml:932
1356 "<guilabel>Ignore all whitespaces</guilabel> hides all whitespace-only changes."
1357 msgstr "<guilabel>忽略全部空白字符</guilabel> 隐藏所有空白字符的变化。"
1360 #: ../source/TortoiseMerge_en.xml:938
1361 msgid "Colour Settings Page"
1365 #: ../source/TortoiseMerge_en.xml:941
1366 msgid "The Settings Color Page"
1370 #: ../source/TortoiseMerge_en.xml:944
1372 "This dialog allows you to select the background color coding used to "
1373 "highlight the different line changes."
1374 msgstr "这个对话框允许你选择一个背景颜色代码,它们用于高亮被修改的行。"
1377 #: ../source/TortoiseMerge_en.xml:950
1382 #: ../source/TortoiseMerge_en.xml:951
1383 msgid "All lines which are unchanged, or where changes are hidden."
1384 msgstr "这些行都没有改变过,或改变被隐藏了。"
1387 #: ../source/TortoiseMerge_en.xml:956
1392 #: ../source/TortoiseMerge_en.xml:957
1393 msgid "Lines which have been added."
1397 #: ../source/TortoiseMerge_en.xml:962
1402 #: ../source/TortoiseMerge_en.xml:963
1403 msgid "Lines which have been deleted."
1407 #: ../source/TortoiseMerge_en.xml:968
1412 #: ../source/TortoiseMerge_en.xml:969
1414 "Lines which have relatively small changes, and are shown using inline diff. "
1415 "This colour is used for the <placeholder-1/> portion of the line content. "
1416 "Changed portions will be shown using the inline added and deleted colours "
1417 "described below. If <placeholder-2/> is not enabled, this colour will not be "
1418 "used and changed lines will always be shown as replacements."
1420 "相对小的行改变,用嵌入差异显示。 <placeholder-1/> 部分着色。改变的部分用嵌入的"
1421 "增加和删除形式展现,其颜色下述。如果未启用 <placeholder-2/> ,不会使用此颜色,"
1425 #: ../source/TortoiseMerge_en.xml:971
1430 #: ../source/TortoiseMerge_en.xml:974
1431 msgid "Colour code in-line changes"
1435 #: ../source/TortoiseMerge_en.xml:980
1440 #: ../source/TortoiseMerge_en.xml:981
1441 msgid "Where the same line has been changed in both files."
1442 msgstr "两个文件都修改了这些行。"
1445 #: ../source/TortoiseMerge_en.xml:986
1446 msgid "Conflict resolved"
1450 #: ../source/TortoiseMerge_en.xml:987
1452 "Where the same line has been changed in both files, and you have now selected "
1453 "which version should be used."
1454 msgstr "两个文件都修改了同一行,你现在需要选择使用哪个版本。"
1457 #: ../source/TortoiseMerge_en.xml:993
1462 #: ../source/TortoiseMerge_en.xml:994
1464 "Where lines have been added in the opposite pane, and no such line existed in "
1466 msgstr "在另一个面板中增加了一些行,且这个面板中没有对应的行。"
1469 #: ../source/TortoiseMerge_en.xml:1000
1470 msgid "Inline added text"
1474 #: ../source/TortoiseMerge_en.xml:1001
1475 msgid "When inline diffs are shown, added text is shown in this colour."
1476 msgstr "当显示嵌入差异时,用此颜色显示增加的文本。"
1479 #: ../source/TortoiseMerge_en.xml:1006
1480 msgid "Inline removed text"
1484 #: ../source/TortoiseMerge_en.xml:1007
1485 msgid "When inline diffs are shown, deleted text is shown in this colour."
1486 msgstr "当显示嵌入差异时,用此颜色显示删除的文本。"
1489 #: ../source/TortoiseMerge_en.xml:1012
1490 msgid "Misc whitespaces"
1494 #: ../source/TortoiseMerge_en.xml:1013
1496 "Characters used to indicate Whitespace are shown in a different colour from "
1498 msgstr "用来表示空白的字符,在正文中用不同的颜色来显示"
1501 #: ../source/TortoiseMerge_en.xml:1023
1502 msgid "keyboard shortcuts"
1506 #: ../source/TortoiseMerge_en.xml:1025
1507 msgid "List of keyboard shortcuts and commands."
1508 msgstr "列出所有的快捷键和命令。"
1511 #: ../source/TortoiseMerge_en.xml:1030
1512 msgid "Keyboard shortcuts"
1516 #: ../source/TortoiseMerge_en.xml:1033
1521 #: ../source/TortoiseMerge_en.xml:1035
1522 msgid "Quit the program"
1526 #: ../source/TortoiseMerge_en.xml:1041
1531 #: ../source/TortoiseMerge_en.xml:1043
1532 msgid "Copy the selected text to the clipboard"
1533 msgstr "复制选定的文本到剪贴板"
1536 #: ../source/TortoiseMerge_en.xml:1049
1541 #: ../source/TortoiseMerge_en.xml:1051
1542 msgid "Open the Find dialog for text searches"
1546 #: ../source/TortoiseMerge_en.xml:1057
1551 #: ../source/TortoiseMerge_en.xml:1059
1552 msgid "Open files to diff/merge"
1553 msgstr "打开需要比较/合并的文件"
1556 #: ../source/TortoiseMerge_en.xml:1065
1561 #: ../source/TortoiseMerge_en.xml:1067
1562 msgid "Save the changes"
1566 #: ../source/TortoiseMerge_en.xml:1073
1567 msgid "Ctrl-Shift-S"
1568 msgstr "Ctrl-Shift-S"
1571 #: ../source/TortoiseMerge_en.xml:1075
1576 #: ../source/TortoiseMerge_en.xml:1081
1581 #: ../source/TortoiseMerge_en.xml:1083
1582 msgid "Go to next difference"
1586 #: ../source/TortoiseMerge_en.xml:1089
1591 #: ../source/TortoiseMerge_en.xml:1091
1592 msgid "Go to previous difference"
1596 #: ../source/TortoiseMerge_en.xml:1097
1601 #: ../source/TortoiseMerge_en.xml:1099
1602 msgid "Go to next conflict"
1606 #: ../source/TortoiseMerge_en.xml:1105
1611 #: ../source/TortoiseMerge_en.xml:1107
1612 msgid "Go to previous conflict"
1616 #: ../source/TortoiseMerge_en.xml:1113
1621 #: ../source/TortoiseMerge_en.xml:1115
1622 msgid "Toggle between one-pane diff and two-pane diff"
1623 msgstr "切换单窗口方式或双窗口方式"
1626 #: ../source/TortoiseMerge_en.xml:1121
1631 #: ../source/TortoiseMerge_en.xml:1123
1632 msgid "Reload the files and revert all changes made"
1633 msgstr "重新载入文件并放弃所做的任何改变"
1636 #: ../source/TortoiseMerge_en.xml:1129
1641 #: ../source/TortoiseMerge_en.xml:1131
1642 msgid "Toggles between showing whitespaces or not"
1646 #: ../source/TortoiseMerge_en.xml:1137
1647 msgid "Ctrl-mousewheel"
1651 #: ../source/TortoiseMerge_en.xml:1139
1652 msgid "Scroll the display left/right"
1656 #: ../source/TortoiseMerge_en.xml:1148
1657 msgid "Automating TortoiseMerge"
1658 msgstr "TortoiseMerge 操作"
1661 #: ../source/TortoiseMerge_en.xml:1150
1663 "TortoiseMerge can be started with command line parameters to avoid having to "
1664 "go through the <guilabel>Open</guilabel> dialog to select the files yourself. "
1665 "This is useful also if you want to use TortoiseMerge from another application."
1667 "TortoiseMerge 可以通过命令行选项指定参数运行,而不必非通过<guilabel>打开</"
1668 "guilabel>对话框来选择文件。这便于其它程序调用 TortoiseMerge。"
1671 #: ../source/TortoiseMerge_en.xml:1161
1672 msgid "TortoiseMerge Command Line Switches"
1673 msgstr "TortoiseMerge 命令行选项"
1676 #: ../source/TortoiseMerge_en.xml:1163
1681 #: ../source/TortoiseMerge_en.xml:1166
1682 msgid "command line"
1686 #: ../source/TortoiseMerge_en.xml:1168
1688 "Most switches require additional information like a path or some other "
1689 "string. In those cases, append an ':' to the switch and put the string/path "
1690 "after it. Example: <screen>\n"
1691 "/base:\"c:\\folder\\my base file.txt\"\n"
1694 "多数选项需要路径及其它信息。这种情况下,选项后用“:”跟一个字符串或路径。例如:"
1696 "/base:\"c:\\folder\\my base file.txt\"\n"
1700 #: ../source/TortoiseMerge_en.xml:1188
1701 msgid "List of available command line options"
1705 #: ../source/TortoiseMerge_en.xml:1194
1710 #: ../source/TortoiseMerge_en.xml:1195
1715 #: ../source/TortoiseMerge_en.xml:1201
1716 msgid "Shows a dialog box with the most important command line switches."
1717 msgstr "弹出一个显示常用命令行参数的对话框。"
1720 #: ../source/TortoiseMerge_en.xml:1208
1721 msgid "The same as <placeholder-1/>."
1722 msgstr "同 <placeholder-1/> 一样。"
1725 #: ../source/TortoiseMerge_en.xml:1209
1730 #: ../source/TortoiseMerge_en.xml:1214
1732 "Specifies the <placeholder-1/> file used in three way diffs. This is the "
1733 "common ancestor of the files being diffed, although it is not shown in a "
1734 "separate window. For two way diffs, this is the left file."
1736 "指定三路比较的文件 <placeholder-1/>。这是所有参与比较文件的祖先,尽管它不在单"
1737 "独的窗口显示。对于两路比较,它是左边的文件。"
1740 #: ../source/TortoiseMerge_en.xml:1215
1745 #: ../source/TortoiseMerge_en.xml:1224
1747 "The name of the base file. This is shown in the view title instead of the "
1748 "file path. For three way diffs it is shown in a tooltip for the view title."
1750 "基础版本文件名称。它代替文件路径在窗口标题栏显示。在三窗口方式时,它出现在窗口"
1754 #: ../source/TortoiseMerge_en.xml:1233
1756 "Specifies the <placeholder-1/> file used in three way diffs, displayed in the "
1758 msgstr "指定用于三窗口方式的 <placeholder-1/>,显示在左窗口。"
1761 #: ../source/TortoiseMerge_en.xml:1234
1766 #: ../source/TortoiseMerge_en.xml:1240
1768 "The name of the theirs file. This is shown in the view title instead of the "
1770 msgstr "他人的文件名称。代替文件路径在窗口标题栏显示。"
1773 #: ../source/TortoiseMerge_en.xml:1247
1775 "Specifies the <placeholder-1/> file used in three way diffs, displayed in the "
1776 "right pane. For two way diffs, this is the right file."
1778 "指定用于三窗口方式的 <placeholder-1/>,它显示在右窗口。对于双面板方式,是指右"
1782 #: ../source/TortoiseMerge_en.xml:1248
1787 #: ../source/TortoiseMerge_en.xml:1255
1789 "The name of the mine file. This is shown in the view title instead of the "
1791 msgstr "我的文件名称。代替文件路径在窗口标题栏显示。"
1794 #: ../source/TortoiseMerge_en.xml:1262
1796 "Specifies the resulting <placeholder-1/> file used in three way diffs. This "
1797 "is the file path where the result of the merge/conflict resolving is saved. "
1798 "If this is not set, then TortoiseMerge will ask the user where to save the "
1801 "指定用于三路合并的结果文件 <placeholder-1/>。它是保存合并/解决冲突的结果的文件"
1802 "路径。如果没有指定,TortoiseMerge 将询问用户保存结果的路径。"
1805 #: ../source/TortoiseMerge_en.xml:1263
1810 #: ../source/TortoiseMerge_en.xml:1272
1812 "The name of the merged file. This is shown in the view title instead of the "
1814 msgstr "合并结果的文件名称。显示在窗口标题显示路径的地方。"
1817 #: ../source/TortoiseMerge_en.xml:1279
1819 "The path where a patch should be applied to. If you don't set this path, then "
1820 "TortoiseMerge will try to find the path itself to match the paths in the "
1821 "patch file, but that can take <placeholder-1/>."
1823 "使用补丁文件的路径。如果你不设置此路径,TortoiseMerge 将自己查找匹配补丁文件的"
1824 "路径,但会花费<placeholder-1/>时间。"
1827 #: ../source/TortoiseMerge_en.xml:1283
1832 #: ../source/TortoiseMerge_en.xml:1288
1833 msgid "The name of the original file to patch. Used for the view title."
1834 msgstr "对应补丁的原始文件。用于窗口标题。"
1837 #: ../source/TortoiseMerge_en.xml:1295
1838 msgid "The name of the resulting patched file. Used for the view title."
1839 msgstr "对应补丁的文件名称。用于窗口标题。"
1842 #: ../source/TortoiseMerge_en.xml:1302
1843 msgid "The path to the patch/diff file to apply to a directory."
1847 #: ../source/TortoiseMerge_en.xml:1308
1849 "Forces TortoiseMerge to start with the one-way view instead of the view the "
1850 "user specified in the settings."
1851 msgstr "强制 TortoiseMerge 以单窗口视图启动,忽略用户的配置。"
1854 #: ../source/TortoiseMerge_en.xml:1315
1855 msgid "Switches the left and right view of the specified two files to diff."
1856 msgstr "左右交换两个需要比较差异的文件。"
1859 #: ../source/TortoiseMerge_en.xml:1322
1861 "Creates a unified diff file (patch file) of two files specified with "
1862 "<placeholder-1/> and <placeholder-2/>. The target path is set with "
1863 "<placeholder-3/>. If <placeholder-4/> is not set, a file save dialog is shown "
1864 "so the user can choose the location to save the patch file. Note: If "
1865 "<placeholder-5/> is set, all other parameters are ignored."
1867 "为指定的两个文件 <placeholder-1/> 和 <placeholder-2/> 创建统一差异文件(补丁文"
1868 "件)。目标路径设置为 <placeholder-3/>。如果没有设置 <placeholder-4/>,会显示文"
1869 "件保存对话框,从而用户可以选择保存补丁文件的位置。注意:如果设置了 "
1870 "<placeholder-5/>,所有其它参数都会被忽略。"
1873 #: ../source/TortoiseMerge_en.xml:1325
1874 msgid "/origfile:\"path_to_original_file\""
1875 msgstr "/origfile:\"path_to_original_file\""
1878 #: ../source/TortoiseMerge_en.xml:1326
1879 msgid "/modifiedfile:\"path_to_modified_file\""
1880 msgstr "/modifiedfile:\"path_to_modified_file\""
1883 #: ../source/TortoiseMerge_en.xml:1328
1884 msgid "/outfile:\"path_to_resulting_patchfile\""
1885 msgstr "/outfile:\"path_to_resulting_patchfile\""
1888 #: ../source/TortoiseMerge_en.xml:1329
1893 #: ../source/TortoiseMerge_en.xml:1332
1894 msgid "/createunifieddiff"
1895 msgstr "/createunifieddiff"
1898 #: ../source/TortoiseMerge_en.xml:1340
1900 "You can also supply simple filenames on the command line for compatibility "
1901 "with other diff programs. In this simplified form the command line is "
1903 "TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n"
1904 "</screen> If two files are given they will be compared with each other. If "
1905 "three files are given, the first is taken as the BASE file, and the other two "
1906 "are compared with it in a three-way diff."
1908 "为了兼容其它差异比较程序,你也可以在命令行提供简单的文件名。这种简单命令行格式"
1910 "TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n"
1911 "</screen>如果给出两个文件,它们会互相比较。如果给出三个文件,那么第一个文件视"
1912 "为基础文件,其它两个文件采用三路比较算法。"
1915 #: ../source/TortoiseMerge_en.xml:1356
1920 #: ../source/TortoiseMerge_en.xml:1358
1925 #: ../source/TortoiseMerge_en.xml:1360
1927 "A Git command that is used to add a file or directory to your working "
1928 "copy. The new items are added to the repository when you commit."
1930 "用于增加文件或目录到你的工作副本中的 Git 命令。当你提交时,这些新项目会"
1934 #: ../source/TortoiseMerge_en.xml:1368
1935 msgid "BASE revision"
1939 #: ../source/TortoiseMerge_en.xml:1370
1941 "The current base revision of a file or folder in your <emphasis>working copy</"
1942 "emphasis>. This is the revision the file or folder was in, when the last "
1943 "checkout, update or commit was run. The BASE revision is normally not equal "
1944 "to the HEAD revision."
1946 "<emphasis>工作拷贝</emphasis>中的文件或文件夹的当前基础版本。它是文件或文件夹"
1947 "上次检出、更新或提交后的版本。通常基础版本与最新版本并不相同。"
1950 #: ../source/TortoiseMerge_en.xml:1379
1955 #: ../source/TortoiseMerge_en.xml:1381
1957 "This command is for text files only, and it annotates every line to show the "
1958 "repository revision in which it was last changed, and the author who made "
1959 "that change. Our GUI implementation is called TortoiseBlame and it also shows "
1960 "the commit date/time and the log message when you hover the mouse of the "
1963 "这个命令只能用于文本文件,它显示每行由哪个版本最后修改,以及修改的作者。我们"
1964 "的 GUI 实现称之为 TortoiseBlame,当你将鼠标停靠在版本号上时,还会显示提交的日"
1968 #: ../source/TortoiseMerge_en.xml:1391
1973 #: ../source/TortoiseMerge_en.xml:1393
1975 "Berkeley DB. A well tested database backend for repositories, that cannot be "
1976 "used on network shares. Default for pre 1.2 repositories."
1978 "伯克利 DB(BDB)。 一个经过广泛测试的版本库的数据库后端,不能使用网络文件系统(例"
1979 "如 NFS 或 SMBFS)。是 1.2 版本及以前的版本库之默认后端。"
1982 #: ../source/TortoiseMerge_en.xml:1400
1987 #: ../source/TortoiseMerge_en.xml:1402
1989 "A term frequently used in revision control systems to describe what happens "
1990 "when development forks at a particular point and follows 2 separate paths. "
1991 "You can create a branch off the main development line so as to develop a new "
1992 "feature without rendering the main line unstable. Or you can branch a stable "
1993 "release to which you make only bug fixes, while new developments take place "
1994 "on the unstable trunk. In Git a branch is implemented as a "
1995 "<quote>cheap copy</quote>."
1997 "一个经常被开发者在特定时期跟踪两个独立路径时使用的术语,它描述了在版本控制系统"
1998 "中发生的事情。你可以从主开发线创建分支,从而开发新特性,不会使主开发线陷入不稳"
1999 "定状态。或者你创建一个稳定发布版的分支,仅用于修复问题,新的开发位于不稳定的主"
2000 "开发线。在 Git 中,分支用<quote>廉价拷贝</quote>实现。"
2003 #: ../source/TortoiseMerge_en.xml:1415
2008 #: ../source/TortoiseMerge_en.xml:1417
2010 "A Git command which creates a local working copy in an empty directory "
2011 "by downloading versioned files from the repository."
2013 "此 Git 命令从版本库下载受版本控制的文件,在空目录创建本地工作副本。"
2016 #: ../source/TortoiseMerge_en.xml:1424
2021 #: ../source/TortoiseMerge_en.xml:1426
2023 "To quote from the Git book: <quote> Recursively clean up the working "
2024 "copy, removing locks and resuming unfinished operations. If you ever get a "
2025 "<emphasis>working copy locked</emphasis> error, run this command to remove "
2026 "stale locks and get your working copy into a usable state again. </quote> "
2027 "Note that in this context <emphasis>lock</emphasis> refers to local "
2028 "filesystem locking, not repository locking."
2030 "摘自 Git 手册:<quote> 递归的清理工作目录,删除锁,恢复未完成的工作。如"
2031 "果你遇到<literal>工作目录已经锁定</literal>错误,运行此命令删除过时的锁,使你"
2032 "的工作副本恢复到可用状态。</quote>注释:在此上下文中<quote>锁</quote>指的是本"
2036 #: ../source/TortoiseMerge_en.xml:1441
2041 #: ../source/TortoiseMerge_en.xml:1443
2043 "This Git command is used to pass the changes in your local working "
2044 "copy back into the repository, creating a new repository revision."
2045 msgstr "此 Git 命令用于将你的本地修改传递到版本库中,创建新版本。"
2048 #: ../source/TortoiseMerge_en.xml:1451
2053 #: ../source/TortoiseMerge_en.xml:1453
2055 "When changes from the repository are merged with local changes, sometimes "
2056 "those changes occur on the same lines. In this case Git cannot "
2057 "automatically decide which version to use and the file is said to be in "
2058 "conflict. You have to edit the file manually and resolve the conflict before "
2059 "you can commit any further changes."
2061 "当仓库的改变合并到本地修改时,有时会在相同的行修改。在这种情况下,Git "
2062 "不能自动决定采用哪个版本,文件就处于冲突状态。你必须手工编辑文件,在你提交之前"
2066 #: ../source/TortoiseMerge_en.xml:1463
2071 #: ../source/TortoiseMerge_en.xml:1465
2073 "In a Git repository you can create a copy of a single file or an "
2074 "entire tree. These are implemented as <quote>cheap copies</quote> which act a "
2075 "bit like a link to the original in that they take up almost no space. Making "
2076 "a copy preserves the history of the item in the copy, so you can trace "
2077 "changes made before the copy was made."
2079 "在 Git 版本库中,你可以创建单个文件或一个目录树的副本。此操作用<quote>"
2080 "廉价拷贝</quote>实现,它有些象符号连接到原始文件,几乎不耗费空间。创建的副本保"
2081 "留了历史,所以你可以跟踪副本创建之前的修改。"
2084 #: ../source/TortoiseMerge_en.xml:1475
2089 #: ../source/TortoiseMerge_en.xml:1477
2091 "When you delete a versioned item (and commit the change) the item no longer "
2092 "exists in the repository after the committed revision. But of course it still "
2093 "exists in earlier repository revisions, so you can still access it. If "
2094 "necessary, you can copy a deleted item and <quote>resurrect</quote> it "
2095 "complete with history."
2097 "当你删除一个受版本控制的项(并且提交了修改),在那么在此提交版本后,它就消失于版"
2098 "本库中。当然,它仍旧包含在版本库的早期版本中,所以你还可以访问它。如果需要,你"
2099 "可以复制一个已删除项,包含历史的彻底<quote>复活</quote>它。"
2102 #: ../source/TortoiseMerge_en.xml:1487
2107 #: ../source/TortoiseMerge_en.xml:1489
2109 "Shorthand for <quote>Show Differences</quote>. Very useful when you want to "
2110 "see exactly what changes have been made."
2111 msgstr "<quote>显示差异</quote>的简写。当你想精确的察看变化时很有用。"
2114 #: ../source/TortoiseMerge_en.xml:1496
2119 #: ../source/TortoiseMerge_en.xml:1498
2121 "This command produces a copy of a versioned folder, just like a working copy, "
2122 "but without the local <literal>.svn</literal> folders."
2124 "此命令产生一个受版本控制的文件夹之副本,很像工作副本,只是没有本地的 "
2125 "<literal>.svn</literal> 文件夹。"
2128 #: ../source/TortoiseMerge_en.xml:1506
2133 #: ../source/TortoiseMerge_en.xml:1508
2135 "A proprietary Git filesystem backend for repositories. Can be used on "
2136 "network shares. Default for 1.2 and newer repositories."
2138 "一个专用于 Git 版本库的文件系统后端,可以使用网络文件系统(例如 NFS 或 "
2139 "SMBFS)。是 1.2 版本及其后的版本库之默认后端。"
2142 #: ../source/TortoiseMerge_en.xml:1515
2147 #: ../source/TortoiseMerge_en.xml:1517
2148 msgid "Group policy object"
2152 #: ../source/TortoiseMerge_en.xml:1523
2153 msgid "HEAD revision"
2157 #: ../source/TortoiseMerge_en.xml:1525
2159 "The latest revision of a file or folder in the <emphasis>repository</"
2161 msgstr "<emphasis>版本库</emphasis> 中的文件或文件夹的最新版本。"
2164 #: ../source/TortoiseMerge_en.xml:1531
2169 #: ../source/TortoiseMerge_en.xml:1533
2171 "Git command to import an entire folder hierarchy into the repository "
2172 "in a single revision."
2173 msgstr "用于一次导入整个文件夹(包含子目录)的 Git 命令。"
2176 #: ../source/TortoiseMerge_en.xml:1540
2181 #: ../source/TortoiseMerge_en.xml:1542
2183 "When you take out a lock on a versioned item, you mark it in the repository "
2184 "as non-committable, except from the working copy where the lock was taken out."
2186 "当你加锁一个版本控制项目,除了在发出加锁命令的工作目录,它在版本库中被标记为不"
2190 #: ../source/TortoiseMerge_en.xml:1550
2195 #: ../source/TortoiseMerge_en.xml:1552
2197 "Show the revision history of a file or folder. Also known as <quote>History</"
2199 msgstr "显示文件或目录的版本历史。也称为<quote>历史</quote>。"
2202 #: ../source/TortoiseMerge_en.xml:1559
2207 #: ../source/TortoiseMerge_en.xml:1561
2209 "Show the revision history of a file or folder. Also known as <quote>Log</"
2211 msgstr "显示文件或目录的版本历史。也称为<quote>日志</quote>。"
2214 #: ../source/TortoiseMerge_en.xml:1568
2219 #: ../source/TortoiseMerge_en.xml:1570
2221 "The process by which changes from the repository are added to your working "
2222 "copy without disrupting any changes you have already made locally. Sometimes "
2223 "these changes cannot be reconciled automatically and the working copy is said "
2224 "to be in conflict."
2226 "将版本库中的修改增加到你的工作副本,不破坏本地的任何改变。有时这些修改不能自动"
2230 #: ../source/TortoiseMerge_en.xml:1576
2232 "Merging happens automatically when you update your working copy. You can also "
2233 "merge specific changes from another branch using TortoiseGit's Merge command."
2235 "当你更新工作副本时,自动发生合并。你可以使用 TortoiseGit 的合并命令合并其它分"
2239 #: ../source/TortoiseMerge_en.xml:1584
2244 #: ../source/TortoiseMerge_en.xml:1586
2246 "If a working copy has changes to text files only, it is possible to use "
2247 "Git's Diff command to generate a single file summary of those changes "
2248 "in Unified Diff format. A file of this type is often referred to as a "
2249 "<quote>Patch</quote>, and it can be emailed to someone else (or to a mailing "
2250 "list) and applied to another working copy. Someone without commit access can "
2251 "make changes and submit a patch file for an authorized committer to apply. Or "
2252 "if you are unsure about a change you can submit a patch for others to review."
2254 "如果工作副本只修改了文本文件,就可以使用 Git 的差异命令产生一个标准差异"
2255 "格式文件。这种文件类型通常称为<quote>补丁</quote>,可以应用到其他工作副本。没"
2256 "有提交权的人可以在修改后,发送补丁文件给一个认可的提交者来提交。或者不能确定此"
2257 "修改是否恰当,你可以发送补丁给其他人评审。"
2260 #: ../source/TortoiseMerge_en.xml:1599
2265 #: ../source/TortoiseMerge_en.xml:1601
2267 "In addition to versioning your directories and files, Git allows you "
2268 "to add versioned metadata - referred to as <quote>properties</quote> to each "
2269 "of your versioned directories and files. Each property has a name and a "
2270 "value, rather like a registry key. Git has some special properties "
2271 "which it uses internally, such as <literal>svn:eol-style</literal>. "
2272 "TortoiseGit has some too, such as <literal>tsvn:logminsize</literal>. You can "
2273 "add your own properties with any name and value you choose."
2275 "在版本控制文件和目录之外,Git 还允许你增加版本控制元数据 - 称为<quote>"
2276 "属性</quote> - 到你的版本控制文件和目录。每个属性都有名字和值,很像注册表键。"
2277 "Git 有内部使用的专用属性,例如 <literal>svn:eol-style</literal>。"
2278 "TortoiseGit 也是如此,例如 <literal>tsvn:logminsize</literal>。你可以增加自己"
2282 #: ../source/TortoiseMerge_en.xml:1614
2287 #: ../source/TortoiseMerge_en.xml:1616
2289 "If your repository moves, perhaps because you have moved it to a different "
2290 "directory on your server, or the server domain name has changed, you need to "
2291 "<quote>relocate</quote> your working copy so that its repository URLs point "
2292 "to the new location."
2294 "如果你的版本库移动了,或许是你在服务器上将它移到其它目录,或者服务器域名改变"
2295 "了,你需要<quote>重新定位</quote>工作目录,让其版本库地址指向新的位置。"
2298 #: ../source/TortoiseMerge_en.xml:1622
2300 "Note: you should only use this command if your working copy is referring to "
2301 "the same location in the same repository, but the repository itself has "
2302 "moved. In any other circumstance you probably need the <quote>Switch</quote> "
2305 "注意:你只能在同一版本库中,工作副本引用相同的位置,仅版本库移动的情况下使用这"
2306 "个命令。 在其它情况下,或许你需要用<quote>切换</quote>命令。"
2309 #: ../source/TortoiseMerge_en.xml:1631
2314 #: ../source/TortoiseMerge_en.xml:1633
2316 "A repository is a central place where data is stored and maintained. A "
2317 "repository can be a place where multiple databases or files are located for "
2318 "distribution over a network, or a repository can be a location that is "
2319 "directly accessible to the user without having to travel across a network."
2321 "版本库是存储和维护数据的中央部分。一个版本库的数据库或文件可以放在通过网络可访"
2322 "问的位置,或者存放在一个不需要通过网络就可以访问的地方。"
2325 #: ../source/TortoiseMerge_en.xml:1642
2330 #: ../source/TortoiseMerge_en.xml:1644
2332 "When files in a working copy are left in a conflicted state following a "
2333 "merge, those conflicts must be sorted out by a human using an editor (or "
2334 "perhaps TortoiseMerge). This process is referred to as <quote>Resolving "
2335 "Conflicts</quote>. When this is complete you can mark the conflicted files as "
2336 "being resolved, which allows them to be committed."
2338 "当工作副本中的文件在合并后处于冲突状态时,这些冲突使用使用编辑器(或许是 "
2339 "TortoiseMerge)手工清理。这个步骤称为<quote>解决冲突</quote>。然后你就能标记这"
2340 "些冲突文件已经解决,允许提交这些文件。"
2343 #: ../source/TortoiseMerge_en.xml:1654
2348 #: ../source/TortoiseMerge_en.xml:1656
2350 "Git keeps a local <quote>pristine</quote> copy of each file as it was "
2351 "when you last updated your working copy. If you have made changes and decide "
2352 "you want to undo them, you can use the <quote>revert</quote> command to go "
2353 "back to the pristine copy."
2355 "当最后更新工作目录时,Git 为每个文件保留了一份本地<quote>原始</quote>副"
2356 "本。如果你做了修改,决定撤销,可以使用<quote>恢复</quote>命令得到原始副本。"
2359 #: ../source/TortoiseMerge_en.xml:1665
2364 #: ../source/TortoiseMerge_en.xml:1667
2366 "Every time you commit a set of changes, you create one new <quote>revision</"
2367 "quote> in the repository. Each revision represents the state of the "
2368 "repository tree at a certain point in its history. If you want to go back in "
2369 "time you can examine the repository as it was at revision N."
2371 "在你每次提交改变集时,就在版本库创建了一个新<quote>版本</quote>。每个版本都表"
2372 "示版本库历史上的确定状态点。如果你想回溯历史,可以使用版本 N 来检查版本库。"
2375 #: ../source/TortoiseMerge_en.xml:1674
2377 "In another sense, a revision can refer to the set of changes that were made "
2378 "when that revision was created."
2379 msgstr "换个说法,版本可以引用它创建时产生的改变集。"
2382 #: ../source/TortoiseMerge_en.xml:1681
2383 msgid "Revision Property (revprop)"
2384 msgstr "版本属性(revprop)"
2387 #: ../source/TortoiseMerge_en.xml:1683
2389 "Just as files can have properties, so can each revision in the repository. "
2390 "Some special revprops are added automatically when the revision is created, "
2391 "namely: <literal>svn:date svn:author svn:log</literal> which represent the "
2392 "commit date/time, the committer and the log message respectively. These "
2393 "properties can be edited, but they are not versioned, so any change is "
2394 "permanent and cannot be undone."
2396 "正如文件可以有属性,版本库中的版本也有。当创建版本时,会自动创建版本属性,即:"
2397 "<literal>svn:date svn:author svn:log</literal>,分别描述了提交日期/时间,提交"
2398 "者,日志信息。这些信息可以编辑,但是没有版本,所以任何修改都是永久的,不能撤"
2402 #: ../source/TortoiseMerge_en.xml:1695
2407 #: ../source/TortoiseMerge_en.xml:1697
2408 msgid "A frequently-used abbreviation for Git."
2409 msgstr "一个友好的 Git 缩写。"
2412 #: ../source/TortoiseMerge_en.xml:1700
2414 "The name of the Git custom protocol used by the <quote>svnserve</"
2415 "quote> repository server."
2416 msgstr "被<quote>svnserve</quote>版本库服务器使用的专用协议名称。"
2419 #: ../source/TortoiseMerge_en.xml:1707
2424 #: ../source/TortoiseMerge_en.xml:1709
2426 "Just as <quote>Update-to-revision</quote> changes the time window of a "
2427 "working copy to look at a different point in history, so <quote>Switch</"
2428 "quote> changes the space window of a working copy so that it points to a "
2429 "different part of the repository. It is particularly useful when working on "
2430 "trunk and branches where only a few files differ. You can switch your working "
2431 "copy between the two and only the changed files will be transferred."
2433 "就像<quote>更新到版本</quote>改变了工作副本的时间窗口,可以察看历史上的不同时"
2434 "间点一样,<quote>切换</quote> 改变了工作副本的空间窗口,它可以指向版本库中的不"
2435 "同部分。当两个开发分支仅有少数文件不同时,它非常有用。你可以在两者之间切换工作"
2439 #: ../source/TortoiseMerge_en.xml:1721
2444 #: ../source/TortoiseMerge_en.xml:1723
2446 "This Git command pulls down the latest changes from the repository "
2447 "into your working copy, merging any changes made by others with local changes "
2448 "in the working copy."
2450 "此命令从 Git 版本库下载最新的修改到你的工作副本,合并任何本地修改。"
2453 #: ../source/TortoiseMerge_en.xml:1731
2454 msgid "Working Copy"
2458 #: ../source/TortoiseMerge_en.xml:1733
2460 "This is your local <quote>sandbox</quote>, the area where you work on the "
2461 "versioned files, and it normally resides on your local hard disk. You create "
2462 "a working copy by doing a <quote>Checkout</quote> from a repository, and you "
2463 "feed your changes back into the repository using <quote>Commit</quote>."
2465 "这是一个本地 <quote>沙箱</quote>,你在受版本控制的文件上工作的区域,它通常位于"
2466 "你的本地硬盘上。你可以用<quote>检出</quote>从版本库创建工作副本,使用<quote>提"
2467 "交</quote>将你的改变传回版本库。"