From 4c85d5291c4be922c344cf5f4bc004cfec33c58f Mon Sep 17 00:00:00 2001 From: Dongsheng Song Date: Wed, 9 May 2007 13:38:04 +0800 Subject: [PATCH] [TortoiseSVN] Update Simplified Chinese DOC translation --- tortoisesvn/doc/po/TortoiseMerge_zh_CN.po | 1640 ++-- tortoisesvn/doc/po/TortoiseSVN_zh_CN.po | 13730 ++++++++++++++-------------- 2 files changed, 7684 insertions(+), 7686 deletions(-) diff --git a/tortoisesvn/doc/po/TortoiseMerge_zh_CN.po b/tortoisesvn/doc/po/TortoiseMerge_zh_CN.po index 6fd6ed7..1db6eb8 100644 --- a/tortoisesvn/doc/po/TortoiseMerge_zh_CN.po +++ b/tortoisesvn/doc/po/TortoiseMerge_zh_CN.po @@ -35,1084 +35,1084 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Put one translator per line, in the form of NAME . -#: source/TortoiseMerge_en.xml:0(None) -msgid "translator-credits" -msgstr "" -"Dongsheng Song \n" -"xingyu.wang \n" -"Stan J " - -#. Place the translation of 'translation' here. -#: source/TortoiseMerge_en.xml:0(None) -msgid "translator-translation" -msgstr "译者" - -#: source/TortoiseMerge_en.xml:1000(entry) -msgid "Specifies the file used in three way diffs. This is the common ancestor of the files being diffed, although it is not shown in a separate window. For two way diffs, this is the left file." -msgstr "指定三路比较的文件 。这是所有参与比较文件的祖先，尽管它不在单独的窗口显示。对于两路比较，它是左边的文件。" - -#: source/TortoiseMerge_en.xml:1001(emphasis) -msgid "base" -msgstr "基础版本文件" +#: source/TortoiseMerge_en.xml:4(title) +msgid "TortoiseMerge" +msgstr "TortoiseMerge" -#: source/TortoiseMerge_en.xml:1010(entry) -msgid "The name of the base file. This is shown in the view title instead of the file path. For three way diffs it is shown in a tooltip for the view title." -msgstr "基础版本文件名称。它代替文件路径在窗口标题栏显示。在三窗口方式时，它出现在窗口标题的提示中。" +#: source/TortoiseMerge_en.xml:6(subtitle) +msgid "A diff/merge tool for Windows" +msgstr "一种Windows下的比较及合并差异的工具" -#: source/TortoiseMerge_en.xml:1019(entry) -msgid "Specifies the file used in three way diffs, displayed in the left pane." -msgstr "指定用于三窗口方式的 ，显示在左窗口。" +#: source/TortoiseMerge_en.xml:9(edition) +msgid "First" +msgstr "第一版" -#: source/TortoiseMerge_en.xml:1020(emphasis) -msgid "theirs" -msgstr "他人的文件" +#: source/TortoiseMerge_en.xml:12(firstname) +msgid "Stefan" +msgstr "Stefan" -#: source/TortoiseMerge_en.xml:1026(entry) -msgid "The name of the theirs file. This is shown in the view title instead of the file path." -msgstr "他人的文件名称。代替文件路径在窗口标题栏显示。" +#: source/TortoiseMerge_en.xml:13(surname) +msgid "Küng" +msgstr "Küng" -#: source/TortoiseMerge_en.xml:1033(entry) -msgid "Specifies the file used in three way diffs, displayed in the right pane. For two way diffs, this is the right file." -msgstr "指定用于三窗口方式的 ，它显示在右窗口。对于双面板方式，是指右边的文件。" +#: source/TortoiseMerge_en.xml:16(firstname) +msgid "Lübbe" +msgstr "Lübbe" -#: source/TortoiseMerge_en.xml:1034(emphasis) -msgid "mine" -msgstr "我的文件" +#: source/TortoiseMerge_en.xml:17(surname) +msgid "Onken" +msgstr "Onken" -#: source/TortoiseMerge_en.xml:1041(entry) -msgid "The name of the mine file. This is shown in the view title instead of the file path." -msgstr "我的文件名称。代替文件路径在窗口标题栏显示。" +#: source/TortoiseMerge_en.xml:20(firstname) +msgid "Simon" +msgstr "Simon" -#: source/TortoiseMerge_en.xml:1048(entry) -msgid "Specifies the resulting file used in three way diffs. This is the filepath where the result of the merge/conflict resolving is saved. If this is not set, then TortoiseMerge will ask the user where to save the result." -msgstr "指定用于三窗口方式的 。它是保存合并/解决冲突的结果的文件路径。如果没有指定，TortoiseMerge 将询问用户保存结果的路径。" +#: source/TortoiseMerge_en.xml:21(surname) +msgid "Large" +msgstr "Large" -#: source/TortoiseMerge_en.xml:1049(emphasis) -msgid "merged" -msgstr "合并后的文件" +#: source/TortoiseMerge_en.xml:28(title) +msgid "Preface" +msgstr "前言" -#: source/TortoiseMerge_en.xml:1058(entry) -msgid "The name of the merged file. This is shown in the view title instead of the file path." -msgstr "合并结果的文件名称。显示在窗口标题显示路径的地方。" +#: source/TortoiseMerge_en.xml:33(para) +msgid "When working on a project, either an open-source project where several people review your code, or a commercial project where you sell a component with your sourcecode, there will be people and customers who find bugs or want to improve your project. To do that they send you patches which you have to review and decide if you want to apply them." +msgstr "　　当开发一个项目的时候，无论是只有几个人审察你的代码的开源项目还是包括源代码的商业软件，总有一些人或使用者会发现一些错误或希望改进你的项目。因此，他们需要发送给你补丁，由你来审查并决定是否使用它们。" -#: source/TortoiseMerge_en.xml:1065(entry) -msgid "The path where a patch should be applied to. If you don't set this path, then TortoiseMerge will try to find the path itself to match the paths in the patchfile, but that can take ." -msgstr "使用补丁文件的路径。如果你不设置此路径，TortoiseMerge 将自己查找匹配补丁文件的路径，但会花费时间。" +#: source/TortoiseMerge_en.xml:45(para) +msgid "Reviewing patches" +msgstr "查看补丁" -#: source/TortoiseMerge_en.xml:1069(emphasis) -msgid "very long" -msgstr "很长" +#: source/TortoiseMerge_en.xml:50(para) +msgid "Applying the patches" +msgstr "应用补丁" -#: source/TortoiseMerge_en.xml:1074(entry) -msgid "The name of the original file to patch. Used for the view title." -msgstr "对应补丁的原始文件。用于窗口标题。" +#: source/TortoiseMerge_en.xml:41(para) +msgid "TortoiseMerge helps you with both those tasks: " +msgstr "　　TortoiseMerge 可以帮助你完成以下两件事情：" -#: source/TortoiseMerge_en.xml:1081(entry) -msgid "The name of the resulting patched file. Used for the view title." -msgstr "对应补丁的文件名称。用于窗口标题。" +#: source/TortoiseMerge_en.xml:56(para) +msgid "TortoiseMerge also helps you to sort out conflicted files which can occur if you're working with a source control system and others are working on the same files as you." +msgstr "　　如果你使用源代码控制系统，并且和其他人共同处理相同文件时，TortoiseMerge也能帮助你挑选出发生了冲突的文件。" -#: source/TortoiseMerge_en.xml:1088(entry) -msgid "The path to the patch/diff file to apply to a directory." -msgstr "将要应用补丁的目录" +#: source/TortoiseMerge_en.xml:66(title) +msgid "TortoiseMerge is free!" +msgstr "TortoiseMerge 是免费的！" -#: source/TortoiseMerge_en.xml:1094(entry) -msgid "Forces TortoiseMerge to start with the one-way view instead of the view the user specified in the settings." -msgstr "强制 TortoiseMerge 以单窗口视图启动，忽略用户的配置。" +#: source/TortoiseMerge_en.xml:67(para) +msgid "TortoiseMerge is free. You don't have to pay for it, you can use it any way you want. It is developed under the GP license (GPL)." +msgstr "　　TortoiseMerge 是免费的。你不需要为它支付任何费用就可以任意使用。它是在GPL许可协议下开发的。" -#: source/TortoiseMerge_en.xml:1101(entry) -msgid "Switches the left and right view of the specified two files to diff." -msgstr "左右交换两个需要比较差异的文件。" +#: source/TortoiseMerge_en.xml:71(para) +msgid "TortoiseMerge is an Open Source project. That means you have full access to the source code of this program. You can browse it on this link http://tortoisesvn.tigris.org/svn/tortoisesvn/. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under /trunk/ the released versions are located under /tags/." +msgstr "　　TortoiseMerge 是一个开源软件项目。换言之，你可以取得它的全部源代码。你可以访问以下链接得到源代码：http://tortoisesvn.tigris.org/svn/tortoisesvn/（用户名：guest，无密码） 。最新的版本（我们当前正在开发的）放在 /trunk/ ，已发布版本放在 /tags/ 。" -#: source/TortoiseMerge_en.xml:1110(para) -msgid "" -"You can also supply simple filenames on the command line for compatibility with other diff programs. In this simplified form the command line is \n" -"TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n" -" If two files are given they will be compared with each other. If three files are given, the first is taken as the BASE file, and the other two are compared with it in a three-way diff." -msgstr "" -"为了兼容其它差异比较程序，你也可以在命令行提供简单的文件名。这种简单命令行格式是\n" -"TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n" -"如果给出两个文件，它们会互相比较。如果给出三个文件，那么第一个文件视为基础文件，其它两个文件采用三路比较算法。" +#: source/TortoiseMerge_en.xml:90(title) +msgid "Wishlist" +msgstr "愿望" -#: source/TortoiseMerge_en.xml:1126(title) -msgid "Glossary" -msgstr "词汇表" +#: source/TortoiseMerge_en.xml:91(para) +msgid "Even though TortoiseSVN and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers." +msgstr "　　虽然 TortoiseSVN 和 TortoiseMerge 是免费软件，但是你可以通过发送一些补丁和积极参与开发来帮助开发者。此外，你还可以使我们在计算机前度过的漫长时间更加愉快。" -#: source/TortoiseMerge_en.xml:1128(glossterm) -msgid "Add" -msgstr "增加" +#: source/TortoiseMerge_en.xml:97(para) +msgid "While working on TortoiseSVN we love to listen to music. And since we spend many hours on the project we need a lot of music. Therefore we have set up some wish-lists with our favourite music CD's and DVD's: http://tortoisesvn.tigris.org/donate.html Please also have a look at the list of people who contributed to the project by sending in patches or translations." +msgstr "　　我们喜欢一边聆听音乐，一边开发 TortoiseSVN。由于我们在这个项目上花费了大量时间，我们需要很多的音乐。因此，我们创建了喜欢的音乐 CD 和 DVD 列表：http://tortoisesvn.tigris.org/donate.html 。此外，也请看一看那些为项目提供了补丁或翻译的人员名单。" #: source/TortoiseMerge_en.xml:113(title) msgid "Acknowledgments" msgstr "致谢" -#: source/TortoiseMerge_en.xml:1130(para) -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "用于增加文件或目录到你的工作副本中的 Subversion 命令。当你提交时，这些新项目会增加到版本库中。" - -#: source/TortoiseMerge_en.xml:1138(glossterm) -msgid "BASE revision" -msgstr "基础版本" - -#: source/TortoiseMerge_en.xml:1140(para) -msgid "The current base revision of a file or folder in your working copy. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision." -msgstr "工作拷贝中的文件或文件夹的当前基础版本。它是文件或文件夹上次检出、更新或提交后的版本。通常基础版本与最新版本并不相同。" - -#: source/TortoiseMerge_en.xml:1149(glossterm) -msgid "Blame" -msgstr "追溯" - -#: source/TortoiseMerge_en.xml:1151(para) -msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number." -msgstr "这个命令只能用于文本文件，它显示每行由哪个版本最后修改，以及修改的作者。我们的 GUI 实现称之为 TortoiseBlame，当你将鼠标停靠在版本号上时，还会显示提交的日期/时间，和日志。" - -#: source/TortoiseMerge_en.xml:1161(glossterm) -msgid "BDB" -msgstr "BDB" - -#: source/TortoiseMerge_en.xml:1163(para) -msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." -msgstr "伯克利 DB（BDB）。 一个经过广泛测试的版本库的数据库后端，不能使用网络文件系统(例如 NFS 或 SMBFS)。是 1.2 版本及以前的版本库之默认后端。" - #: source/TortoiseMerge_en.xml:117(term) msgid "Stefan Küng" msgstr "Stefan Küng" -#: source/TortoiseMerge_en.xml:1170(glossterm) -msgid "Branch" -msgstr "分支" +#: source/TortoiseMerge_en.xml:121(para) +msgid "for the hard work on TortoiseMerge" +msgstr "TortoiseMerge 的主要编程人" -#: source/TortoiseMerge_en.xml:1172(para) -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bugfixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "一个经常被开发者在特定时期跟踪两个独立路径时使用的术语，它描述了在版本控制系统中发生的事情。你可以从主开发线创建分支，从而开发新特性，不会使主开发线陷入不稳定状态。或者你创建一个稳定发布版的分支，仅用于修复问题，新的开发位于不稳定的主开发线。在 Subversion 中，分支用廉价拷贝实现。" +#: source/TortoiseMerge_en.xml:127(term) +msgid "Lübbe Onken" +msgstr "Lübbe Onken" -#: source/TortoiseMerge_en.xml:1185(glossterm) -msgid "Checkout" -msgstr "检出" +#: source/TortoiseMerge_en.xml:131(para) +msgid "for the beautiful icons, logo, bughunting and taking care of the documentation" +msgstr "制作了漂亮的图标、LOGO，检查错误及维护文档" -#: source/TortoiseMerge_en.xml:1187(para) -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "此 Subversion 命令从版本库下载受版本控制的文件，在空目录创建本地工作副本。" +#: source/TortoiseMerge_en.xml:138(term) +msgid "The Tigris Style project" +msgstr "Tigris 网站设计风格项目" -#: source/TortoiseMerge_en.xml:1194(glossterm) -msgid "Cleanup" -msgstr "清理" +#: source/TortoiseMerge_en.xml:142(para) +msgid "for some of the styles which are reused in this documentation" +msgstr "他们的设计风格被用于本文档" -#: source/TortoiseMerge_en.xml:1196(para) -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "摘自 Subversion 手册： 递归的清理工作目录，删除锁，恢复未完成的工作。如果你遇到工作目录已经锁定错误，运行此命令删除过时的锁，使你的工作副本恢复到可用状态。注释：在此上下文中锁指的是本地文件系统中的锁，不是版本库的锁。" +#: source/TortoiseMerge_en.xml:149(term) +msgid "Our Contributors" +msgstr "贡献者" -#: source/TortoiseMerge_en.xml:12(firstname) -msgid "Stefan" -msgstr "Stefan" +#: source/TortoiseMerge_en.xml:153(para) +msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list." +msgstr "提供了补丁、错误汇报及新的想法，并且在邮件列表上回答了其他人的问题。" -#: source/TortoiseMerge_en.xml:121(para) -msgid "for the hard work on TortoiseMerge" -msgstr "TortoiseMerge 的主要编程人" +#: source/TortoiseMerge_en.xml:160(term) +msgid "Our Donators" +msgstr "赞助者" -#: source/TortoiseMerge_en.xml:1211(glossterm) -msgid "Commit" -msgstr "提交" +#: source/TortoiseMerge_en.xml:164(para) +msgid "for many hours of joy with the music they sent us" +msgstr "他们送给我们的音乐陪伴了我们许多时间" -#: source/TortoiseMerge_en.xml:1213(para) -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "此 Subversion 命令用于将你的本地修改传递到版本库中，创建新版本。" +#: source/TortoiseMerge_en.xml:175(title) +msgid "Introduction" +msgstr "介绍" -#: source/TortoiseMerge_en.xml:1221(glossterm) -msgid "Conflict" -msgstr "冲突" +#: source/TortoiseMerge_en.xml:184(title) +msgid "Overview" +msgstr "概述" -#: source/TortoiseMerge_en.xml:1223(para) -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "当仓库的改变合并到本地修改时，有时会在相同的行修改。在这种情况下，Subversion 不能自动决定采用哪个版本，文件就处于冲突状态。你必须手工编辑文件，在你提交之前解决冲突。" +#: source/TortoiseMerge_en.xml:185(para) +msgid "TortoiseMerge is a free/open-source application. It lets you see differences in text files, merge those changes and even review and apply unified diff files, often called patches." +msgstr "　　TortoiseMerge 是一个免费软件/开源软件。通过它你可以查看文本文件之间的差异，并合并这些差异；甚至审查和采用这些标准差异文件——通常称之为 补丁 。" -#: source/TortoiseMerge_en.xml:1233(glossterm) -msgid "Copy" -msgstr "复制" +#: source/TortoiseMerge_en.xml:190(para) +msgid "While working on text files, e.g. source files in your favourite programming language, or html/xml files for your documentation or website, you will often have a situation where you need to compare different versions of those files. Sometimes you get a different version from someone else, sometimes you just want to see the changes you've made." +msgstr "　　当处理文本文件时，比如用你所喜欢的编程语言写的源代码，或者 Html/Xml 的文档或网站，你经常会碰到需要比较文件的不同版本的情况：有时候你从别人那里得到了一个不同版本的文件，或者有时候干脆就是你想知道你曾经做过什么修改。" -#: source/TortoiseMerge_en.xml:1235(para) -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "在 Subversion 版本库中，你可以创建单个文件或一个目录树的副本。此操作用廉价拷贝实现，它有些象符号连接到原始文件，几乎不耗费空间。创建的副本保留了历史，所以你可以跟踪副本创建之前的修改。" - -#: source/TortoiseMerge_en.xml:1245(glossterm) -msgid "Delete" -msgstr "删除" +#: source/TortoiseMerge_en.xml:198(para) +msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." +msgstr "　　如果你使用版本控制系统（如 Subversion）时，当你更新工作副本时你可能会遇到“ 冲突 ”。这种情况通常发生在其他人也修改了你当前正在处理的文件的同一部分。当遇到冲突时，你必须手工来解决它——这就是 TortoiseMerge 能帮助你的地方。" -#: source/TortoiseMerge_en.xml:1247(para) -msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the commited revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and resurrect it complete with history." -msgstr "当你删除一个受版本控制的项(并且提交了修改)，在那么在此提交版本后，它就消失于版本库中。当然，它仍旧包含在版本库的早期版本中，所以你还可以存取它。如果需要，你可以复制一个已删除项，包含历史的彻底复活它。" +#: source/TortoiseMerge_en.xml:206(para) +msgid "The following diagram shows you the relationships between the files involved in a conflict:" +msgstr "　　下图说明了存在冲突的文件之间的关系。" -#: source/TortoiseMerge_en.xml:1257(glossterm) -msgid "Diff" -msgstr "差异" +#: source/TortoiseMerge_en.xml:211(title) +#: source/TortoiseMerge_en.xml:385(title) +msgid "File Conflict" +msgstr "文件冲突" -#: source/TortoiseMerge_en.xml:1259(para) -msgid "Shorthand for Show Differences. Very useful when you want to see exactly what changes have been made." -msgstr "显示差异的简写。当你想精确的察看变化时很有用。" +#: source/TortoiseMerge_en.xml:214(para) +msgid "A conflict can also occur if you try to apply an outdated patchfile. In such cases, without TortoiseMerge, you would either have to ask the person you got that patchfile from for a current version or try to apply that patchfile manually." +msgstr "　　应用一个过时的补丁时也可能出现冲突。在这种情况下，不应该使用TortoiseMerge，你要么向补丁提供者索取一个当前版本的补丁，要么手工的应用该补丁。" -#: source/TortoiseMerge_en.xml:1266(glossterm) -msgid "Export" -msgstr "导出" +#: source/TortoiseMerge_en.xml:220(para) +msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patchfile for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." +msgstr "　　但是现在 TortoiseMerge 不再是必需的了——至少当你使用类似 Subversion 这样的版本控制系统时不是必需的。TortoiseMerge 解析某次修订/某个版本的补丁文件并自动尝试从你的版本控制系统中获取对应的版本，然后应用该补丁并让你对比文件的原始内容及其修改后的内容。因此你能决定是否接受那些修改。" -#: source/TortoiseMerge_en.xml:1268(para) -msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local .svn folders." -msgstr "此命令产生一个受版本控制的文件夹之副本，很像工作副本，只是没有本地的 .svn 文件夹。" +#: source/TortoiseMerge_en.xml:235(title) +msgid "TortoiseMerge's History" +msgstr "TortoiseMerge 的历史" -#: source/TortoiseMerge_en.xml:127(term) -msgid "Lübbe Onken" -msgstr "Lübbe Onken" +#: source/TortoiseMerge_en.xml:236(para) +msgid "While working on TortoiseSVN we found that whenever users sent in patches to enhance the project or just to fix bugs, we had a lot of work just applying those patches. And many times those patches were outdated and couldn't be applied with the command line patch tool http://unxutils.sourceforge.net/ because we were working on those files and had sometimes changed those files already." +msgstr "当我们开发 TortoiseSVN 时发现，只要用户发送补丁增强这个项目，或者只是修正问题，我们就需要为应用这些补丁付出许多工作量。并且很多时候，这些补丁是过时的，不能使用命令行工具 http://unxutils.sourceforge.net/ 打补丁，因为我们正在修改这些文件，有时候已经修改了。" -#: source/TortoiseMerge_en.xml:1276(glossterm) -msgid "FSFS" -msgstr "FSFS" +#: source/TortoiseMerge_en.xml:251(para) +msgid "This was also the main reason why TortoiseSVN did not originally have a TortoiseSVNCreate Patch implemented: we preferred users to send us the whole files because with those it was easier to apply patches." +msgstr "这也是最初的 TortoiseSVN 没有实现 TortoiseSVN创建补丁 的主要理由：我们期望用户发送给我们整个文件，这样容易打补丁。" -#: source/TortoiseMerge_en.xml:1278(para) -msgid "FS Filesystem. A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "FS 文件系统。一个专用于 Subversion 版本库的文件系统后端，可以使用网络文件系统(例如 NFS 或 SMBFS)。是 1.2 版本及其后的版本库之默认后端。" +#: source/TortoiseMerge_en.xml:261(para) +msgid "So we spent a lot of time, searching the internet for a GUI tool which could apply patchfiles, but all we found was that such a tool didn't exist. So to cut a long story short: We decided that if no-one else could provide such a tool we would have to write our own. That's when TortoiseMerge was born." +msgstr "于是我们花费了大量时间，在互联网搜索一个打补丁的图形工具，但是我们没有发现这样的工具。长话短说：既然没有人提供这样的工具，我们决定自行编写。就在那时，TortoiseMerge 出世了。" -#: source/TortoiseMerge_en.xml:1285(glossterm) -msgid "GPO" -msgstr "GPO" +#: source/TortoiseMerge_en.xml:268(para) +msgid "Since TortoiseSVN already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff. Also it reduces the size of the executable since TortoiseSVN and TortoiseMerge can both use the same dll's." +msgstr "因为 TortoiseSVN 已经使用了 Subversion 库，它内置了一个很好的差异比较工具。很自然的，我们使用这个库代替 GNU diff。而且因为 TortoiseSVN 和 TortoiseMerge 使用了同样的 dll，可执行文件也变小了。" -#: source/TortoiseMerge_en.xml:1287(para) -msgid "Group policy object" -msgstr "组策略对象" +#: source/TortoiseMerge_en.xml:278(title) +msgid "Using TortoiseMerge" +msgstr "使用 TortoiseMerge" -#: source/TortoiseMerge_en.xml:1293(glossterm) -msgid "HEAD revision" -msgstr "最新版本" +#: source/TortoiseMerge_en.xml:287(title) +msgid "Open Files" +msgstr "打开文件" -#: source/TortoiseMerge_en.xml:1295(para) -msgid "The latest revision of a file or folder in the repository." -msgstr "版本库 中的文件或文件夹的最新版本。" +#: source/TortoiseMerge_en.xml:289(para) +msgid "When you start TortoiseMerge without any command line switches then you have to open the files manually, using FileOpen." +msgstr "当不使用任何命令行参数启动 TortoiseMerge 时，你必须使用文件打开来手工打开文件。" -#: source/TortoiseMerge_en.xml:13(surname) -msgid "Küng" -msgstr "Küng" +#: source/TortoiseMerge_en.xml:298(title) +msgid "The Open Dialog" +msgstr "打开文件对话框" -#: source/TortoiseMerge_en.xml:1301(glossterm) -msgid "Import" -msgstr "导入" +#: source/TortoiseMerge_en.xml:301(para) +msgid "The first thing you have to do is to decide whether you just want to compare/merge files, or whether you want to apply a patchfile. Depending on what you choose, the corresponding edit boxes and browse buttons are activated." +msgstr "你要作的第一件事，就是决定是否比较/合并文件，或者是否使用补丁。根据你的选择，相应的编辑框和浏览按钮被激活。" -#: source/TortoiseMerge_en.xml:1303(para) -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "用于一次导入整个文件夹(包含子目录)的 Subversion 命令。" +#: source/TortoiseMerge_en.xml:308(title) +msgid "Viewing / Merging" +msgstr "查看/合并" -#: source/TortoiseMerge_en.xml:131(para) -msgid "for the beautiful icons, logo, bughunting and taking care of the documentation" -msgstr "制作了漂亮的图标、LOGO，检查错误及维护文档" +#: source/TortoiseMerge_en.xml:309(para) +msgid "If you want to compare / merge files you have to set at least two of the three possible paths for Base, Mine and Theirs. If you select only two files, then TortoiseMerge will show you the differences between those two files, either in a two pane view or in a one pane view. You can switch between those two views with the menu command ViewTwo-way Diff" +msgstr "如果你要比较/合并文件，必须设置两个路径，或三个路径，即基础版本路径， 我的版本路径 与 别人的版本路径。如果你只选择两个文件，那么 TortoiseMerge 会使用两窗口方式或单窗口方式，来显示这两个文件的差异。你可以使用菜单命令 视图两路差异来切换这两种方式。" -#: source/TortoiseMerge_en.xml:1310(glossterm) -msgid "Lock" -msgstr "加锁" +#: source/TortoiseMerge_en.xml:323(title) +msgid "One Pane View" +msgstr "单窗口方式" -#: source/TortoiseMerge_en.xml:1312(para) -msgid "When you take out a lock on a versioned item, you mark it in the repository as uncommittable, except from the working copy where the lock was taken out." -msgstr "当你加锁一个版本控制项目，除了在发出加锁命令的工作目录，它在版本库中被标记为不可提交的。" +#: source/TortoiseMerge_en.xml:327(title) +msgid "Two Pane View" +msgstr "两窗口方式" -#: source/TortoiseMerge_en.xml:1320(glossterm) -msgid "Log" -msgstr "日志" +#: source/TortoiseMerge_en.xml:335(para) +msgid "Changes inside the modified lines are shown in different colors. Added string parts are shown with a lighter color, but you can of course configure the colors used here. Removed parts are indicated with a dark brown vertical line in the string. Check out the screenshot above to see how this works." +msgstr "用不同的颜色来显示修改行。增加的部分使用浅色，当然你可以配置使用什么颜色。删除部分使用深褐色删除线显示。检查屏幕快照了解它们如何工作。" -#: source/TortoiseMerge_en.xml:1322(para) -msgid "Show the revision history of a file or folder. Also known as History." -msgstr "显示文件或目录的版本历史。也称为历史。" +#: source/TortoiseMerge_en.xml:345(para) +msgid "Code reorganization usually means a lot of changes in whitespaces (space, tab, newlines) but no actual code change. For example, you split up a very long line into several lines, or you sometimes compact several lines together into one." +msgstr "代码重构经常意味着许多空白字符(空格，制表，新行)变化，但是没有实际上的代码改变。举例来说，你可以将一个很长的行拆分为几行，或者将几行合并为一行。" -#: source/TortoiseMerge_en.xml:1329(glossterm) -msgid "History" -msgstr "历史" +#: source/TortoiseMerge_en.xml:351(para) +msgid "Such changes are marked with a white circle symbol on the left side of the views. If you see such a white circle, you know immediately that no real code change is there and you don't have to check the changed block further." +msgstr "这些改变在视图的左边用白色圆形符号标记。如果你看到了这些白色圆形，就立即知道这里没有实际代码改变，不需要进一步检查这个代码块" -#: source/TortoiseMerge_en.xml:1331(para) -msgid "Show the revision history of a file or folder. Also known as Log." -msgstr "显示文件或目录的版本历史。也称为日志。" +#: source/TortoiseMerge_en.xml:330(para) +msgid "The two pane view has some features which are not available in the one pane view: " +msgstr "两窗口方式有单窗口方式不具备的一些特性：" -#: source/TortoiseMerge_en.xml:1338(glossterm) -msgid "Merge" -msgstr "合并" +#: source/TortoiseMerge_en.xml:360(para) +msgid "If you want to compare/merge three files, TortoiseMerge will show you the differences in a three pane view. This view is also used if you need to resolve conflicted files." +msgstr "如果你要比较/合并三个文件，TortoiseMerge 将会使用三窗口方式显示差异。这个视图也用来解决冲突文件。" -#: source/TortoiseMerge_en.xml:1340(para) -msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict." -msgstr "将版本库中的修改增加到你的工作副本，不破坏本地的任何改变。有时这些修改不能自动协调，工作副本的状态称为冲突。" +#: source/TortoiseMerge_en.xml:366(title) +msgid "Three Pane View" +msgstr "三窗口方式" -#: source/TortoiseMerge_en.xml:1346(para) -msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseSVN's Merge command." -msgstr "当你更新工作副本时，自动发生合并。你可以使用 TortoiseSVN 的合并命令合并其它分支的指定修改。" +#: source/TortoiseMerge_en.xml:369(para) +msgid "The left pane shows you the differences between Their file and the Base file, while the right pane shows you the differences between Mine file and the Base file. The bottom pane shows you the result of merging Base, Mine and Theirs with possible conflicts. If you hover the mouse over the pane title, a tooltip will show the filenames used for the diff in each pane." +msgstr "左窗口显示他人的文件与基础文件的差异，右窗口显示我的文件与基础文件的差异。底部窗口显示基础文件，我的文件，他人的文件，的合并结果，以及可能的冲突。如果你的鼠标在这些窗口的标题栏逗留，工具提示会显示是哪些文件的差异比较。" -#: source/TortoiseMerge_en.xml:1354(glossterm) -msgid "Patch" -msgstr "补丁" +#: source/TortoiseMerge_en.xml:380(para) +msgid "The relationships between the three files are explained in the diagram below:" +msgstr "这三个文件的关系在以下图表中解释：" -#: source/TortoiseMerge_en.xml:1356(para) -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "如果工作副本只修改了文本文件，就可以使用 Subversion 的差异命令产生一个标准差异格式文件。这种文件类型通常称为补丁，可以应用到其他工作副本。没有提交权的人可以在修改后，发送补丁文件给一个认可的提交者来提交。或者不能确定此修改是否恰当，你可以发送补丁给其他人评审。" +#: source/TortoiseMerge_en.xml:388(para) +msgid "The base file represents the oldest version of a file, from where You and They start making changes. Mine represents the base file with all the changes you made, and Theirs is the file with all the changes someone else made to the file." +msgstr "基础文件是最旧的版本，你的文件，他人的文件，都是从这个文件开始修改的。我的文件表示你对基础文件的修改结果，他人的文件是其他人对基础文件的修改结果。" -#: source/TortoiseMerge_en.xml:1369(glossterm) -msgid "Property" -msgstr "属性" +#: source/TortoiseMerge_en.xml:398(title) +msgid "Applying Patches" +msgstr "应用补丁" -#: source/TortoiseMerge_en.xml:1371(para) -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseSVN has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "在版本控制文件和目录之外，Subversion 还允许你增加版本控制元数据 - 称为属性 - 到你的版本控制文件和目录。每个属性都有名字和值，很像注册表键。Subversion 有内部使用的专用属性，例如 svn:eol-style。TortoiseSVN 也是如此，例如 tsvn:logminsize。你可以增加自己的属性，允许选择任意名称和取值。" +#: source/TortoiseMerge_en.xml:399(para) +msgid "If you want to apply a patchfile you have to set both the path to the patchfile itself and the path to the folder where the patchfile should be applied." +msgstr "如果你想应用一个补丁文件，你要设置补丁文件的路径，以及在哪个路径打补丁。" -#: source/TortoiseMerge_en.xml:138(term) -msgid "The Tigris Style project" -msgstr "Tigris 网站设计风格项目" +#: source/TortoiseMerge_en.xml:405(para) +msgid "Currently, only patchfiles in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patchfiles generated by CVS are currently not supported!" +msgstr "当前仅支持标准差异格式。并且是在 Subversion 工作副本中生成的补丁。其它格式，例如 CVS 生成的补丁文件不受支持！" -#: source/TortoiseMerge_en.xml:1384(glossterm) -msgid "Relocate" -msgstr "重新定位" +#: source/TortoiseMerge_en.xml:418(title) +msgid "Patch Filelist" +msgstr "补丁文件列表" -#: source/TortoiseMerge_en.xml:1386(para) -msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to relocate your working copy so that its repository URLs point to the new location." -msgstr "如果你的版本库移动了，或许是你在服务器上将它移到其它目录，或者服务器域名改变了，你需要重新定位工作目录，让其版本库地址指向新的位置。" +#: source/TortoiseMerge_en.xml:413(para) +msgid "If TortoiseMerge is able to parse the patchfile it will show you a small window with all the files which have changes according to the patchfile. If the filename is shown in black, then the patch can be applied without any problems. That means the file is not outdated according to the patch. However, if the filename is shown in red, then the patch can't get applied directly because you already changed that file." +msgstr "如果 TortoiseMerge 能解析补丁文件，它会显示一个小窗口，给出此补丁修改的文件列表。 如果文件名称用黑色显示，那么这个补丁可以没有任何问题的应用。它表示此补丁针对的文件没有过时。如果文件名称用红色显示，那么这个补丁不能直接应用，因为你的修改造成了这个文件出现冲突。" -#: source/TortoiseMerge_en.xml:1392(para) -msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the Switch command instead." -msgstr "注意：你只能在同一版本库中，工作副本引用相同的位置，仅版本库移动的情况下使用这个命令。 在其它情况下，或许你需要用切换命令。" +#: source/TortoiseMerge_en.xml:427(para) +msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." +msgstr "但是别担心。如果你使用 Subversion，可以取出这个文件的老版本来解决冲突。实际上，TortoiseMerge 自动尝试取出老版本，给出基础版本 (此文件的老版本), 我的版本 (你的工作副本中的文件)，和他人的版本 (已经打补丁的老版本)之间的差异。然后你可以手工解决冲突。" -#: source/TortoiseMerge_en.xml:1401(glossterm) -msgid "Repository" -msgstr "版本库" +#: source/TortoiseMerge_en.xml:438(para) +msgid "The patchfile window has a context menu which allows you to preview the effect of the patch on the current file (apply without saving), to apply and save the changes for the selected file, or to apply and save changes to all files in the list. The double-click action is to preview." +msgstr "补丁文件窗口有一个上下文菜单，允许你预览在当前文件打补丁的结果(没有保存)，为选择的文件打补丁和保存改变，或者为列表内的所有文件打补丁和保存改变。双击动作是预览结果。" -#: source/TortoiseMerge_en.xml:1403(para) -msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network." -msgstr "版本库是存储和维护数据的中央部分。一个版本库的数据库或文件可以放在通过网络可访问的位置，或者存放在一个不需要通过网络就可以访问的地方。" +#: source/TortoiseMerge_en.xml:446(para) +msgid "Depending on whether TortoiseMerge can apply the patch directly or by fetching an older version of the file first, it shows you a two pane view (patch can be applied directly) or a three pane view (older version of file fetched)." +msgstr "依赖于 TortoiseMerge 能直接使用补丁，或者先取出老版本文件，它显示双窗口视图(可以直接打补丁)，或者显示三窗口视图(取出了老版本文件)。" -#: source/TortoiseMerge_en.xml:1412(glossterm) -msgid "Resolve" -msgstr "解决" +#: source/TortoiseMerge_en.xml:458(title) +msgid "Buttons and Other Controls" +msgstr "按钮及其他控制" -#: source/TortoiseMerge_en.xml:1414(para) -msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as Resolving Conflicts. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed." -msgstr "当工作副本中的文件在合并后处于冲突状态时，这些冲突使用使用编辑器(或许是 TortoiseMerge)手工清理。这个步骤称为解决冲突。然后你就能标记这些冲突文件已经解决，允许提交这些文件。" +#: source/TortoiseMerge_en.xml:461(title) +msgid "The Toolbar" +msgstr "工具条" -#: source/TortoiseMerge_en.xml:142(para) -msgid "for some of the styles which are reused in this documentation" -msgstr "他们的设计风格被用于本文档" +#: source/TortoiseMerge_en.xml:468(para) +msgid "Open accesses the file-open dialog. What else?" +msgstr "打开 除了打开文件对话框，还能是什么？" -#: source/TortoiseMerge_en.xml:1424(glossterm) -msgid "Revert" -msgstr "恢复" +#: source/TortoiseMerge_en.xml:474(para) +msgid "Save saves any changes you have made." +msgstr "保存 保存你所做的任何修改。" -#: source/TortoiseMerge_en.xml:1426(para) -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "当最后更新工作目录时，Subversion 为每个文件保留了一份本地原始副本。如果你做了修改，决定撤销，可以使用恢复命令得到原始副本。" +#: source/TortoiseMerge_en.xml:480(para) +msgid "Reload discards any changes you have made in TortoiseMerge and reloads the files from disk." +msgstr "重载 放弃你在 TortoiseMerge 中所做的任何修改，重新载入文件。" -#: source/TortoiseMerge_en.xml:1435(glossterm) -msgid "Revision" -msgstr "版本" +#: source/TortoiseMerge_en.xml:487(para) +msgid "Undo implements a multi-level undo, allowing you to reverse any changes you have made within TortoiseMerge." +msgstr "撤销实现多级撤销，允许你放弃在 TortoiseMerge 中所做的任何修改。" -#: source/TortoiseMerge_en.xml:1437(para) -msgid "Every time you commit a set of changes, you create one new revision in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N." -msgstr "在你每次提交改变集时，就在版本库创建了一个新版本。每个版本都表示版本库历史上的确定状态点。如果你想回溯历史，可以使用版本 N 来检查版本库。" +#: source/TortoiseMerge_en.xml:494(para) +msgid "Prev/Next Difference jumps directly to the next point where the files differ. This saves scrolling through all the unchanged parts of the file." +msgstr "上一个/下一个差异 直接跳转到文件中的上一个/下一个不同的地方。它可以快速地跳过文件未变化过的部分。" -#: source/TortoiseMerge_en.xml:1444(para) -msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created." -msgstr "换个说法，版本可以引用它创建时产生的改变集。" +#: source/TortoiseMerge_en.xml:500(para) +msgid "When you do this in 2-pane diff mode, the detail bar at the bottom of the screen will show you the inline differences for the first line, regardless of where the mouse is hovering." +msgstr "当你处于双窗口方式时，无论是否鼠标划过该区域，在屏幕底部的细节状态栏都将显示首行的不同。" -#: source/TortoiseMerge_en.xml:1451(glossterm) -msgid "Revision Property (revprop)" -msgstr "版本属性(revprop)" +#: source/TortoiseMerge_en.xml:507(para) +msgid "Prev/Next Conflict jumps directly to the next point where the file differences are in conflict and need to be resolved." +msgstr "上一个/下一个冲突 直接跳转到文件中的上一个/下一个需要解决的冲突。" -#: source/TortoiseMerge_en.xml:1453(para) -msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: svn:date svn:author svn:log which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone." -msgstr "正如文件可以有属性，版本库中的版本也有。当创建版本时，会自动创建版本属性，即：svn:date svn:author svn:log，分别描述了提交日期/时间，提交者，日志信息。这些信息可以编辑，但是没有版本，所以任何修改都是永久的，不能撤销。" +#: source/TortoiseMerge_en.xml:514(para) +msgid "Mark as Resolved When you have resolved all the conflicts in a file and saved the changes, you can mark it as resolved from within TortoiseMerge, rather than going back to explorer and marking as resolved from there." +msgstr "标记为已解决 当你解决了文件中的全部冲突并保存了修改后，你可以在 TortoiseMerge 中标记为已解决冲突，而不用返回资源管理器去标记它们。" -#: source/TortoiseMerge_en.xml:1465(glossterm) -msgid "SVN" -msgstr "SVN" +#: source/TortoiseMerge_en.xml:523(para) +msgid "Show Whitespaces toggles the option to display space and tab characters as symbols so you can distinguish white space changes." +msgstr "显示空白字符 切换是否使用符号显示空格和制表符，以便你能注意到空白字符的变化。" -#: source/TortoiseMerge_en.xml:1467(para) -msgid "A frequently-used abbreviation for Subversion." -msgstr "一个友好的 Subversion 缩写。" +#: source/TortoiseMerge_en.xml:530(para) +msgid "Switch View selects between one-pane and two-pane view. Disabled in 3-pane view." +msgstr "切换窗口方式 在单窗口方式和双窗口方式间进行切换。在三窗口方式时无效。" -#: source/TortoiseMerge_en.xml:1470(para) -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "被svnserve版本库服务器使用的专用协议名称。" +#: source/TortoiseMerge_en.xml:537(para) +msgid "Switch Left and Right View In 2-pane view, swaps the left and right windows. When you are comparing a file in 2 different trees, as opposed to 2 revisions of the same file, TortoiseSVN does not know which one should go in the left pane as the original/base version. If it gets this wrong, you can change it to make viewing easier." +msgstr "交换左右窗口 在双窗口方式中，互换左右窗口的内容。当你比较两个不同分支中的两个文件时，而不是比较同一个文件的两个修订版本时，TortoiseSVN 并不知道哪个文件应该放在左边的窗口作为原始/基础版本。如果放错了，为了便于查看，你能够互换它们。" -#: source/TortoiseMerge_en.xml:1477(glossterm) -msgid "Switch" -msgstr "切换" +#: source/TortoiseMerge_en.xml:548(para) +msgid "Show/Hide Patch List When TortoiseMerge has a patch list, this button allows you to hide it (so you can see both windows), or show it (so you can review the file list)." +msgstr "显示/隐藏补丁列表 当 TortoiseMerge 有补丁列表时，这个按钮允许你隐藏它(于是你可以看到两个窗口)，或者显示它(于是你可以复审文件列表)。 " -#: source/TortoiseMerge_en.xml:1479(para) -msgid "Just as Update-to-revision changes the time window of a working copy to look at a different point in history, so Switch changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred." -msgstr "就像更新到版本改变了工作副本的时间窗口，可以察看历史上的不同时间点一样，切换 改变了工作副本的空间窗口，它可以指向版本库中的不同部分。当两个开发分支仅有少数文件不同时，它非常有用。你可以在两者之间切换工作副本，只有修改的文件内容被传送。" +#: source/TortoiseMerge_en.xml:556(para) +msgid "Settings takes you to TortoiseMerge's settings dialog." +msgstr "设置 弹出 TortoiseMerge 的设置对话框。" -#: source/TortoiseMerge_en.xml:149(term) -msgid "Our Contributors" -msgstr "贡献者" +#: source/TortoiseMerge_en.xml:459(para) +msgid " Below the menu bar lies the tool bar. This provides easy access to the most commonly used tools, which are " +msgstr "　　下列菜单显示在工具条里。可以方便地使用多数常见功能，它们分别是：" -#: source/TortoiseMerge_en.xml:1491(glossterm) -msgid "Update" -msgstr "更新" +#: source/TortoiseMerge_en.xml:563(para) +msgid "On the left side of the window is a locator bar. This provides a quick visual reference as to where the changes lie within the file. The bar has three columns. The left column refers to the left pane, the right column to the right pane, and the centre column to the bottom pane (if present). In one-pane view only the left column is used. The locator bar can also be used as a scroll bar to scroll all the windows simultaneously." +msgstr "窗口的左边是定位拉杆。它提供了对文件改变的位置的快速可视化引用。这个拉杆有三列。左列引用左边的窗口，右列引用右边的窗口，中间列引用底部窗口(如果存在)。在单窗口模式下，只使用了左列。定位拉杆也可以作为滑杆使用，让所有窗口同时滑动。" -#: source/TortoiseMerge_en.xml:1493(para) -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "此命令从 Subversion 版本库下载最新的修改到你的工作副本，合并任何本地修改。" +#: source/TortoiseMerge_en.xml:572(para) +msgid "Below the bottom window is the status bar. This shows the number of lines added and deleted in Theirs and Mine, and the number of unresolved conflicts remaining. You can also see which line-ending style is in use, what encoding (ASCII, UTF-8, etc) is assumed by TortoiseMerge, and whether there is a byte-order-mark (BOM) present in UTF-8 files. The left side of the status bar is used to display hints when you hover the mouse over a control." +msgstr "底部窗口下面是状态栏。它显示了他人与本人增加和删除的行数，以及尚存的未解决冲突数目。你还可以看到使用的行结束符，编码(ASCII，UTF-8等)，以及在UTF-8编码的文件中是否有字节顺序标记(BOM)。当你的鼠标逗留在控件上的时候，状态栏的左边会显示提示。" -#: source/TortoiseMerge_en.xml:1501(glossterm) -msgid "Working Copy" -msgstr "工作副本" +#: source/TortoiseMerge_en.xml:588(title) +msgid "Merging / Editing Conflicts" +msgstr "合并/编辑冲突" -#: source/TortoiseMerge_en.xml:1503(para) -msgid "This is your local sandbox, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a Checkout from a repository, and you feed your changes back into the repository using Commit." -msgstr "这是一个本地 沙箱，你在受版本控制的文件上工作的区域，它通常位于你的本地硬盘上。你可以用检出从版本库创建工作副本，使用提交将你的改变传回版本库。" +#: source/TortoiseMerge_en.xml:589(para) +msgid "TortoiseMerge not only shows you the differences between files but also lets you resolve conflicts or apply changes." +msgstr "　　TortoiseMerge 不仅 显示 了你文件间的不同，而且还能让你解决存在的冲突或者采用修改。" -#: source/TortoiseMerge_en.xml:153(para) -msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list." -msgstr "提供了补丁、错误汇报及新的想法，并且在邮件列表上回答了其他人的问题。" +#: source/TortoiseMerge_en.xml:593(para) +msgid "If you're in two pane view, then you can only edit the file in the right pane (Mine). To apply changes made in the left file (Theirs), right-click on the changed lines and select Context MenuUse text block from theirs. Then the changes from the left file are added to the right file." +msgstr "如果你在双窗口模式，你只能编辑右窗口中的文件(我的)。要应用左边的文件修改(他人的)，在修改行上右击，选择上下文菜单使用他人的文本块。于是左边文件的修改就增加到右边的文件。" -#: source/TortoiseMerge_en.xml:16(firstname) -msgid "Lübbe" -msgstr "Lübbe" +#: source/TortoiseMerge_en.xml:605(para) +msgid "Sometimes you actually want both text blocks, and the context menu also offers you Context MenuUse both text blocks (this one first) and Context MenuUse both text blocks (this one last)." +msgstr "有时候，你实际上需要双方的文本块，上下文菜单 使用双方的文本块 (这个先出现) 和 上下文菜单使用双方的文本块 (这个后出现)可以满足你的要求。" -#: source/TortoiseMerge_en.xml:160(term) -msgid "Our Donators" -msgstr "赞助者" +#: source/TortoiseMerge_en.xml:618(para) +msgid "If you're in three pane view (sometimes called merge view) you can only edit the file in the bottom view (Merged). As in two pane view, you can right-click on conflicted lines and either select Context MenuUse text block from theirs or Context MenuUse text block from mine. In addition, if you want both blocks, you can select Context Menu Use text block from mine before theirs or Context Menu Use text block from theirs before mine. According to the command you've selected, the changes are used in the resulting Merged file." +msgstr "如果你在三窗口模式(有时称为合并视图)，你只能编辑底部窗口中的文件(已合并)。象在两窗口模式那样，你可以在冲突行上右击，或者选择上下文菜单使用他人的文本块，或者上下文菜单使用我的文本块。此外，如果你要两者的文本块，可以选择上下文菜单在他人的前面使用我的文本块，或者 上下文菜单在我的前面使用他人的文本块。通过你选择的命令，改变结果在已合并文件。" -#: source/TortoiseMerge_en.xml:164(para) -msgid "for many hours of joy with the music they sent us" -msgstr "他们送给我们的音乐陪伴了我们许多时间" +#: source/TortoiseMerge_en.xml:655(para) +msgid "Sometimes the conflict is too difficult to resolve by simply picking Theirs and Mine and it requires hand editing. TortoiseMerge allows you to do all the easy changes visually first and then save the file, leaving only the difficult changes to be resolved by hand-editing." +msgstr "有时冲突很难通过简单选择他人的和我的来解决，需要手工编辑。TortoiseMerge 允许你先在可视化模式做所有容易的合并，然后保存文件，将困难的合并用手工解决。" -#: source/TortoiseMerge_en.xml:17(surname) -msgid "Onken" -msgstr "Onken" +#: source/TortoiseMerge_en.xml:663(para) +msgid "Note that if you use TortoiseMerge on the same files again, any changes to your working copy, whether in TortoiseMerge, or by hand-editing, will be discarded and the file will appear as it did when conflict-editing first started." +msgstr "注意：如果你在同一文件重新使用 TortoiseMerge，你对工作版本做的任何修改，无论是 TortoiseMerge，还是手工编辑，都将被丢弃，文件恢复到开始冲突编辑时的状态。" -#: source/TortoiseMerge_en.xml:175(title) -msgid "Introduction" -msgstr "介绍" +#: source/TortoiseMerge_en.xml:671(para) +msgid "If you need to copy lines of text to insert in another file using your favourite text editor, you can select multiple lines to copy within TortoiseMerge. Click on the first line of the block, then Shift+Click on the last line of the block. As usual, Ctrl+C can be used to copy the selected lines to the clipboard." +msgstr "如果需要复制文本行到你熟悉的编辑器，你可以在 TortoiseMerge 中选择多行复制。单击文本块的首行，然后按着Shift键单击文本块的尾行。象通常那样，可以使用Ctrl+C复制选择的行到剪贴板。" -#: source/TortoiseMerge_en.xml:184(title) -msgid "Overview" -msgstr "概述" +#: source/TortoiseMerge_en.xml:684(title) +msgid "Settings" +msgstr "设置" -#: source/TortoiseMerge_en.xml:185(para) -msgid "TortoiseMerge is a free/open-source application. It lets you see differences in text files, merge those changes and even review and apply unified diff files, often called patches." -msgstr "　　TortoiseMerge 是一个免费软件/开源软件。通过它你可以查看文本文件之间的差异，并合并这些差异；甚至审查和采用这些标准差异文件——通常称之为 补丁 。" +#: source/TortoiseMerge_en.xml:686(title) +msgid "Main Settings Page" +msgstr "常用设置页" -#: source/TortoiseMerge_en.xml:190(para) -msgid "While working on text files, e.g. source files in your favourite programming language, or html/xml files for your documentation or website, you will often have a situation where you need to compare different versions of those files. Sometimes you get a different version from someone else, sometimes you just want to see the changes you've made." -msgstr "　　当处理文本文件时，比如用你所喜欢的编程语言写的源代码，或者 Html/Xml 的文档或网站，你经常会碰到需要比较文件的不同版本的情况：有时候你从别人那里得到了一个不同版本的文件，或者有时候干脆就是你想知道你曾经做过什么修改。" +#: source/TortoiseMerge_en.xml:689(title) +msgid "The Settings Main Page" +msgstr "常用设置页" -#: source/TortoiseMerge_en.xml:198(para) -msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." -msgstr "　　如果你使用版本控制系统（如 Subversion）时，当你更新工作副本时你可能会遇到“ 冲突 ”。这种情况通常发生在其他人也修改了你当前正在处理的文件的同一部分。当遇到冲突时，你必须手工来解决它——这就是 TortoiseMerge 能帮助你的地方。" +#: source/TortoiseMerge_en.xml:692(para) +msgid "Most of the options here are self-explanatory, but a few points need clarifying." +msgstr "　　多数选项是不需要过多解释，只需要稍微明确一下。" -#: source/TortoiseMerge_en.xml:20(firstname) -msgid "Simon" -msgstr "Simon" +#: source/TortoiseMerge_en.xml:696(para) +msgid "Backup original file renames the original file in the WC to filename.bak before saving the modified version." +msgstr "　　备份原始文件 在保存修改后的版本时，先将工作拷贝中的原始文件重命名为filename.bak。" -#: source/TortoiseMerge_en.xml:206(para) -msgid "The following diagram shows you the relationships between the files involved in a conflict:" -msgstr "　　下图说明了存在冲突的文件之间的关系。" +#: source/TortoiseMerge_en.xml:701(para) +msgid "Ignore lineendings hides changes which are due solely to difference in line-end style." +msgstr "　　忽略换行类型 隐藏换行类型的改变。" -#: source/TortoiseMerge_en.xml:21(surname) -msgid "Large" -msgstr "Large" +#: source/TortoiseMerge_en.xml:705(para) +msgid "Ignore case changes hides changes which are due solely to case changes within the text. This can be useful with apps such as Visual Basic, which changes case in variables without warning." +msgstr "　　忽略大小写变化 隐藏仅文本大小写变化的差异。这对于像 Visual Basic 等忽略变量大小写的应用程序比较有用。" -#: source/TortoiseMerge_en.xml:211(title) -#: source/TortoiseMerge_en.xml:385(title) -msgid "File Conflict" -msgstr "文件冲突" +#: source/TortoiseMerge_en.xml:711(para) +msgid "Colour code in-line changes uses the same scheme as the line diff bar to show the detailed in-line changes within the main display panes. Lines which have been heavily modified will not be shown using this method as the results are simply confusing. In this case the line will be shown as replaced (old line deleted, new line added)." +msgstr "为改变的嵌入代码着色在主窗口，使用与行差异拉杆相同的方案显示代码改变的细节。修改很多的行不会这样显示，因为它会让人糊涂。这时会用替换方式显示(旧行删除，新行增加)。" -#: source/TortoiseMerge_en.xml:214(para) -msgid "A conflict can also occur if you try to apply an outdated patchfile. In such cases, without TortoiseMerge, you would either have to ask the person you got that patchfile from for a current version or try to apply that patchfile manually." -msgstr "　　应用一个过时的补丁时也可能出现冲突。在这种情况下，不应该使用TortoiseMerge，你要么向补丁提供者索取一个当前版本的补丁，要么手工的应用该补丁。" +#: source/TortoiseMerge_en.xml:719(para) +msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." +msgstr "　　比较空白字符 将全部缩进变化，或行内空白字符的变化按照添加/删除的行显示（即 Subversion 处理变化的方式）。" -#: source/TortoiseMerge_en.xml:220(para) -msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patchfile for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep." -msgstr "　　但是现在 TortoiseMerge 不再是必需的了——至少当你使用类似 Subversion 这样的版本控制系统时不是必需的。TortoiseMerge 解析某次修订/某个版本的补丁文件并自动尝试从你的版本控制系统中获取对应的版本，然后应用该补丁并让你对比文件的原始内容及其修改后的内容。因此你能决定是否接受那些修改。" +#: source/TortoiseMerge_en.xml:724(para) +msgid "Ignore whitespace changes hides changes which are due solely to a change in the amount or type of whitespace, eg. changing the indentation or changing tabs to spaces. Adding whitespace where there was none before, or removing a whitespace completely is still shown as a change." +msgstr "　　忽略空白字符变化 隐藏仅仅只是空白字符数量和类型的变化。例如，缩进，制表符变成了空格。在以前没有空白字符的地方增加空白字符，或者完全删除空白字符，仍旧视为变化。" -#: source/TortoiseMerge_en.xml:235(title) -msgid "TortoiseMerge's History" -msgstr "TortoiseMerge 的历史" +#: source/TortoiseMerge_en.xml:732(para) +msgid "Ignore all whitespaces hides all whitespace-only changes." +msgstr "　　忽略全部空白字符 隐藏所有空白字符的变化。" -#: source/TortoiseMerge_en.xml:236(para) -msgid "While working on TortoiseSVN we found that whenever users sent in patches to enhance the project or just to fix bugs, we had a lot of work just applying those patches. And many times those patches were outdated and couldn't be applied with the command line patch tool http://unxutils.sourceforge.net/ because we were working on those files and had sometimes changed those files already." -msgstr "当我们开发 TortoiseSVN 时发现，只要用户发送补丁增强这个项目，或者只是修正问题，我们就需要为应用这些补丁付出许多工作量。并且很多时候，这些补丁是过时的，不能使用命令行工具 http://unxutils.sourceforge.net/ 打补丁，因为我们正在修改这些文件，有时候已经修改了。" +#: source/TortoiseMerge_en.xml:738(title) +msgid "Colour Settings Page" +msgstr "颜色设置页" -#: source/TortoiseMerge_en.xml:251(para) -msgid "This was also the main reason why TortoiseSVN did not originally have a TortoiseSVNCreate Patch implemented: we preferred users to send us the whole files because with those it was easier to apply patches." -msgstr "这也是最初的 TortoiseSVN 没有实现 TortoiseSVN创建补丁 的主要理由：我们期望用户发送给我们整个文件，这样容易打补丁。" +#: source/TortoiseMerge_en.xml:741(title) +msgid "The Settings Color Page" +msgstr "颜色设置页" -#: source/TortoiseMerge_en.xml:261(para) -msgid "So we spent a lot of time, searching the internet for a GUI tool which could apply patchfiles, but all we found was that such a tool didn't exist. So to cut a long story short: We decided that if no-one else could provide such a tool we would have to write our own. That's when TortoiseMerge was born." -msgstr "于是我们花费了大量时间，在互联网搜索一个打补丁的图形工具，但是我们没有发现这样的工具。长话短说：既然没有人提供这样的工具，我们决定自行编写。就在那时，TortoiseMerge 出世了。" +#: source/TortoiseMerge_en.xml:744(para) +msgid "This dialog allows you to select the background color coding used to highlight the different line changes." +msgstr "　　这个对话框允许你选择一个背景颜色代码，它们用于高亮被修改的行。" -#: source/TortoiseMerge_en.xml:268(para) -msgid "Since TortoiseSVN already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff. Also it reduces the size of the executable since TortoiseSVN and TortoiseMerge can both use the same dll's." -msgstr "因为 TortoiseSVN 已经使用了 Subversion 库，它内置了一个很好的差异比较工具。很自然的，我们使用这个库代替 GNU diff。而且因为 TortoiseSVN 和 TortoiseMerge 使用了同样的 dll，可执行文件也变小了。" +#: source/TortoiseMerge_en.xml:750(term) +msgid "Normal" +msgstr "无变化" -#: source/TortoiseMerge_en.xml:278(title) -msgid "Using TortoiseMerge" -msgstr "使用 TortoiseMerge" +#: source/TortoiseMerge_en.xml:751(listitem) +msgid "All lines which are unchanged, or where changes are hidden." +msgstr "这些行都没有改变过，或改变被隐藏了。" -#: source/TortoiseMerge_en.xml:28(title) -msgid "Preface" -msgstr "前言" +#: source/TortoiseMerge_en.xml:756(term) +msgid "Added" +msgstr "新增" -#: source/TortoiseMerge_en.xml:287(title) -msgid "Open Files" -msgstr "打开文件" +#: source/TortoiseMerge_en.xml:757(listitem) +msgid "Lines which have been added." +msgstr "这些行是新增加的。" -#: source/TortoiseMerge_en.xml:289(para) -msgid "When you start TortoiseMerge without any command line switches then you have to open the files manually, using FileOpen." -msgstr "当不使用任何命令行参数启动 TortoiseMerge 时，你必须使用文件打开来手工打开文件。" +#: source/TortoiseMerge_en.xml:762(term) +msgid "Removed" +msgstr "删除" -#: source/TortoiseMerge_en.xml:298(title) -msgid "The Open Dialog" -msgstr "打开文件对话框" +#: source/TortoiseMerge_en.xml:763(listitem) +msgid "Lines which have been deleted." +msgstr "这些行被删除了。" -#: source/TortoiseMerge_en.xml:301(para) -msgid "The first thing you have to do is to decide whether you just want to compare/merge files, or whether you want to apply a patchfile. Depending on what you choose, the corresponding edit boxes and browse buttons are activated." -msgstr "你要作的第一件事，就是决定是否比较/合并文件，或者是否使用补丁。根据你的选择，相应的编辑框和浏览按钮被激活。" +#: source/TortoiseMerge_en.xml:768(term) +msgid "Modified" +msgstr "已修改" -#: source/TortoiseMerge_en.xml:308(title) -msgid "Viewing / Merging" -msgstr "查看/合并" +#: source/TortoiseMerge_en.xml:771(emphasis) +msgid "unchanged" +msgstr "未改变" -#: source/TortoiseMerge_en.xml:309(para) -msgid "If you want to compare / merge files you have to set at least two of the three possible paths for Base, Mine and Theirs. If you select only two files, then TortoiseMerge will show you the differences between those two files, either in a two pane view or in a one pane view. You can switch between those two views with the menu command ViewTwo-way Diff" -msgstr "如果你要比较/合并文件，必须设置两个路径，或三个路径，即基础版本路径， 我的版本路径 与 别人的版本路径。如果你只选择两个文件，那么 TortoiseMerge 会使用两窗口方式或单窗口方式，来显示这两个文件的差异。你可以使用菜单命令 视图两路差异来切换这两种方式。" +#: source/TortoiseMerge_en.xml:774(guilabel) +msgid "Colour code in-line changes" +msgstr "着色改变的代码" -#: source/TortoiseMerge_en.xml:323(title) -msgid "One Pane View" -msgstr "单窗口方式" +#: source/TortoiseMerge_en.xml:769(listitem) +msgid "Lines which have relatively small changes, and are shown using inline diff. This colour is used for the portion of the line content. Changed portions will be shown using the inline added and deleted colours described below. If is not enabled, this colour will not be used and changed lines will always be shown as replacements." +msgstr "相对小的行改变，用嵌入差异显示。 部分着色。改变的部分用嵌入的增加和删除形式展现，其颜色下述。如果未启用 ，不会使用此颜色，改变的行用替换形式显示。" -#: source/TortoiseMerge_en.xml:327(title) -msgid "Two Pane View" -msgstr "两窗口方式" +#: source/TortoiseMerge_en.xml:780(term) +msgid "Conflicted" +msgstr "冲突" -#: source/TortoiseMerge_en.xml:33(para) -msgid "When working on a project, either an open-source project where several people review your code, or a commercial project where you sell a component with your sourcecode, there will be people and customers who find bugs or want to improve your project. To do that they send you patches which you have to review and decide if you want to apply them." -msgstr "　　当开发一个项目的时候，无论是只有几个人审察你的代码的开源项目还是包括源代码的商业软件，总有一些人或使用者会发现一些错误或希望改进你的项目。因此，他们需要发送给你补丁，由你来审查并决定是否使用它们。" +#: source/TortoiseMerge_en.xml:781(listitem) +msgid "Where the same line has been changed in both files." +msgstr "两个文件都修改了这些行。" -#: source/TortoiseMerge_en.xml:330(para) -msgid "The two pane view has some features which are not available in the one pane view: " -msgstr "两窗口方式有单窗口方式不具备的一些特性：" +#: source/TortoiseMerge_en.xml:786(term) +msgid "Empty" +msgstr "空白" -#: source/TortoiseMerge_en.xml:335(para) -msgid "Changes inside the modified lines are shown in different colors. Added string parts are shown with a lighter color, but you can of course configure the colors used here. Removed parts are indicated with a dark brown vertical line in the string. Check out the screenshot above to see how this works." -msgstr "用不同的颜色来显示修改行。增加的部分使用浅色，当然你可以配置使用什么颜色。删除部分使用深褐色删除线显示。检查屏幕快照了解它们如何工作。" +#: source/TortoiseMerge_en.xml:787(listitem) +msgid "Where lines have been added in the opposite pane, and no such line existed in this pane." +msgstr "在另一个面板中增加了一些行，且这个面板中没有对应的行。" -#: source/TortoiseMerge_en.xml:345(para) -msgid "Code reorganization usually means a lot of changes in whitespaces (space, tab, newlines) but no actual code change. For example, you split up a very long line into several lines, or you sometimes compact several lines together into one." -msgstr "代码重构经常意味着许多空白字符(空格，制表，新行)变化，但是没有实际上的代码改变。举例来说，你可以将一个很长的行拆分为几行，或者将几行合并为一行。" +#: source/TortoiseMerge_en.xml:793(term) +msgid "Inline added text" +msgstr "增加的文本" -#: source/TortoiseMerge_en.xml:351(para) -msgid "Such changes are marked with a white circle symbol on the left side of the views. If you see such a white circle, you know immediately that no real code change is there and you don't have to check the changed block further." -msgstr "这些改变在视图的左边用白色圆形符号标记。如果你看到了这些白色圆形，就立即知道这里没有实际代码改变，不需要进一步检查这个代码块" +#: source/TortoiseMerge_en.xml:794(listitem) +msgid "When inline diffs are shown, added text is shown in this colour." +msgstr "当显示嵌入差异时，用此颜色显示增加的文本。" -#: source/TortoiseMerge_en.xml:360(para) -msgid "If you want to compare/merge three files, TortoiseMerge will show you the differences in a three pane view. This view is also used if you need to resolve conflicted files." -msgstr "如果你要比较/合并三个文件，TortoiseMerge 将会使用三窗口方式显示差异。这个视图也用来解决冲突文件。" +#: source/TortoiseMerge_en.xml:799(term) +msgid "Inline removed text" +msgstr "删除的文本" -#: source/TortoiseMerge_en.xml:366(title) -msgid "Three Pane View" -msgstr "三窗口方式" +#: source/TortoiseMerge_en.xml:800(listitem) +msgid "When inline diffs are shown, deleted text is shown in this colour." +msgstr "当显示嵌入差异时，用此颜色显示删除的文本。" -#: source/TortoiseMerge_en.xml:369(para) -msgid "The left pane shows you the differences between Their file and the Base file, while the right pane shows you the differences between Mine file and the Base file. The bottom pane shows you the result of merging Base, Mine and Theirs with possible conflicts. If you hover the mouse over the pane title, a tooltip will show the filenames used for the diff in each pane." -msgstr "左窗口显示他人的文件与基础文件的差异，右窗口显示我的文件与基础文件的差异。底部窗口显示基础文件，我的文件，他人的文件，的合并结果，以及可能的冲突。如果你的鼠标在这些窗口的标题栏逗留，工具提示会显示是哪些文件的差异比较。" +#: source/TortoiseMerge_en.xml:809(title) +msgid "keyboard shortcuts" +msgstr "快捷键" -#: source/TortoiseMerge_en.xml:380(para) -msgid "The relationships between the three files are explained in the diagram below:" -msgstr "这三个文件的关系在以下图表中解释：" +#: source/TortoiseMerge_en.xml:811(para) +msgid "List of keyboard shortcuts and commands." +msgstr "列出所有的快捷键和命令。" -#: source/TortoiseMerge_en.xml:388(para) -msgid "The base file represents the oldest version of a file, from where You and They start making changes. Mine represents the base file with all the changes you made, and Theirs is the file with all the changes someone else made to the file." -msgstr "基础文件是最旧的版本，你的文件，他人的文件，都是从这个文件开始修改的。我的文件表示你对基础文件的修改结果，他人的文件是其他人对基础文件的修改结果。" +#: source/TortoiseMerge_en.xml:816(title) +msgid "Keyboard shortcuts" +msgstr "快捷键" -#: source/TortoiseMerge_en.xml:398(title) -msgid "Applying Patches" -msgstr "应用补丁" +#: source/TortoiseMerge_en.xml:819(term) +msgid "Ctrl-Q" +msgstr "Ctrl-Q" -#: source/TortoiseMerge_en.xml:399(para) -msgid "If you want to apply a patchfile you have to set both the path to the patchfile itself and the path to the folder where the patchfile should be applied." -msgstr "如果你想应用一个补丁文件，你要设置补丁文件的路径，以及在哪个路径打补丁。" +#: source/TortoiseMerge_en.xml:821(para) +msgid "Quit the program" +msgstr "退出程序" -#: source/TortoiseMerge_en.xml:4(title) -msgid "TortoiseMerge" -msgstr "TortoiseMerge" +#: source/TortoiseMerge_en.xml:827(term) +msgid "Ctrl-C" +msgstr "Ctrl-C" -#: source/TortoiseMerge_en.xml:405(para) -msgid "Currently, only patchfiles in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patchfiles generated by CVS are currently not supported!" -msgstr "当前仅支持标准差异格式。并且是在 Subversion 工作副本中生成的补丁。其它格式，例如 CVS 生成的补丁文件不受支持！" +#: source/TortoiseMerge_en.xml:829(para) +msgid "Copy the selected line(s) to the clipboard" +msgstr "复制选定行到剪贴板" -#: source/TortoiseMerge_en.xml:41(para) -msgid "TortoiseMerge helps you with both those tasks: " -msgstr "　　TortoiseMerge 可以帮助你完成以下两件事情：" +#: source/TortoiseMerge_en.xml:835(term) +msgid "Ctrl-F" +msgstr "Ctrl-F" -#: source/TortoiseMerge_en.xml:413(para) -msgid "If TortoiseMerge is able to parse the patchfile it will show you a small window with all the files which have changes according to the patchfile. If the filename is shown in black, then the patch can be applied without any problems. That means the file is not outdated according to the patch. However, if the filename is shown in red, then the patch can't get applied directly because you already changed that file." -msgstr "如果 TortoiseMerge 能解析补丁文件，它会显示一个小窗口，给出此补丁修改的文件列表。 如果文件名称用黑色显示，那么这个补丁可以没有任何问题的应用。它表示此补丁针对的文件没有过时。如果文件名称用红色显示，那么这个补丁不能直接应用，因为你的修改造成了这个文件出现冲突。" +#: source/TortoiseMerge_en.xml:837(para) +msgid "Open the Find dialog for text searches" +msgstr "打开文本查找对话框" -#: source/TortoiseMerge_en.xml:418(title) -msgid "Patch Filelist" -msgstr "补丁文件列表" +#: source/TortoiseMerge_en.xml:843(term) +msgid "Ctrl-O" +msgstr "Ctrl-O" -#: source/TortoiseMerge_en.xml:427(para) -msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." -msgstr "但是别担心。如果你使用 Subversion，可以取出这个文件的老版本来解决冲突。实际上，TortoiseMerge 自动尝试取出老版本，给出基础版本 (此文件的老版本), 我的版本 (你的工作副本中的文件)，和他人的版本 (已经打补丁的老版本)之间的差异。然后你可以手工解决冲突。" +#: source/TortoiseMerge_en.xml:845(para) +msgid "Open files to diff/merge" +msgstr "打开需要比较/合并的文件" -#: source/TortoiseMerge_en.xml:438(para) -msgid "The patchfile window has a context menu which allows you to preview the effect of the patch on the current file (apply without saving), to apply and save the changes for the selected file, or to apply and save changes to all files in the list. The double-click action is to preview." -msgstr "补丁文件窗口有一个上下文菜单，允许你预览在当前文件打补丁的结果(没有保存)，为选择的文件打补丁和保存改变，或者为列表内的所有文件打补丁和保存改变。双击动作是预览结果。" +#: source/TortoiseMerge_en.xml:851(term) +msgid "Ctrl-S" +msgstr "Ctrl-S" -#: source/TortoiseMerge_en.xml:446(para) -msgid "Depending on whether TortoiseMerge can apply the patch directly or by fetching an older version of the file first, it shows you a two pane view (patch can be applied directly) or a three pane view (older version of file fetched)." -msgstr "依赖于 TortoiseMerge 能直接使用补丁，或者先取出老版本文件，它显示双窗口视图(可以直接打补丁)，或者显示三窗口视图(取出了老版本文件)。" +#: source/TortoiseMerge_en.xml:853(para) +msgid "Save the changes" +msgstr "保存改变" -#: source/TortoiseMerge_en.xml:45(para) -msgid "Reviewing patches" -msgstr "查看补丁" +#: source/TortoiseMerge_en.xml:859(term) +msgid "Ctrl-Shift-S" +msgstr "Ctrl-Shift-S" -#: source/TortoiseMerge_en.xml:458(title) -msgid "Buttons and Other Controls" -msgstr "按钮及其他控制" +#: source/TortoiseMerge_en.xml:861(para) +msgid "Save as..." +msgstr "另存为..." -#: source/TortoiseMerge_en.xml:459(para) -msgid " Below the menu bar lies the tool bar. This provides easy access to the most commonly used tools, which are " -msgstr "　　下列菜单显示在工具条里。可以方便地使用多数常见功能，它们分别是：" +#: source/TortoiseMerge_en.xml:867(term) +msgid "F7 or cursor-right" +msgstr "F7 或鼠标右键" -#: source/TortoiseMerge_en.xml:461(title) -msgid "The Toolbar" -msgstr "工具条" +#: source/TortoiseMerge_en.xml:869(para) +msgid "Go to next difference" +msgstr "跳转到下一个不同点" -#: source/TortoiseMerge_en.xml:468(para) -msgid "Open accesses the file-open dialog. What else?" -msgstr "打开 除了打开文件对话框，还能是什么？" +#: source/TortoiseMerge_en.xml:875(term) +msgid "Shift-F7 or cursor-left" +msgstr "Shift-F7 或鼠标左键" -#: source/TortoiseMerge_en.xml:474(para) -msgid "Save saves any changes you have made." -msgstr "保存 保存你所做的任何修改。" +#: source/TortoiseMerge_en.xml:877(para) +msgid "Go to previous difference" +msgstr "跳转到上一个不同点" -#: source/TortoiseMerge_en.xml:480(para) -msgid "Reload discards any changes you have made in TortoiseMerge and reloads the files from disk." -msgstr "重载 放弃你在 TortoiseMerge 中所做的任何修改，重新载入文件。" +#: source/TortoiseMerge_en.xml:883(term) +msgid "Shift-cursor-right" +msgstr "Shift-光标右键头" -#: source/TortoiseMerge_en.xml:487(para) -msgid "Undo implements a multi-level undo, allowing you to reverse any changes you have made within TortoiseMerge." -msgstr "撤销实现多级撤销，允许你放弃在 TortoiseMerge 中所做的任何修改。" +#: source/TortoiseMerge_en.xml:885(para) +msgid "Go to next conflict" +msgstr "跳转到下一个不同点" -#: source/TortoiseMerge_en.xml:494(para) -msgid "Prev/Next Difference jumps directly to the next point where the files differ. This saves scrolling through all the unchanged parts of the file." -msgstr "上一个/下一个差异 直接跳转到文件中的上一个/下一个不同的地方。它可以快速地跳过文件未变化过的部分。" +#: source/TortoiseMerge_en.xml:891(term) +msgid "Shift-cursor-left" +msgstr "Shift-光标左箭头" -#: source/TortoiseMerge_en.xml:50(para) -msgid "Applying the patches" -msgstr "应用补丁" +#: source/TortoiseMerge_en.xml:893(para) +msgid "Go to previous conflict" +msgstr "跳转到上一个不同点" -#: source/TortoiseMerge_en.xml:500(para) -msgid "When you do this in 2-pane diff mode, the detail bar at the bottom of the screen will show you the inline differences for the first line, regardless of where the mouse is hovering." -msgstr "当你处于双窗口方式时，无论是否鼠标划过该区域，在屏幕底部的细节状态栏都将显示首行的不同。" +#: source/TortoiseMerge_en.xml:899(term) +msgid "Ctrl-D" +msgstr "Ctrl-D" -#: source/TortoiseMerge_en.xml:507(para) -msgid "Prev/Next Conflict jumps directly to the next point where the file differences are in conflict and need to be resolved." -msgstr "上一个/下一个冲突 直接跳转到文件中的上一个/下一个需要解决的冲突。" +#: source/TortoiseMerge_en.xml:901(para) +msgid "Toggle between one-pane diff and two-pane diff" +msgstr "切换单窗口方式或双窗口方式" -#: source/TortoiseMerge_en.xml:514(para) -msgid "Mark as Resolved When you have resolved all the conflicts in a file and saved the changes, you can mark it as resolved from within TortoiseMerge, rather than going back to explorer and marking as resolved from there." -msgstr "标记为已解决 当你解决了文件中的全部冲突并保存了修改后，你可以在 TortoiseMerge 中标记为已解决冲突，而不用返回资源管理器去标记它们。" +#: source/TortoiseMerge_en.xml:907(term) +msgid "Ctrl-R" +msgstr "Ctrl-R" -#: source/TortoiseMerge_en.xml:523(para) -msgid "Show Whitespaces toggles the option to display space and tab characters as symbols so you can distinguish white space changes." -msgstr "显示空白字符 切换是否使用符号显示空格和制表符，以便你能注意到空白字符的变化。" +#: source/TortoiseMerge_en.xml:909(para) +msgid "Reload the files and revert all changes made" +msgstr "重新载入文件并放弃所做的任何改变" -#: source/TortoiseMerge_en.xml:530(para) -msgid "Switch View selects between one-pane and two-pane view. Disabled in 3-pane view." -msgstr "切换窗口方式 在单窗口方式和双窗口方式间进行切换。在三窗口方式时无效。" +#: source/TortoiseMerge_en.xml:915(term) +msgid "Ctrl-T" +msgstr "Ctrl-T" -#: source/TortoiseMerge_en.xml:537(para) -msgid "Switch Left and Right View In 2-pane view, swaps the left and right windows. When you are comparing a file in 2 different trees, as opposed to 2 revisions of the same file, TortoiseSVN does not know which one should go in the left pane as the original/base version. If it gets this wrong, you can change it to make viewing easier." -msgstr "交换左右窗口 在双窗口方式中，互换左右窗口的内容。当你比较两个不同分支中的两个文件时，而不是比较同一个文件的两个修订版本时，TortoiseSVN 并不知道哪个文件应该放在左边的窗口作为原始/基础版本。如果放错了，为了便于查看，你能够互换它们。" +#: source/TortoiseMerge_en.xml:917(para) +msgid "Toggles between showing whitespaces or not" +msgstr "切换是否显示空白字符" -#: source/TortoiseMerge_en.xml:548(para) -msgid "Show/Hide Patch List When TortoiseMerge has a patch list, this button allows you to hide it (so you can see both windows), or show it (so you can review the file list)." -msgstr "显示/隐藏补丁列表 当 TortoiseMerge 有补丁列表时，这个按钮允许你隐藏它(于是你可以看到两个窗口)，或者显示它(于是你可以复审文件列表)。 " +#: source/TortoiseMerge_en.xml:923(term) +msgid "Ctrl-wheelmouse" +msgstr "Ctrl-鼠标滚轮" -#: source/TortoiseMerge_en.xml:556(para) -msgid "Settings takes you to TortoiseMerge's settings dialog." -msgstr "设置 弹出 TortoiseMerge 的设置对话框。" +#: source/TortoiseMerge_en.xml:925(para) +msgid "Scroll the display left/right" +msgstr "滚动左右两边的显示" -#: source/TortoiseMerge_en.xml:56(para) -msgid "TortoiseMerge also helps you to sort out conflicted files which can occur if you're working with a source control system and others are working on the same files as you." -msgstr "　　如果你使用源代码控制系统，并且和其他人共同处理相同文件时，TortoiseMerge也能帮助你挑选出发生了冲突的文件。" +#: source/TortoiseMerge_en.xml:934(title) +msgid "Automating TortoiseMerge" +msgstr "TortoiseMerge 操作" -#: source/TortoiseMerge_en.xml:563(para) -msgid "On the left side of the window is a locator bar. This provides a quick visual reference as to where the changes lie within the file. The bar has three columns. The left column refers to the left pane, the right column to the right pane, and the centre column to the bottom pane (if present). In one-pane view only the left column is used. The locator bar can also be used as a scroll bar to scroll all the windows simultaneously." -msgstr "窗口的左边是定位拉杆。它提供了对文件改变的位置的快速可视化引用。这个拉杆有三列。左列引用左边的窗口，右列引用右边的窗口，中间列引用底部窗口(如果存在)。在单窗口模式下，只使用了左列。定位拉杆也可以作为滑杆使用，让所有窗口同时滑动。" +#: source/TortoiseMerge_en.xml:936(para) +msgid "TortoiseMerge can be started with command line parameters to avoid having to go through the Open dialog to select the files yourself. This is useful also if you want to use TortoiseMerge from another application." +msgstr "　　TortoiseMerge 可以通过命令行选项指定参数运行，而不必非通过打开对话框来选择文件。这便于其它程序调用 TortoiseMerge。" -#: source/TortoiseMerge_en.xml:572(para) -msgid "Below the bottom window is the status bar. This shows the number of lines added and deleted in Theirs and Mine, and the number of unresolved conflicts remaining. You can also see which line-ending style is in use, what encoding (ASCII, UTF-8, etc) is assumed by TortoiseMerge, and whether there is a byte-order-mark (BOM) present in UTF-8 files. The left side of the status bar is used to display hints when you hover the mouse over a control." -msgstr "底部窗口下面是状态栏。它显示了他人与本人增加和删除的行数，以及尚存的未解决冲突数目。你还可以看到使用的行结束符，编码(ASCII，UTF-8等)，以及在UTF-8编码的文件中是否有字节顺序标记(BOM)。当你的鼠标逗留在控件上的时候，状态栏的左边会显示提示。" +#: source/TortoiseMerge_en.xml:947(title) +msgid "TortoiseMerge Command Line Switches" +msgstr "TortoiseMerge 命令行选项" -#: source/TortoiseMerge_en.xml:588(title) -msgid "Merging / Editing Conflicts" -msgstr "合并/编辑冲突" +#: source/TortoiseMerge_en.xml:949(primary) +msgid "automation" +msgstr "自动" -#: source/TortoiseMerge_en.xml:589(para) -msgid "TortoiseMerge not only shows you the differences between files but also lets you resolve conflicts or apply changes." -msgstr "　　TortoiseMerge 不仅 显示 了你文件间的不同，而且还能让你解决存在的冲突或者采用修改。" +#: source/TortoiseMerge_en.xml:952(primary) +msgid "command line" +msgstr "命令行" -#: source/TortoiseMerge_en.xml:593(para) -msgid "If you're in two pane view, then you can only edit the file in the right pane (Mine). To apply changes made in the left file (Theirs), right-click on the changed lines and select Context MenuUse text block from theirs. Then the changes from the left file are added to the right file." -msgstr "如果你在双窗口模式，你只能编辑右窗口中的文件(我的)。要应用左边的文件修改(他人的)，在修改行上右击，选择上下文菜单使用他人的文本块。于是左边文件的修改就增加到右边的文件。" +#: source/TortoiseMerge_en.xml:954(para) +msgid "" +"Most switches require additional information like a path or some other string. In those cases, append an ':' to the switch and put the string/path after it. Example: \n" +"/base:\"c:\\folder\\my base file.txt\"\n" +"" +msgstr "" +"多数选项需要路径及其它信息。这种情况下，选项后用“:”跟一个字符串或路径。例如：\n" +"/base:\"c:\\folder\\my base file.txt\"\n" +"" -#: source/TortoiseMerge_en.xml:6(subtitle) -msgid "A diff/merge tool for Windows" -msgstr "一种Windows下的比较及合并差异的工具" +#: source/TortoiseMerge_en.xml:974(title) +msgid "List of available command line options" +msgstr "命令行选项列表" -#: source/TortoiseMerge_en.xml:605(para) -msgid "Sometimes you actually want both text blocks, and the context menu also offers you Context MenuUse both text blocks (this one first) and Context MenuUse both text blocks (this one last)." -msgstr "有时候，你实际上需要双方的文本块，上下文菜单 使用双方的文本块 (这个先出现) 和 上下文菜单使用双方的文本块 (这个后出现)可以满足你的要求。" +#: source/TortoiseMerge_en.xml:980(entry) +msgid "Command" +msgstr "命令" -#: source/TortoiseMerge_en.xml:618(para) -msgid "If you're in three pane view (sometimes called merge view) you can only edit the file in the bottom view (Merged). As in two pane view, you can right-click on conflicted lines and either select Context MenuUse text block from theirs or Context MenuUse text block from mine. In addition, if you want both blocks, you can select Context Menu Use text block from mine before theirs or Context Menu Use text block from theirs before mine. According to the command you've selected, the changes are used in the resulting Merged file." -msgstr "如果你在三窗口模式(有时称为合并视图)，你只能编辑底部窗口中的文件(已合并)。象在两窗口模式那样，你可以在冲突行上右击，或者选择上下文菜单使用他人的文本块，或者上下文菜单使用我的文本块。此外，如果你要两者的文本块，可以选择上下文菜单在他人的前面使用我的文本块，或者 上下文菜单在我的前面使用他人的文本块。通过你选择的命令，改变结果在已合并文件。" +#: source/TortoiseMerge_en.xml:981(entry) +msgid "Description" +msgstr "描述" -#: source/TortoiseMerge_en.xml:655(para) -msgid "Sometimes the conflict is too difficult to resolve by simply picking Theirs and Mine and it requires hand editing. TortoiseMerge allows you to do all the easy changes visually first and then save the file, leaving only the difficult changes to be resolved by hand-editing." -msgstr "有时冲突很难通过简单选择他人的和我的来解决，需要手工编辑。TortoiseMerge 允许你先在可视化模式做所有容易的合并，然后保存文件，将困难的合并用手工解决。" +#: source/TortoiseMerge_en.xml:987(entry) +msgid "Shows a dialog box with the most important command line switches." +msgstr "弹出一个显示常用命令行参数的对话框。" -#: source/TortoiseMerge_en.xml:66(title) -msgid "TortoiseMerge is free!" -msgstr "TortoiseMerge 是免费的！" +#: source/TortoiseMerge_en.xml:995(option) +msgid "?" +msgstr "?" -#: source/TortoiseMerge_en.xml:663(para) -msgid "Note that if you use TortoiseMerge on the same files again, any changes to your working copy, whether in TortoiseMerge, or by hand-editing, will be discarded and the file will appear as it did when conflict-editing first started." -msgstr "注意：如果你在同一文件重新使用 TortoiseMerge，你对工作版本做的任何修改，无论是 TortoiseMerge，还是手工编辑，都将被丢弃，文件恢复到开始冲突编辑时的状态。" +#: source/TortoiseMerge_en.xml:994(entry) +msgid "The same as ." +msgstr "同 一样。" -#: source/TortoiseMerge_en.xml:67(para) -msgid "TortoiseMerge is free. You don't have to pay for it, you can use it any way you want. It is developed under the GP license (GPL)." -msgstr "　　TortoiseMerge 是免费的。你不需要为它支付任何费用就可以任意使用。它是在GPL许可协议下开发的。" +#: source/TortoiseMerge_en.xml:1001(emphasis) +msgid "base" +msgstr "基础版本文件" -#: source/TortoiseMerge_en.xml:671(para) -msgid "If you need to copy lines of text to insert in another file using your favourite text editor, you can select multiple lines to copy within TortoiseMerge. Click on the first line of the block, then Shift+Click on the last line of the block. As usual, Ctrl+C can be used to copy the selected lines to the clipboard." -msgstr "如果需要复制文本行到你熟悉的编辑器，你可以在 TortoiseMerge 中选择多行复制。单击文本块的首行，然后按着Shift键单击文本块的尾行。象通常那样，可以使用Ctrl+C复制选择的行到剪贴板。" +#: source/TortoiseMerge_en.xml:1000(entry) +msgid "Specifies the file used in three way diffs. This is the common ancestor of the files being diffed, although it is not shown in a separate window. For two way diffs, this is the left file." +msgstr "指定三路比较的文件 。这是所有参与比较文件的祖先，尽管它不在单独的窗口显示。对于两路比较，它是左边的文件。" -#: source/TortoiseMerge_en.xml:684(title) -msgid "Settings" -msgstr "设置" +#: source/TortoiseMerge_en.xml:1010(entry) +msgid "The name of the base file. This is shown in the view title instead of the file path. For three way diffs it is shown in a tooltip for the view title." +msgstr "基础版本文件名称。它代替文件路径在窗口标题栏显示。在三窗口方式时，它出现在窗口标题的提示中。" -#: source/TortoiseMerge_en.xml:686(title) -msgid "Main Settings Page" -msgstr "常用设置页" +#: source/TortoiseMerge_en.xml:1020(emphasis) +msgid "theirs" +msgstr "他人的文件" -#: source/TortoiseMerge_en.xml:689(title) -msgid "The Settings Main Page" -msgstr "常用设置页" +#: source/TortoiseMerge_en.xml:1019(entry) +msgid "Specifies the file used in three way diffs, displayed in the left pane." +msgstr "指定用于三窗口方式的 ，显示在左窗口。" -#: source/TortoiseMerge_en.xml:692(para) -msgid "Most of the options here are self-explanatory, but a few points need clarifying." -msgstr "　　多数选项是不需要过多解释，只需要稍微明确一下。" +#: source/TortoiseMerge_en.xml:1026(entry) +msgid "The name of the theirs file. This is shown in the view title instead of the file path." +msgstr "他人的文件名称。代替文件路径在窗口标题栏显示。" -#: source/TortoiseMerge_en.xml:696(para) -msgid "Backup original file renames the original file in the WC to filename.bak before saving the modified version." -msgstr "　　备份原始文件 在保存修改后的版本时，先将工作拷贝中的原始文件重命名为filename.bak。" +#: source/TortoiseMerge_en.xml:1034(emphasis) +msgid "mine" +msgstr "我的文件" -#: source/TortoiseMerge_en.xml:701(para) -msgid "Ignore lineendings hides changes which are due solely to difference in line-end style." -msgstr "　　忽略换行类型 隐藏换行类型的改变。" +#: source/TortoiseMerge_en.xml:1033(entry) +msgid "Specifies the file used in three way diffs, displayed in the right pane. For two way diffs, this is the right file." +msgstr "指定用于三窗口方式的 ，它显示在右窗口。对于双面板方式，是指右边的文件。" -#: source/TortoiseMerge_en.xml:705(para) -msgid "Ignore case changes hides changes which are due solely to case changes within the text. This can be useful with apps such as Visual Basic, which changes case in variables without warning." -msgstr "　　忽略大小写变化 隐藏仅文本大小写变化的差异。这对于像 Visual Basic 等忽略变量大小写的应用程序比较有用。" +#: source/TortoiseMerge_en.xml:1041(entry) +msgid "The name of the mine file. This is shown in the view title instead of the file path." +msgstr "我的文件名称。代替文件路径在窗口标题栏显示。" -#: source/TortoiseMerge_en.xml:71(para) -msgid "TortoiseMerge is an Open Source project. That means you have full access to the source code of this program. You can browse it on this link http://tortoisesvn.tigris.org/svn/tortoisesvn/. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under /trunk/ the released versions are located under /tags/." -msgstr "　　TortoiseMerge 是一个开源软件项目。换言之，你可以取得它的全部源代码。你可以访问以下链接得到源代码：http://tortoisesvn.tigris.org/svn/tortoisesvn/（用户名：guest，无密码） 。最新的版本（我们当前正在开发的）放在 /trunk/ ，已发布版本放在 /tags/ 。" +#: source/TortoiseMerge_en.xml:1049(emphasis) +msgid "merged" +msgstr "合并后的文件" -#: source/TortoiseMerge_en.xml:711(para) -msgid "Colour code in-line changes uses the same scheme as the line diff bar to show the detailed in-line changes within the main display panes. Lines which have been heavily modified will not be shown using this method as the results are simply confusing. In this case the line will be shown as replaced (old line deleted, new line added)." -msgstr "为改变的嵌入代码着色在主窗口，使用与行差异拉杆相同的方案显示代码改变的细节。修改很多的行不会这样显示，因为它会让人糊涂。这时会用替换方式显示(旧行删除，新行增加)。" +#: source/TortoiseMerge_en.xml:1048(entry) +msgid "Specifies the resulting file used in three way diffs. This is the filepath where the result of the merge/conflict resolving is saved. If this is not set, then TortoiseMerge will ask the user where to save the result." +msgstr "指定用于三窗口方式的 。它是保存合并/解决冲突的结果的文件路径。如果没有指定，TortoiseMerge 将询问用户保存结果的路径。" -#: source/TortoiseMerge_en.xml:719(para) -msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." -msgstr "　　比较空白字符 将全部缩进变化，或行内空白字符的变化按照添加/删除的行显示（即 Subversion 处理变化的方式）。" +#: source/TortoiseMerge_en.xml:1058(entry) +msgid "The name of the merged file. This is shown in the view title instead of the file path." +msgstr "合并结果的文件名称。显示在窗口标题显示路径的地方。" -#: source/TortoiseMerge_en.xml:724(para) -msgid "Ignore whitespace changes hides changes which are due solely to a change in the amount or type of whitespace, eg. changing the indentation or changing tabs to spaces. Adding whitespace where there was none before, or removing a whitespace completely is still shown as a change." -msgstr "　　忽略空白字符变化 隐藏仅仅只是空白字符数量和类型的变化。例如，缩进，制表符变成了空格。在以前没有空白字符的地方增加空白字符，或者完全删除空白字符，仍旧视为变化。" +#: source/TortoiseMerge_en.xml:1069(emphasis) +msgid "very long" +msgstr "很长" -#: source/TortoiseMerge_en.xml:732(para) -msgid "Ignore all whitespaces hides all whitespace-only changes." -msgstr "　　忽略全部空白字符 隐藏所有空白字符的变化。" +#: source/TortoiseMerge_en.xml:1065(entry) +msgid "The path where a patch should be applied to. If you don't set this path, then TortoiseMerge will try to find the path itself to match the paths in the patchfile, but that can take ." +msgstr "使用补丁文件的路径。如果你不设置此路径，TortoiseMerge 将自己查找匹配补丁文件的路径，但会花费时间。" -#: source/TortoiseMerge_en.xml:738(title) -msgid "Colour Settings Page" -msgstr "颜色设置页" +#: source/TortoiseMerge_en.xml:1074(entry) +msgid "The name of the original file to patch. Used for the view title." +msgstr "对应补丁的原始文件。用于窗口标题。" -#: source/TortoiseMerge_en.xml:741(title) -msgid "The Settings Color Page" -msgstr "颜色设置页" +#: source/TortoiseMerge_en.xml:1081(entry) +msgid "The name of the resulting patched file. Used for the view title." +msgstr "对应补丁的文件名称。用于窗口标题。" -#: source/TortoiseMerge_en.xml:744(para) -msgid "This dialog allows you to select the background color coding used to highlight the different line changes." -msgstr "　　这个对话框允许你选择一个背景颜色代码，它们用于高亮被修改的行。" +#: source/TortoiseMerge_en.xml:1088(entry) +msgid "The path to the patch/diff file to apply to a directory." +msgstr "将要应用补丁的目录" -#: source/TortoiseMerge_en.xml:750(term) -msgid "Normal" -msgstr "无变化" +#: source/TortoiseMerge_en.xml:1094(entry) +msgid "Forces TortoiseMerge to start with the one-way view instead of the view the user specified in the settings." +msgstr "强制 TortoiseMerge 以单窗口视图启动，忽略用户的配置。" -#: source/TortoiseMerge_en.xml:751(listitem) -msgid "All lines which are unchanged, or where changes are hidden." -msgstr "这些行都没有改变过，或改变被隐藏了。" +#: source/TortoiseMerge_en.xml:1101(entry) +msgid "Switches the left and right view of the specified two files to diff." +msgstr "左右交换两个需要比较差异的文件。" -#: source/TortoiseMerge_en.xml:756(term) -msgid "Added" -msgstr "新增" +#: source/TortoiseMerge_en.xml:1110(para) +msgid "" +"You can also supply simple filenames on the command line for compatibility with other diff programs. In this simplified form the command line is \n" +"TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n" +" If two files are given they will be compared with each other. If three files are given, the first is taken as the BASE file, and the other two are compared with it in a three-way diff." +msgstr "" +"为了兼容其它差异比较程序，你也可以在命令行提供简单的文件名。这种简单命令行格式是\n" +"TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n" +"如果给出两个文件，它们会互相比较。如果给出三个文件，那么第一个文件视为基础文件，其它两个文件采用三路比较算法。" -#: source/TortoiseMerge_en.xml:757(listitem) -msgid "Lines which have been added." -msgstr "这些行是新增加的。" +#: source/TortoiseMerge_en.xml:1126(title) +msgid "Glossary" +msgstr "词汇表" -#: source/TortoiseMerge_en.xml:762(term) -msgid "Removed" -msgstr "删除" +#: source/TortoiseMerge_en.xml:1128(glossterm) +msgid "Add" +msgstr "增加" -#: source/TortoiseMerge_en.xml:763(listitem) -msgid "Lines which have been deleted." -msgstr "这些行被删除了。" +#: source/TortoiseMerge_en.xml:1130(para) +msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "用于增加文件或目录到你的工作副本中的 Subversion 命令。当你提交时，这些新项目会增加到版本库中。" -#: source/TortoiseMerge_en.xml:768(term) -msgid "Modified" -msgstr "已修改" +#: source/TortoiseMerge_en.xml:1138(glossterm) +msgid "BASE revision" +msgstr "基础版本" -#: source/TortoiseMerge_en.xml:769(listitem) -msgid "Lines which have relatively small changes, and are shown using inline diff. This colour is used for the portion of the line content. Changed portions will be shown using the inline added and deleted colours described below. If is not enabled, this colour will not be used and changed lines will always be shown as replacements." -msgstr "相对小的行改变，用嵌入差异显示。 部分着色。改变的部分用嵌入的增加和删除形式展现，其颜色下述。如果未启用 ，不会使用此颜色，改变的行用替换形式显示。" +#: source/TortoiseMerge_en.xml:1140(para) +msgid "The current base revision of a file or folder in your working copy. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision." +msgstr "工作拷贝中的文件或文件夹的当前基础版本。它是文件或文件夹上次检出、更新或提交后的版本。通常基础版本与最新版本并不相同。" -#: source/TortoiseMerge_en.xml:771(emphasis) -msgid "unchanged" -msgstr "未改变" +#: source/TortoiseMerge_en.xml:1149(glossterm) +msgid "Blame" +msgstr "追溯" -#: source/TortoiseMerge_en.xml:774(guilabel) -msgid "Colour code in-line changes" -msgstr "着色改变的代码" +#: source/TortoiseMerge_en.xml:1151(para) +msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number." +msgstr "这个命令只能用于文本文件，它显示每行由哪个版本最后修改，以及修改的作者。我们的 GUI 实现称之为 TortoiseBlame，当你将鼠标停靠在版本号上时，还会显示提交的日期/时间，和日志。" -#: source/TortoiseMerge_en.xml:780(term) -msgid "Conflicted" +#: source/TortoiseMerge_en.xml:1161(glossterm) +msgid "BDB" +msgstr "BDB" + +#: source/TortoiseMerge_en.xml:1163(para) +msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." +msgstr "伯克利 DB（BDB）。 一个经过广泛测试的版本库的数据库后端，不能使用网络文件系统(例如 NFS 或 SMBFS)。是 1.2 版本及以前的版本库之默认后端。" + +#: source/TortoiseMerge_en.xml:1170(glossterm) +msgid "Branch" +msgstr "分支" + +#: source/TortoiseMerge_en.xml:1172(para) +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bugfixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgstr "一个经常被开发者在特定时期跟踪两个独立路径时使用的术语，它描述了在版本控制系统中发生的事情。你可以从主开发线创建分支，从而开发新特性，不会使主开发线陷入不稳定状态。或者你创建一个稳定发布版的分支，仅用于修复问题，新的开发位于不稳定的主开发线。在 Subversion 中，分支用廉价拷贝实现。" + +#: source/TortoiseMerge_en.xml:1185(glossterm) +msgid "Checkout" +msgstr "检出" + +#: source/TortoiseMerge_en.xml:1187(para) +msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "此 Subversion 命令从版本库下载受版本控制的文件，在空目录创建本地工作副本。" + +#: source/TortoiseMerge_en.xml:1194(glossterm) +msgid "Cleanup" +msgstr "清理" + +#: source/TortoiseMerge_en.xml:1196(para) +msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "摘自 Subversion 手册： 递归的清理工作目录，删除锁，恢复未完成的工作。如果你遇到工作目录已经锁定错误，运行此命令删除过时的锁，使你的工作副本恢复到可用状态。注释：在此上下文中锁指的是本地文件系统中的锁，不是版本库的锁。" + +#: source/TortoiseMerge_en.xml:1211(glossterm) +msgid "Commit" +msgstr "提交" + +#: source/TortoiseMerge_en.xml:1213(para) +msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "此 Subversion 命令用于将你的本地修改传递到版本库中，创建新版本。" + +#: source/TortoiseMerge_en.xml:1221(glossterm) +msgid "Conflict" msgstr "冲突" -#: source/TortoiseMerge_en.xml:781(listitem) -msgid "Where the same line has been changed in both files." -msgstr "两个文件都修改了这些行。" +#: source/TortoiseMerge_en.xml:1223(para) +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "当仓库的改变合并到本地修改时，有时会在相同的行修改。在这种情况下，Subversion 不能自动决定采用哪个版本，文件就处于冲突状态。你必须手工编辑文件，在你提交之前解决冲突。" -#: source/TortoiseMerge_en.xml:786(term) -msgid "Empty" -msgstr "空白" +#: source/TortoiseMerge_en.xml:1233(glossterm) +msgid "Copy" +msgstr "复制" -#: source/TortoiseMerge_en.xml:787(listitem) -msgid "Where lines have been added in the opposite pane, and no such line existed in this pane." -msgstr "在另一个面板中增加了一些行，且这个面板中没有对应的行。" +#: source/TortoiseMerge_en.xml:1235(para) +msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "在 Subversion 版本库中，你可以创建单个文件或一个目录树的副本。此操作用廉价拷贝实现，它有些象符号连接到原始文件，几乎不耗费空间。创建的副本保留了历史，所以你可以跟踪副本创建之前的修改。" -#: source/TortoiseMerge_en.xml:793(term) -msgid "Inline added text" -msgstr "增加的文本" +#: source/TortoiseMerge_en.xml:1245(glossterm) +msgid "Delete" +msgstr "删除" -#: source/TortoiseMerge_en.xml:794(listitem) -msgid "When inline diffs are shown, added text is shown in this colour." -msgstr "当显示嵌入差异时，用此颜色显示增加的文本。" +#: source/TortoiseMerge_en.xml:1247(para) +msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the commited revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and resurrect it complete with history." +msgstr "当你删除一个受版本控制的项(并且提交了修改)，在那么在此提交版本后，它就消失于版本库中。当然，它仍旧包含在版本库的早期版本中，所以你还可以存取它。如果需要，你可以复制一个已删除项，包含历史的彻底复活它。" -#: source/TortoiseMerge_en.xml:799(term) -msgid "Inline removed text" -msgstr "删除的文本" +#: source/TortoiseMerge_en.xml:1257(glossterm) +msgid "Diff" +msgstr "差异" -#: source/TortoiseMerge_en.xml:800(listitem) -msgid "When inline diffs are shown, deleted text is shown in this colour." -msgstr "当显示嵌入差异时，用此颜色显示删除的文本。" +#: source/TortoiseMerge_en.xml:1259(para) +msgid "Shorthand for Show Differences. Very useful when you want to see exactly what changes have been made." +msgstr "显示差异的简写。当你想精确的察看变化时很有用。" -#: source/TortoiseMerge_en.xml:809(title) -msgid "keyboard shortcuts" -msgstr "快捷键" +#: source/TortoiseMerge_en.xml:1266(glossterm) +msgid "Export" +msgstr "导出" -#: source/TortoiseMerge_en.xml:811(para) -msgid "List of keyboard shortcuts and commands." -msgstr "列出所有的快捷键和命令。" +#: source/TortoiseMerge_en.xml:1268(para) +msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local .svn folders." +msgstr "此命令产生一个受版本控制的文件夹之副本，很像工作副本，只是没有本地的 .svn 文件夹。" -#: source/TortoiseMerge_en.xml:816(title) -msgid "Keyboard shortcuts" -msgstr "快捷键" +#: source/TortoiseMerge_en.xml:1276(glossterm) +msgid "FSFS" +msgstr "FSFS" -#: source/TortoiseMerge_en.xml:819(term) -msgid "Ctrl-Q" -msgstr "Ctrl-Q" +#: source/TortoiseMerge_en.xml:1278(para) +msgid "FS Filesystem. A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "FS 文件系统。一个专用于 Subversion 版本库的文件系统后端，可以使用网络文件系统(例如 NFS 或 SMBFS)。是 1.2 版本及其后的版本库之默认后端。" -#: source/TortoiseMerge_en.xml:821(para) -msgid "Quit the program" -msgstr "退出程序" +#: source/TortoiseMerge_en.xml:1285(glossterm) +msgid "GPO" +msgstr "GPO" -#: source/TortoiseMerge_en.xml:827(term) -msgid "Ctrl-C" -msgstr "Ctrl-C" +#: source/TortoiseMerge_en.xml:1287(para) +msgid "Group policy object" +msgstr "组策略对象" -#: source/TortoiseMerge_en.xml:829(para) -msgid "Copy the selected line(s) to the clipboard" -msgstr "复制选定行到剪贴板" +#: source/TortoiseMerge_en.xml:1293(glossterm) +msgid "HEAD revision" +msgstr "最新版本" -#: source/TortoiseMerge_en.xml:835(term) -msgid "Ctrl-F" -msgstr "Ctrl-F" +#: source/TortoiseMerge_en.xml:1295(para) +msgid "The latest revision of a file or folder in the repository." +msgstr "版本库 中的文件或文件夹的最新版本。" -#: source/TortoiseMerge_en.xml:837(para) -msgid "Open the Find dialog for text searches" -msgstr "打开文本查找对话框" +#: source/TortoiseMerge_en.xml:1301(glossterm) +msgid "Import" +msgstr "导入" -#: source/TortoiseMerge_en.xml:843(term) -msgid "Ctrl-O" -msgstr "Ctrl-O" +#: source/TortoiseMerge_en.xml:1303(para) +msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgstr "用于一次导入整个文件夹(包含子目录)的 Subversion 命令。" -#: source/TortoiseMerge_en.xml:845(para) -msgid "Open files to diff/merge" -msgstr "打开需要比较/合并的文件" +#: source/TortoiseMerge_en.xml:1310(glossterm) +msgid "Lock" +msgstr "加锁" -#: source/TortoiseMerge_en.xml:851(term) -msgid "Ctrl-S" -msgstr "Ctrl-S" +#: source/TortoiseMerge_en.xml:1312(para) +msgid "When you take out a lock on a versioned item, you mark it in the repository as uncommittable, except from the working copy where the lock was taken out." +msgstr "当你加锁一个版本控制项目，除了在发出加锁命令的工作目录，它在版本库中被标记为不可提交的。" -#: source/TortoiseMerge_en.xml:853(para) -msgid "Save the changes" -msgstr "保存改变" +#: source/TortoiseMerge_en.xml:1320(glossterm) +msgid "Log" +msgstr "日志" -#: source/TortoiseMerge_en.xml:859(term) -msgid "Ctrl-Shift-S" -msgstr "Ctrl-Shift-S" +#: source/TortoiseMerge_en.xml:1322(para) +msgid "Show the revision history of a file or folder. Also known as History." +msgstr "显示文件或目录的版本历史。也称为历史。" -#: source/TortoiseMerge_en.xml:861(para) -msgid "Save as..." -msgstr "另存为..." +#: source/TortoiseMerge_en.xml:1329(glossterm) +msgid "History" +msgstr "历史" -#: source/TortoiseMerge_en.xml:867(term) -msgid "F7 or cursor-right" -msgstr "F7 或鼠标右键" +#: source/TortoiseMerge_en.xml:1331(para) +msgid "Show the revision history of a file or folder. Also known as Log." +msgstr "显示文件或目录的版本历史。也称为日志。" -#: source/TortoiseMerge_en.xml:869(para) -msgid "Go to next difference" -msgstr "跳转到下一个不同点" +#: source/TortoiseMerge_en.xml:1338(glossterm) +msgid "Merge" +msgstr "合并" -#: source/TortoiseMerge_en.xml:875(term) -msgid "Shift-F7 or cursor-left" -msgstr "Shift-F7 或鼠标左键" +#: source/TortoiseMerge_en.xml:1340(para) +msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict." +msgstr "将版本库中的修改增加到你的工作副本，不破坏本地的任何改变。有时这些修改不能自动协调，工作副本的状态称为冲突。" -#: source/TortoiseMerge_en.xml:877(para) -msgid "Go to previous difference" -msgstr "跳转到上一个不同点" +#: source/TortoiseMerge_en.xml:1346(para) +msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseSVN's Merge command." +msgstr "当你更新工作副本时，自动发生合并。你可以使用 TortoiseSVN 的合并命令合并其它分支的指定修改。" -#: source/TortoiseMerge_en.xml:883(term) -msgid "Shift-cursor-right" -msgstr "Shift-光标右键头" +#: source/TortoiseMerge_en.xml:1354(glossterm) +msgid "Patch" +msgstr "补丁" -#: source/TortoiseMerge_en.xml:885(para) -msgid "Go to next conflict" -msgstr "跳转到下一个不同点" +#: source/TortoiseMerge_en.xml:1356(para) +msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "如果工作副本只修改了文本文件，就可以使用 Subversion 的差异命令产生一个标准差异格式文件。这种文件类型通常称为补丁，可以应用到其他工作副本。没有提交权的人可以在修改后，发送补丁文件给一个认可的提交者来提交。或者不能确定此修改是否恰当，你可以发送补丁给其他人评审。" -#: source/TortoiseMerge_en.xml:891(term) -msgid "Shift-cursor-left" -msgstr "Shift-光标左箭头" +#: source/TortoiseMerge_en.xml:1369(glossterm) +msgid "Property" +msgstr "属性" -#: source/TortoiseMerge_en.xml:893(para) -msgid "Go to previous conflict" -msgstr "跳转到上一个不同点" +#: source/TortoiseMerge_en.xml:1371(para) +msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseSVN has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "在版本控制文件和目录之外，Subversion 还允许你增加版本控制元数据 - 称为属性 - 到你的版本控制文件和目录。每个属性都有名字和值，很像注册表键。Subversion 有内部使用的专用属性，例如 svn:eol-style。TortoiseSVN 也是如此，例如 tsvn:logminsize。你可以增加自己的属性，允许选择任意名称和取值。" -#: source/TortoiseMerge_en.xml:899(term) -msgid "Ctrl-D" -msgstr "Ctrl-D" +#: source/TortoiseMerge_en.xml:1384(glossterm) +msgid "Relocate" +msgstr "重新定位" -#: source/TortoiseMerge_en.xml:9(edition) -msgid "First" -msgstr "第一版" +#: source/TortoiseMerge_en.xml:1386(para) +msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to relocate your working copy so that its repository URLs point to the new location." +msgstr "如果你的版本库移动了，或许是你在服务器上将它移到其它目录，或者服务器域名改变了，你需要重新定位工作目录，让其版本库地址指向新的位置。" -#: source/TortoiseMerge_en.xml:90(title) -msgid "Wishlist" -msgstr "愿望" +#: source/TortoiseMerge_en.xml:1392(para) +msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the Switch command instead." +msgstr "注意：你只能在同一版本库中，工作副本引用相同的位置，仅版本库移动的情况下使用这个命令。 在其它情况下，或许你需要用切换命令。" -#: source/TortoiseMerge_en.xml:901(para) -msgid "Toggle between one-pane diff and two-pane diff" -msgstr "切换单窗口方式或双窗口方式" +#: source/TortoiseMerge_en.xml:1401(glossterm) +msgid "Repository" +msgstr "版本库" -#: source/TortoiseMerge_en.xml:907(term) -msgid "Ctrl-R" -msgstr "Ctrl-R" +#: source/TortoiseMerge_en.xml:1403(para) +msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network." +msgstr "版本库是存储和维护数据的中央部分。一个版本库的数据库或文件可以放在通过网络可访问的位置，或者存放在一个不需要通过网络就可以访问的地方。" -#: source/TortoiseMerge_en.xml:909(para) -msgid "Reload the files and revert all changes made" -msgstr "重新载入文件并放弃所做的任何改变" +#: source/TortoiseMerge_en.xml:1412(glossterm) +msgid "Resolve" +msgstr "解决" -#: source/TortoiseMerge_en.xml:91(para) -msgid "Even though TortoiseSVN and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers." -msgstr "　　虽然 TortoiseSVN 和 TortoiseMerge 是免费软件，但是你可以通过发送一些补丁和积极参与开发来帮助开发者。此外，你还可以使我们在计算机前度过的漫长时间更加愉快。" +#: source/TortoiseMerge_en.xml:1414(para) +msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as Resolving Conflicts. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed." +msgstr "当工作副本中的文件在合并后处于冲突状态时，这些冲突使用使用编辑器(或许是 TortoiseMerge)手工清理。这个步骤称为解决冲突。然后你就能标记这些冲突文件已经解决，允许提交这些文件。" -#: source/TortoiseMerge_en.xml:915(term) -msgid "Ctrl-T" -msgstr "Ctrl-T" +#: source/TortoiseMerge_en.xml:1424(glossterm) +msgid "Revert" +msgstr "恢复" -#: source/TortoiseMerge_en.xml:917(para) -msgid "Toggles between showing whitespaces or not" -msgstr "切换是否显示空白字符" +#: source/TortoiseMerge_en.xml:1426(para) +msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "当最后更新工作目录时，Subversion 为每个文件保留了一份本地原始副本。如果你做了修改，决定撤销，可以使用恢复命令得到原始副本。" -#: source/TortoiseMerge_en.xml:923(term) -msgid "Ctrl-wheelmouse" -msgstr "Ctrl-鼠标滚轮" +#: source/TortoiseMerge_en.xml:1435(glossterm) +msgid "Revision" +msgstr "版本" -#: source/TortoiseMerge_en.xml:925(para) -msgid "Scroll the display left/right" -msgstr "滚动左右两边的显示" +#: source/TortoiseMerge_en.xml:1437(para) +msgid "Every time you commit a set of changes, you create one new revision in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N." +msgstr "在你每次提交改变集时，就在版本库创建了一个新版本。每个版本都表示版本库历史上的确定状态点。如果你想回溯历史，可以使用版本 N 来检查版本库。" -#: source/TortoiseMerge_en.xml:934(title) -msgid "Automating TortoiseMerge" -msgstr "TortoiseMerge 操作" +#: source/TortoiseMerge_en.xml:1444(para) +msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created." +msgstr "换个说法，版本可以引用它创建时产生的改变集。" -#: source/TortoiseMerge_en.xml:936(para) -msgid "TortoiseMerge can be started with command line parameters to avoid having to go through the Open dialog to select the files yourself. This is useful also if you want to use TortoiseMerge from another application." -msgstr "　　TortoiseMerge 可以通过命令行选项指定参数运行，而不必非通过打开对话框来选择文件。这便于其它程序调用 TortoiseMerge。" +#: source/TortoiseMerge_en.xml:1451(glossterm) +msgid "Revision Property (revprop)" +msgstr "版本属性(revprop)" -#: source/TortoiseMerge_en.xml:947(title) -msgid "TortoiseMerge Command Line Switches" -msgstr "TortoiseMerge 命令行选项" +#: source/TortoiseMerge_en.xml:1453(para) +msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: svn:date svn:author svn:log which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone." +msgstr "正如文件可以有属性，版本库中的版本也有。当创建版本时，会自动创建版本属性，即：svn:date svn:author svn:log，分别描述了提交日期/时间，提交者，日志信息。这些信息可以编辑，但是没有版本，所以任何修改都是永久的，不能撤销。" -#: source/TortoiseMerge_en.xml:949(primary) -msgid "automation" -msgstr "自动" +#: source/TortoiseMerge_en.xml:1465(glossterm) +msgid "SVN" +msgstr "SVN" -#: source/TortoiseMerge_en.xml:952(primary) -msgid "command line" -msgstr "命令行" +#: source/TortoiseMerge_en.xml:1467(para) +msgid "A frequently-used abbreviation for Subversion." +msgstr "一个友好的 Subversion 缩写。" -#: source/TortoiseMerge_en.xml:954(para) -msgid "" -"Most switches require additional information like a path or some other string. In those cases, append an ':' to the switch and put the string/path after it. Example: \n" -"/base:\"c:\\folder\\my base file.txt\"\n" -"" -msgstr "" -"多数选项需要路径及其它信息。这种情况下，选项后用“:”跟一个字符串或路径。例如：\n" -"/base:\"c:\\folder\\my base file.txt\"\n" -"" +#: source/TortoiseMerge_en.xml:1470(para) +msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgstr "被svnserve版本库服务器使用的专用协议名称。" -#: source/TortoiseMerge_en.xml:97(para) -msgid "While working on TortoiseSVN we love to listen to music. And since we spend many hours on the project we need a lot of music. Therefore we have set up some wish-lists with our favourite music CD's and DVD's: http://tortoisesvn.tigris.org/donate.html Please also have a look at the list of people who contributed to the project by sending in patches or translations." -msgstr "　　我们喜欢一边聆听音乐，一边开发 TortoiseSVN。由于我们在这个项目上花费了大量时间，我们需要很多的音乐。因此，我们创建了喜欢的音乐 CD 和 DVD 列表：http://tortoisesvn.tigris.org/donate.html 。此外，也请看一看那些为项目提供了补丁或翻译的人员名单。" +#: source/TortoiseMerge_en.xml:1477(glossterm) +msgid "Switch" +msgstr "切换" -#: source/TortoiseMerge_en.xml:974(title) -msgid "List of available command line options" -msgstr "命令行选项列表" +#: source/TortoiseMerge_en.xml:1479(para) +msgid "Just as Update-to-revision changes the time window of a working copy to look at a different point in history, so Switch changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred." +msgstr "就像更新到版本改变了工作副本的时间窗口，可以察看历史上的不同时间点一样，切换 改变了工作副本的空间窗口，它可以指向版本库中的不同部分。当两个开发分支仅有少数文件不同时，它非常有用。你可以在两者之间切换工作副本，只有修改的文件内容被传送。" -#: source/TortoiseMerge_en.xml:980(entry) -msgid "Command" -msgstr "命令" +#: source/TortoiseMerge_en.xml:1491(glossterm) +msgid "Update" +msgstr "更新" -#: source/TortoiseMerge_en.xml:981(entry) -msgid "Description" -msgstr "描述" +#: source/TortoiseMerge_en.xml:1493(para) +msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "此命令从 Subversion 版本库下载最新的修改到你的工作副本，合并任何本地修改。" -#: source/TortoiseMerge_en.xml:987(entry) -msgid "Shows a dialog box with the most important command line switches." -msgstr "弹出一个显示常用命令行参数的对话框。" +#: source/TortoiseMerge_en.xml:1501(glossterm) +msgid "Working Copy" +msgstr "工作副本" -#: source/TortoiseMerge_en.xml:994(entry) -msgid "The same as ." -msgstr "同 一样。" +#: source/TortoiseMerge_en.xml:1503(para) +msgid "This is your local sandbox, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a Checkout from a repository, and you feed your changes back into the repository using Commit." +msgstr "这是一个本地 沙箱，你在受版本控制的文件上工作的区域，它通常位于你的本地硬盘上。你可以用检出从版本库创建工作副本，使用提交将你的改变传回版本库。" -#: source/TortoiseMerge_en.xml:995(option) -msgid "?" -msgstr "?" +#. Put one translator per line, in the form of NAME . +#: source/TortoiseMerge_en.xml:0(None) +msgid "translator-credits" +msgstr "" +"Dongsheng Song \n" +"xingyu.wang \n" +"Stan J " + +#. Place the translation of 'translation' here. +#: source/TortoiseMerge_en.xml:0(None) +msgid "translator-translation" +msgstr "译者" diff --git a/tortoisesvn/doc/po/TortoiseSVN_zh_CN.po b/tortoisesvn/doc/po/TortoiseSVN_zh_CN.po index 9e98198..1c178f6 100644 --- a/tortoisesvn/doc/po/TortoiseSVN_zh_CN.po +++ b/tortoisesvn/doc/po/TortoiseSVN_zh_CN.po @@ -28,8747 +28,8745 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseSVN Documentation\n" "POT-Creation-Date: 2007-05-05 22:50 +0000\n" -"PO-Revision-Date: 2007-05-06 12:38+0800\n" +"PO-Revision-Date: 2007-05-09 13:36+0800\n" "Last-Translator: Dongsheng Song \n" "Language-Team: TortoiseSVN translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Put one translator per line, in the form of NAME . -#: source/TortoiseSVN_en.xml:0(None) -msgid "translator-credits" -msgstr "" -"Dongsheng Song \n" -"rocksun \n" -"Stan \n" -"xingyu.wang \n" -"Tan Ruyan \n" -"liuheqi \n" -"Jaxx_chen \n" -"sunjing \n" -"kkeric \n" -"lulu2me \n" -"yasakya \n" -"amo " +#: source/TortoiseSVN_en.xml:4(title) +#: source/TortoiseSVN_en.xml:2964(secondary) +msgid "TortoiseSVN" +msgstr "TortoiseSVN" -#. Place the translation of 'translation' here. -#: source/TortoiseSVN_en.xml:0(None) -msgid "translator-translation" -msgstr "译者" +#: source/TortoiseSVN_en.xml:5(subtitle) +msgid "A Subversion client for Windows" +msgstr "Windows下的一种Subversion客户端" -#: source/TortoiseSVN_en.xml:10001(para) -msgid "As of Version 1.3.0 of Subversion and TortoiseSVN, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that env variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." -msgstr "在Subversion 1.3.0和TSVN 1.3.0里，你可以设置环境变量 SVN_ASP_DOT_NET_HACK，来通知Subversion用 _svn 文件夹替代 .svn 文件夹。你必须重启你系统的外壳程序来使环境变量生效，一般意味着你要重启PC。在1.4.0里这项替代工作就变得非常简单，你只需从常规设置页面选择一个单选框: 使用“_svn”目录替代“.svn”目录。——参考 " +#: source/TortoiseSVN_en.xml:8(edition) +msgid "First" +msgstr "首先" -#: source/TortoiseSVN_en.xml:10011(para) -msgid "For more information, and other ways to avoid this problem in the first place, check out the article about this in our FAQ." -msgstr "若想获得更多信息，了解避免该问题的其他方法，请读读我们 FAQ 里的文章。" +#: source/TortoiseSVN_en.xml:11(firstname) +msgid "Stefan" +msgstr "Stefan" -#: source/TortoiseSVN_en.xml:10022(title) -msgid "Client Side Hook Scripts" -msgstr "客户端钩子脚本" +#: source/TortoiseSVN_en.xml:12(surname) +msgid "Küng" +msgstr "Küng" -#: source/TortoiseSVN_en.xml:10024(primary) -msgid "client hooks" -msgstr "客户端钩子" +#: source/TortoiseSVN_en.xml:15(firstname) +msgid "Lübbe" +msgstr "Lübbe" -#: source/TortoiseSVN_en.xml:10027(primary) -msgid "hook scripts" -msgstr "钩子脚本" +#: source/TortoiseSVN_en.xml:16(surname) +msgid "Onken" +msgstr "Onken" -#: source/TortoiseSVN_en.xml:10029(para) -msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scrips are executed locally on the client." -msgstr " 这个对话框允许你指定当特定 Subversion 动作执行时，自动执行的钩子脚本。与 中钩子脚本的解释相反，这些脚本在客户端本地执行。" +#: source/TortoiseSVN_en.xml:19(firstname) +msgid "Simon" +msgstr "Simon" -#: source/TortoiseSVN_en.xml:10031(title) -msgid "The Settings Dialog, Hook Scripts Page" -msgstr "设置对话框，钩子脚本页" +#: source/TortoiseSVN_en.xml:20(surname) +msgid "Large" +msgstr "Large" -#: source/TortoiseSVN_en.xml:10039(para) -msgid "One application for such hooks might be to call a program like SubWCRev.exe to update version numbers after a commit, and perhaps to trigger a rebuild." -msgstr "应用程序，例如钩子，可能调用如SubWCRev.exe这样的程序，来更新提交后的版本号，可能还会出发重新构建。" +#: source/TortoiseSVN_en.xml:27(title) +msgid "Preface" +msgstr "前言" -#: source/TortoiseSVN_en.xml:10044(para) -msgid "For various security and implementation reasons, hook scripts are defined locally on a machine, rather than as project properties. You define what happens, no matter what someone else commits to the repository. Of course you can always choose to call a script which is itself under version control." -msgstr "由于各种安全理由和实现问题，钩子脚本在本地机器定义，而不是象工程属性那样。不管是谁提交，都可以定义它做什么事情。当然，你也可以选择调用一个受版本控制的脚本。" +#: source/TortoiseSVN_en.xml:35(para) +msgid "Do you work in a team?" +msgstr "你是否在一个团队中工作？" -#: source/TortoiseSVN_en.xml:10050(para) -msgid " To add a new hook script, simply click Add and fill in the details." -msgstr " 要增加钩子脚本，直接点击 增加 ，然后输入脚本即可。" +#: source/TortoiseSVN_en.xml:40(para) +msgid "Has it ever happened that you were working on a file, and someone else was working on the same file at the same time? Did you lose your changes to that file because of that?" +msgstr "是否发生过这样的情况: 当你在修改一个文件时，其他人也在修改这个文件？而你是否因此丢失过自己所作的修改呢？" -#: source/TortoiseSVN_en.xml:10052(title) -msgid "The Settings Dialog, Configure Hook Scripts" -msgstr "设置对话框，配置钩子脚本页面" +#: source/TortoiseSVN_en.xml:47(para) +msgid "Have you ever saved a file, and then wanted to revert the changes you made? Have you ever wished you could see what a file looked like some time ago?" +msgstr "是否曾经保存完一个修改，然后又想把个文件恢复到修改以前的状态？是否曾经希望能够看到一个文件以前某个时间点的状态？" -#: source/TortoiseSVN_en.xml:10058(para) -msgid "There are currently six types of hook script available " -msgstr "现在有六种钩子脚本类型可用 " +#: source/TortoiseSVN_en.xml:54(para) +msgid "Have you ever found a bug in your project and wanted to know when that bug got into your files?" +msgstr "是否曾经在项目中发现了一个 BUG，然后想调查它是什么时候产生的？" -#: source/TortoiseSVN_en.xml:10062(term) source/TortoiseSVN_en.xml:10130(term) -msgid "Start-commit" -msgstr "开始提交" +#: source/TortoiseSVN_en.xml:61(para) +msgid "If you answered yes to one of these questions, then TortoiseSVN is for you! Just read on to find out how TortoiseSVN can help you in your work. It's not that difficult." +msgstr "如果这些问题中的任何一个回答是的话，那么 TortoiseSVN 就是为你准备的！请继续读下去，你就能知道怎样让 TortoiseSVN 对你的工作起到帮助，这其实并不困难。" -#: source/TortoiseSVN_en.xml:10064(para) -msgid "Called before the commit dialog is shown. You might want to use this if the hook modifies a versioned file and affects the list of files that need to be committed." -msgstr "在提交对话框之前调用。当钩子修改受版本控制的文件，影响了提交的文件列表的时候适用。" +#: source/TortoiseSVN_en.xml:71(title) +msgid "Audience" +msgstr "致读者" -#: source/TortoiseSVN_en.xml:10072(term) source/TortoiseSVN_en.xml:10138(term) -msgid "Pre-commit" -msgstr "提交之前" +#: source/TortoiseSVN_en.xml:72(para) +msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseSVN is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." +msgstr "本书面向这样的计算机用户: 希望使用 Subversion 管理数据，但又不愿意使用 Subversion 的命令行客户端。因为 TortoiseSVN 是 Windows 的外壳扩展应用，所以我们假设用户很熟悉 Windows 资源管理器的使用。" -#: source/TortoiseSVN_en.xml:10074(para) -msgid "Called after the user clicks OK in the commit dialog, and before the actual commit begins." -msgstr "在提交对话框点击确认之后，实际提交之前调用。" +#: source/TortoiseSVN_en.xml:84(title) +msgid "Reading Guide" +msgstr "阅读指南" -#: source/TortoiseSVN_en.xml:10081(term) source/TortoiseSVN_en.xml:10147(term) -msgid "Post-commit" -msgstr "提交之后" +#: source/TortoiseSVN_en.xml:85(para) +msgid "This Preface explains a little about the TortoiseSVN project, the community of people who work on it, and the licensing conditions for using it and distributing it." +msgstr "在前言里简单介绍了 TortoiseSVN 项目，以及其开发团体，还介绍了使用及分发该软件应遵循的许可证。" -#: source/TortoiseSVN_en.xml:10083(para) -msgid "Called after the commit finishes (whether successful or not)." -msgstr "在提交结束后调用(无论成功或失败)" +#: source/TortoiseSVN_en.xml:90(para) +msgid "The Introduction explains what TortoiseSVN is, what it does, where it comes from and the basics for installing it on your PC." +msgstr "在简介一章里解释了 TortoiseSVN 是什么，能够做什么，它的开发过程以及安装相关的基础知识。" -#: source/TortoiseSVN_en.xml:10089(term) source/TortoiseSVN_en.xml:10157(term) -msgid "Start-update" -msgstr "开始更新" +#: source/TortoiseSVN_en.xml:95(para) +msgid "In Basic Concepts we give a short introduction to the Subversion revision control system which underlies TortoiseSVN. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." +msgstr "在基本概念一章里简短地介绍了 Subversion 版本控制系统，Subversion 是 TortoiseSVN 的基础。这一章引用了 Subversion 工程的文档，介绍了各种版本控制模式，以及 Subversion 的工作原理。" -#: source/TortoiseSVN_en.xml:1009(para) -msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to \"publish\" your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." -msgstr "当你在工作副本作了一些修改并且确认它们工作正常之后，Subversion 提供了一个命令可以“发布”你的修改给项目中的其他人(通过写到版本库)，如果别人发布了各自的修改，Subversion 提供了手段可以把这些修改与你的工作目录进行合并(通过读取版本库)。" +#: source/TortoiseSVN_en.xml:102(para) +msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." +msgstr "在服务器安装一章里介绍了如何安装一个版本控制服务器。虽然大部分的 Subversion 用户从来不需要自己安装服务器，但是对系统管理员来说这一章非常有用。" -#: source/TortoiseSVN_en.xml:10091(para) -msgid "Called before the update-to-revision dialog is shown." -msgstr "在更新到版本对话框显示之前调用" +#: source/TortoiseSVN_en.xml:107(para) +msgid "The chapter on The Repository explains how to set up a local repository, which is useful for testing Subversion and TortoiseSVN using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." +msgstr "版本库这一章解释了如何设置一个本地版本库，怎样在一台 PC 上测试 Subversion 和 TortoiseSVN，这一章也介绍了一点版本库管理，也就是如何管理服务器上的版本库。" -#: source/TortoiseSVN_en.xml:10097(term) source/TortoiseSVN_en.xml:10165(term) -msgid "Pre-update" -msgstr "更新之前" +#: source/TortoiseSVN_en.xml:113(para) +msgid "The Daily Use Guide is the most important section as it explains all the main features of TortoiseSVN and how to use them. It takes the form of a tutorial, starting with checking out a working copy, modifying it, committing your changes, etc. It then progresses to more advanced topics." +msgstr "日常使用指南是最重要的章节，介绍了 TortoiseSVN 最主要特性的使用。它以教程的形式，从检出一个工作副本开始，然后修改，提交你的修改，之后进入高级主题。" -#: source/TortoiseSVN_en.xml:10099(para) -msgid "Called before the actual Subversion update begins." -msgstr "在 Subversion 更新实际开始之前调用" +#: source/TortoiseSVN_en.xml:120(para) +msgid "SubWCRev is a separate program included with TortoiseSVN which can extract the information from your working copy and write it into a file. This is useful for including build information in your projects." +msgstr "SubWCRev 是 TortoiseSVN 的一个独立程序，可以从工作副本抽取信息并记录到一个文件，可以用来在项目中包含构建信息。" -#: source/TortoiseSVN_en.xml:10105(term) source/TortoiseSVN_en.xml:10173(term) -msgid "Post-update" -msgstr "更新之后" +#: source/TortoiseSVN_en.xml:125(para) +msgid "The How Do I... section answers some common questions about performing tasks which are not explicitly covered elsewhere." +msgstr "我该怎么做 …这一节回答了一些操作方面的常见问题。这些常见问题在其他章节没有被明确的提到过。" -#: source/TortoiseSVN_en.xml:10107(para) -msgid "Called after the update finishes (whether successful or not)." -msgstr "在更新之后调用(无论成功或失败)" +#: source/TortoiseSVN_en.xml:129(para) +msgid "The section on Automating TortoiseSVN shows how the TortoiseSVN GUI dialogs can be called from the command line. This is useful for scripting where you still need user interaction." +msgstr "自动化 TortoiseSVN 这一小节展示了如何使用命令行调用 TortoiseSVN 的 GUI 对话框，当你在使用脚本时仍希望用户交互时非常有用。" -#: source/TortoiseSVN_en.xml:10114(para) -msgid "A hook is defined for a particular working copy path. You only need to specify the top level path; if you perform an operation in a sub-folder, TortoiseSVN will automatically search upwards for a matching path." -msgstr "为特定工作目录定义的钩子。你只要指定顶级路径；如果在子目录内执行提交，TortoiseSVN 会自动向上搜索匹配路径。" +#: source/TortoiseSVN_en.xml:134(para) +msgid "The Command Line Cross Reference give a correlation between TortoiseSVN commands and their equivalents in the Subversion command line client svn.exe." +msgstr "命令行交叉索引给出了 TortoiseSVN 命令与其对应的 Subversion 命令行工具 svn.exe 命令之间的关系。" -#: source/TortoiseSVN_en.xml:10119(para) -msgid "Next you must specify the command line to execute, starting with the path to the hook script or executable. This could be a batch file, an executable file or any other file which has a valid windows file association, eg. a perl script." -msgstr "然后你要指定要执行的命令行，以钩子脚本或可执行文件的路径开始。它可以是批处理文件，可执行文件，或者有效的windows关联的其它文件类型，例如perl文件。" +#: source/TortoiseSVN_en.xml:144(title) +msgid "TortoiseSVN is free!" +msgstr "TortoiseSVN 是完全免费的！" -#: source/TortoiseSVN_en.xml:10125(para) -msgid "The command line can include several parameters which get filled in by TortoiseSVN. The parameters available depend upon which hook is called. " -msgstr "命令行可以包含被TortoiseSVN填写的几个参数。这些参数依赖于调用了什么脚本。" +#: source/TortoiseSVN_en.xml:145(para) +msgid "TortoiseSVN is free. You don't have to pay to use it, and you can use it any way you want. It is developed under the GNU General Public License (GPL)." +msgstr "TortoiseSVN 是免费的，你不需要为使用它而付费，可以用任何你希望的方式使用它，它开发的许可证是 GNU General Public License (GPL)。" -#: source/TortoiseSVN_en.xml:10133(literal) -#: source/TortoiseSVN_en.xml:10141(literal) -#: source/TortoiseSVN_en.xml:10160(literal) -#: source/TortoiseSVN_en.xml:10168(literal) -#: source/TortoiseSVN_en.xml:10176(literal) -#: source/TortoiseSVN_en.xml:10188(term) -msgid "%PATHS%" -msgstr "%PATHS%" +#: source/TortoiseSVN_en.xml:149(para) +msgid "TortoiseSVN is an Open Source project. That means you have full access to the source code of this program. You can browse it on this link http://tortoisesvn.tigris.org/svn/tortoisesvn/. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under /trunk/ the released versions are located under /tags/." +msgstr "TortoiseSVN 是一个开源项目，那意味着你可以访问程序所有的源代码，你可以在 http://tortoisesvn.tigris.org/svn/tortoisesvn/ 浏览代码(用户名: guest，密码为空)。最新的版本(我们正在为之工作的版本)位于/trunk/，发布的版本位于/tags/。" -#: source/TortoiseSVN_en.xml:10142(literal) -#: source/TortoiseSVN_en.xml:10150(literal) -#: source/TortoiseSVN_en.xml:10200(term) -msgid "%SELECTEDPATHS%" -msgstr "%SELECTEDPATHS%" +#: source/TortoiseSVN_en.xml:168(title) +msgid "Community" +msgstr "社区" -#: source/TortoiseSVN_en.xml:10151(literal) -#: source/TortoiseSVN_en.xml:10177(literal) -#: source/TortoiseSVN_en.xml:10210(term) -msgid "%REVISION%" -msgstr "%REVISION%" +#: source/TortoiseSVN_en.xml:169(para) +msgid "Both TortoiseSVN and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." +msgstr "TortoiseSVN 和 Subversion 由工作在这些项目的社区成员开发。他们来自全世界不同的国家，联合起来创造美妙的程序。" -#: source/TortoiseSVN_en.xml:10152(literal) -#: source/TortoiseSVN_en.xml:10178(literal) -#: source/TortoiseSVN_en.xml:10218(term) -msgid "%ERROR%" -msgstr "%ERROR%" +#: source/TortoiseSVN_en.xml:180(title) +msgid "Acknowledgments" +msgstr "致谢" -#: source/TortoiseSVN_en.xml:10184(para) -msgid "The meaning of each of these variables is described here: " -msgstr "每个变量的含义如下: " +#: source/TortoiseSVN_en.xml:183(term) +msgid "Tim Kemp" +msgstr "Tim Kemp" -#: source/TortoiseSVN_en.xml:1019(para) -msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." -msgstr "一个工作副本也包括一些由 Subversion 创建并维护的额外文件，用来协助执行这些命令。通常情况下，你的工作副本每一个文件夹有一个以 .svn 为名的文件夹，也被叫做工作副本管理目录，这个目录里的文件能够帮助 Subversion 识别哪一个文件做过修改，哪一个文件相对于别人的工作已经过期了。" +#: source/TortoiseSVN_en.xml:185(para) +msgid "for founding the TortoiseSVN project" +msgstr "TortoiseSVN 项目的发起者" -#: source/TortoiseSVN_en.xml:10190(para) -msgid "The paths which were selected when the operation was started, eg. the paths selected in Explorer when invoking the Commit dialog. If multiple paths were selected they are separated by a * character." -msgstr "当操作开始时选择的路径。例如当启动提交对话框是在资源管理器中选择的路径。如果选择了多个路径，它们用*自负隔开。" +#: source/TortoiseSVN_en.xml:191(term) +msgid "Stefan Küng" +msgstr "Stefan Küng" -#: source/TortoiseSVN_en.xml:102(para) -msgid "Even most Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." -msgstr "在服务器安装一章里介绍了如何安装一个版本控制服务器。虽然大部分的 Subversion 用户从来不需要自己安装服务器，但是对系统管理员来说这一章非常有用。" +#: source/TortoiseSVN_en.xml:193(para) +msgid "for the hard work to get TortoiseSVN to what it is now" +msgstr "TortoiseSVN 的主要开发者" -#: source/TortoiseSVN_en.xml:10202(para) -msgid "The paths which were selected within the Commit dialog. If multiple paths were selected they are separated by a * character." -msgstr "我们在提交对话框内选择的路径。如果选择了多个路径，那么它们用*字符分割。" +#: source/TortoiseSVN_en.xml:199(term) +msgid "Lübbe Onken" +msgstr "Lübbe Onken" -#: source/TortoiseSVN_en.xml:10212(para) -msgid "The repository revision after a commit completes." -msgstr "在提交完成后的版本库的版本" +#: source/TortoiseSVN_en.xml:201(para) +msgid "for the beautiful icons, logo, bughunting and taking care of the documentation" +msgstr "制作了漂亮的图标、Logo，错误跟踪及文档维护" -#: source/TortoiseSVN_en.xml:10220(para) -msgid "Empty if the operation was successful, or the error message if the operation was unsuccessful." -msgstr "如果操作成功，它是空的，否则操作失败时就显示错误信息。" +#: source/TortoiseSVN_en.xml:208(term) +msgid "The Subversion Book" +msgstr "Subversion 手册" -#: source/TortoiseSVN_en.xml:10228(para) -msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." -msgstr "如果你想Subversion 操作直到钩子完成才结束，就选择等待脚本结束。" +#: source/TortoiseSVN_en.xml:210(para) +msgid "for the great introduction to Subversion and its chapter 2 which we copied here" +msgstr "为了对 Subversion 大量介绍，我们复制了其第二章" -#: source/TortoiseSVN_en.xml:10232(para) -msgid "Normally you will want to hide ugly DOS boxes when the script runs, so Hide the script while running is checked by default. For debugging, you may want to watch what happens in the DOS window." -msgstr "通常脚本运行时，你会想隐藏丑陋的控制台窗口，所以默认选择运行时隐藏脚本。为了调试，你可能想观察控制台窗口的输出。" +#: source/TortoiseSVN_en.xml:217(term) +msgid "The Tigris Style project" +msgstr "Tigris 的样式项目" -#: source/TortoiseSVN_en.xml:10240(title) -msgid "Final Step" -msgstr "最后步骤" +#: source/TortoiseSVN_en.xml:219(para) +msgid "for some of the styles which are reused in this documentation" +msgstr "我们在本文重用了一些样式" -#: source/TortoiseSVN_en.xml:10246(title) -msgid "Wishlist" -msgstr "愿望表" +#: source/TortoiseSVN_en.xml:225(term) +msgid "Our Contributors" +msgstr "我们的贡献者" -#: source/TortoiseSVN_en.xml:10247(para) -msgid "Even though TortoiseSVN and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers." -msgstr "尽管TSVN和TortoiseMerge是免费的，你也可以通过提交补丁和在项目开发中扮演一些积极角色，来支持我们的开发人员。你同样也可以给点鼓励，它们会让每天在计算机前没日没夜拼命工作的我们感到非常的振奋。" +#: source/TortoiseSVN_en.xml:227(para) +msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list." +msgstr "为了那些补丁，问题报告和新创意，以及在邮件列表里通过回答问题帮助别人。" -#: source/TortoiseSVN_en.xml:10253(para) -msgid "While working on TortoiseSVN we love to listen to music. And since we spend many hours on the project we need a lot of music. Therefore we have set up some wish-lists with our favourite music CD's and DVD's: http://tortoisesvn.tigris.org/donate.html Please also have a look at the list of people who contributed to the project by sending in patches or translations." -msgstr "我们很爱在做TSVN开发工作时听听音乐。也因为花了不少时候忙这个项目，我们就需要 非常多 的音乐。因此我们写了一些愿望表，把我们喜欢的音乐CD和DVD列在 http://tortoisesvn.tigris.org/donate.html。同时也请关注一下那些为项目提交补丁和翻译的贡献者们的愿望: )" +#: source/TortoiseSVN_en.xml:234(term) +msgid "Our Donators" +msgstr "我们的捐赠者" -#: source/TortoiseSVN_en.xml:10267(title) -msgid "The SubWCRev Program" -msgstr "SubWCRev 程序" +#: source/TortoiseSVN_en.xml:236(para) +msgid "for many hours of joy with the music they sent us" +msgstr "他们发送给我们的那些音乐带来了快乐" -#: source/TortoiseSVN_en.xml:10269(primary) -msgid "version extraction" -msgstr "版本抽取" +#: source/TortoiseSVN_en.xml:247(title) +msgid "Terminology used in this document" +msgstr "本文使用的术语" -#: source/TortoiseSVN_en.xml:10272(para) -msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." -msgstr "SubWCRev是Windows的命令行工具，可以阅读Subversion工作副本的状态，可以在模版中随意执行关键字替换。这通常是构建过程的一部分，将工作副本信息结合到创建的对象当中。通常情况下，可能是用来将修订版本号存入关于窗口。" +#: source/TortoiseSVN_en.xml:248(para) +msgid "To make reading the docs easier, the names of all the screens and Menus from TortoiseSVN are marked up in a different font. The Log Dialog for instance." +msgstr "为了使文档更加易读，所有 TortoiseSVN 的窗口名和菜单名使用不同的字体，例如日志对话框。" -#: source/TortoiseSVN_en.xml:10286(title) -msgid "The SubWCRev Command Line" -msgstr "SubWCRev 命令行" +#: source/TortoiseSVN_en.xml:253(para) +msgid "A menu choice is indicated with an arrow. TortoiseSVNShow Log means: select Show Log from the TortoiseSVN context menu." +msgstr "菜单选择使用箭头显示。TortoiseSVN显示日志的含义是: 从TortoiseSVN右键菜单选择显示日志。" -#: source/TortoiseSVN_en.xml:10287(para) -msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." -msgstr "SubWCRev阅读工作副本中所有文件的状态，缺省会忽略外部引用。它记录找到的最高修订版本号，以及那个修订版本的提交时间戳，它也会记录在本地工作副本是否有修改，或混合的修订版本。修订版本号码，更新修订版本范围和修改状态会显示在标准输出。" +#: source/TortoiseSVN_en.xml:262(para) +msgid "Where a local context menu appears within one of the TortoiseSVN dialogs, it is shown like this: Context MenuSave As ..." +msgstr "在 TortoiseSVN 对话框中出现的右键菜单，可能是这个样子: 右键菜单另存为 ..." -#: source/TortoiseSVN_en.xml:10295(para) -msgid "" -"SubWCRev.exe is called from the command line or a script, and is controlled using the command line parameters. \n" -"SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n" -"" -msgstr "" -"SubWCRev.exe从命令行或脚本中运行，使用命令行参数控制。\n" -"SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n" -"" +#: source/TortoiseSVN_en.xml:270(para) +msgid "User Interface Buttons are indicated like this: Press OK to continue." +msgstr "用户界面按钮的显示形式: 点击OK以继续。" -#: source/TortoiseSVN_en.xml:1030(para) -msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." -msgstr "一个典型的 Subversion 的版本库经常包含许多项目的文件(或者说源代码)，通常每一个项目都是版本库的子目录，在这种安排下，一个用户的工作副本往往对应版本库的的一个子目录。" +#: source/TortoiseSVN_en.xml:274(para) +msgid "User Actions are indicated using a bold font. ALT+A: press the ALT-Key on your keyboard and while holding it down press the A-Key as well. Right-drag: press the right mouse button and while holding it down drag the items to the new location." +msgstr "用户动作使用粗体显示。ALT+A: 按下键盘的ALT键，同时按下A键，右键拖拽: 点击鼠标邮件并保持，将项目拖放到新位置。" -#: source/TortoiseSVN_en.xml:10302(para) -msgid "WorkingCopyPath is the path to the working copy being checked. You can only use SubWCRev on working copies, not directly on the repository. The path may be absolute or relative to the current working directory." -msgstr "WorkingCopyPath是要检查的工作副本路径，你可以只对工作副本使用SubWCRev，而不是直接对版本库，这个路径可以是绝对路径，也可以是工作目录的相对路径。" +#: source/TortoiseSVN_en.xml:282(para) +msgid "System output and keyboard input is indicated with a different font as well." +msgstr "系统输出和键盘输入也使用不同的字体显示。" -#: source/TortoiseSVN_en.xml:10308(para) -msgid "If you want SubWCRev to perform keyword substitution, so that fields like repository revision and URL are saved to a text file, you need to supply a template file SrcVersionFile and an output file DstVersionFile which contains the substituted version of the template." -msgstr "如果你想让SubWCRev执行关键字替换，象版本库版本，地址等字段保存到文本文件，就需要提供一个模版文件SrcVersionFile，输出文件DstVersionFile就是模版替换之后的版本。" +#: source/TortoiseSVN_en.xml:287(para) +msgid "Important notes are marked with an icon." +msgstr "使用图标标记的重要提示。" -#: source/TortoiseSVN_en.xml:10317(para) -msgid "There are a number of optional switches which affect the way SubWCRev works. If you use more than one, they must be specified as a single group, eg. -nm, not -n -m. " -msgstr "有几个开关影响 SubWCRev工作。如果使用多个，必须用单个组指定，例如要用-nm，不能用-n -m。" +#: source/TortoiseSVN_en.xml:292(para) +msgid "Tips that make your life easier." +msgstr "技巧让你的生活更加简单。" -#: source/TortoiseSVN_en.xml:10324(title) -#: source/TortoiseSVN_en.xml:10393(title) -msgid "List of available command line switches" -msgstr "列出可用的命令行开关" +#: source/TortoiseSVN_en.xml:297(para) +msgid "Places where you have to be careful what you are doing." +msgstr "操作时需要小心的地方。" -#: source/TortoiseSVN_en.xml:10330(entry) -#: source/TortoiseSVN_en.xml:12009(title) -#: source/TortoiseSVN_en.xml:12497(glossterm) -msgid "Switch" -msgstr "切换" +#: source/TortoiseSVN_en.xml:302(para) +msgid "Where extreme care has to be taken, data corruption or other nasty things may occur if these warnings are ignored." +msgstr "需要特别关注的地方，如果忽略这些警告，会导致数据损坏或其他令人讨厌的事情。" -#: source/TortoiseSVN_en.xml:10331(entry) -#: source/TortoiseSVN_en.xml:10400(entry) -#: source/TortoiseSVN_en.xml:11331(entry) -msgid "Description" -msgstr "描述" +#: source/TortoiseSVN_en.xml:311(title) source/TortoiseSVN_en.xml:1469(title) +#: source/TortoiseSVN_en.xml:2560(title) +msgid "Introduction" +msgstr "简介" -#: source/TortoiseSVN_en.xml:10336(entry) -msgid "-n" -msgstr "-n" +#: source/TortoiseSVN_en.xml:314(primary) +msgid "version control" +msgstr "版本控制" -#: source/TortoiseSVN_en.xml:10337(entry) -msgid "If this switch is given, SubWCRev will exit with ERRORLEVEL 7 if the working copy contains local modifications. This may be used to prevent building with uncommitted changes present." -msgstr "如果给出这个开关，当工作副本包含本地修改时，SubWCRev 就会以ERRORLEVEL 7退出。它可以用来在有未提交的修改时阻止构建。" +#: source/TortoiseSVN_en.xml:317(para) +msgid "Version control is the art of managing changes to information. It has long been a critical tool for programmers, who typically spend their time making small changes to software and then undoing or checking some of those changes the next day. Imagine a team of such developers working concurrently - and perhaps even simultaneously on the very same files! - and you can see why a good system is needed to manage the potential chaos." +msgstr "版本控制是管理信息修改的艺术，它一直是程序员最重要的工具，程序员经常会花时间作出小的修改，然后又在某一天取消了这些修改，想象一下一个开发者并行工作的团队 - 或许是同时工作在同一个文件！- 你就会明白为什么一个好的系统需要管理潜在的混乱。" -#: source/TortoiseSVN_en.xml:10345(entry) -msgid "-m" -msgstr "-m" +#: source/TortoiseSVN_en.xml:331(title) +msgid "What is TortoiseSVN?" +msgstr "什么是 TortoiseSVN？" -#: source/TortoiseSVN_en.xml:10346(entry) -msgid "If this switch is given, SubWCRev will exit with ERRORLEVEL 8 if the working copy contains mixed revisions. This may be used to prevent building with a partially updated working copy." -msgstr "如果给出这个开关，当工作副本包含混合版本时，SubWCRev 就会以ERRORLEVEL 8退出。它可以用来在部分更新本地目录时阻止构建。" +#: source/TortoiseSVN_en.xml:332(para) +msgid "TortoiseSVN is a free open-source client for the Subversion version control system. That is, TortoiseSVN manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." +msgstr "TortoiseSVN 是 Subversion 版本控制系统的一个免费开源客户端，可以超越时间的管理文件和目录。文件保存在中央版本库，除了能记住文件和目录的每次修改以外，版本库非常像普通的文件服务器。你可以将文件恢复到过去的版本，并且可以通过检查历史知道数据做了哪些修改，谁做的修改。这就是为什么许多人将 Subversion 和版本控制系统看作一种时间机器。" -#: source/TortoiseSVN_en.xml:10354(entry) -msgid "-d" -msgstr "-d" +#: source/TortoiseSVN_en.xml:344(para) +msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." +msgstr "某些版本控制系统也是软件配置管理(SCM)系统，这种系统经过精巧的设计，专门用来管理源代码树，并且具备许多与软件开发有关的特性 - 比如，对编程语言的支持，或者提供程序构建工具。不过 Subversion 并不是这样的系统；它是一个通用系统，可以管理任何类型的文件集，包括源代码。" -#: source/TortoiseSVN_en.xml:10355(entry) -msgid "If this switch is given, SubWCRev will exit with ERRORLEVEL 9 if the destination file already exists." -msgstr "如果给出这个开关，当目的文件存在时时，SubWCRev 就会以ERRORLEVEL 9退出。" +#: source/TortoiseSVN_en.xml:360(title) +msgid "TortoiseSVN's History" +msgstr "TortoiseSVN 的历史" -#: source/TortoiseSVN_en.xml:10362(entry) -msgid "-f" -msgstr "-f" +#: source/TortoiseSVN_en.xml:361(para) +msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." +msgstr "在2002年，Tim Kemp 发现 Subversion 是一个很好的版本控制系统，但是没有好的图形化客户端，创建一个作为 Windows 外壳集成的 Subversion 客户端的创意来自 TortoiseCVS，一个非常类似的 CVS 客户端。" -#: source/TortoiseSVN_en.xml:10363(entry) -msgid "If this switch is given, SubWCRev will include the last-changed revision of folders. The default behaviour is to use only files when getting the revision numbers." -msgstr "如果给出这个开关，SubWCRev 就会包含文件夹的最后修改版本。默认行为是取得版本号时只考虑文件。" +#: source/TortoiseSVN_en.xml:367(para) +msgid "Tim studied the sourcecode of TortoiseCVS and used it as a base for TortoiseSVN. He then started the project, registered the domain tortoisesvn.org and put the sourcecode online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseSVN. Since TortoiseSVN was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." +msgstr "Tim 学习了 TortoiseCVS 的源代码，将其作为 TortoiseSVN 的基础，然后开始这个项目，注册了域名 tortoisesvn.org，并将源代码提交到网上。此时 Stefan Küng 正在寻找一个好的免费版本控制系统，他发现了 Subversion 和 TortoiseSVN，TortoiseSVN 依然还不能够使用，他加入了这个项目并开始编程。很快他便编写了大多数现在的代码，并开始添加命令和特性，此时，最初的代码都已经不复存在了。" -#: source/TortoiseSVN_en.xml:1037(para) -msgid "For example, suppose you have a repository that contains two software projects." -msgstr "举一个例子，你的版本库包含两个软件项目。" +#: source/TortoiseSVN_en.xml:378(para) +msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseSVN as their Subversion client. The userbase grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseSVN. And he takes care of the website and manages the translation." +msgstr "随着 Subversion 越来越稳定，吸引了越来越多的用户开始使用 TortoiseSVN 作为他们的 Subversion 客户端，用户基础增长迅速(每天都持续增长)。Lübbe Onken 提供了许多漂亮图标和 TortoiseSVN 的 logo，细心照料网站并且管理翻译。" -#: source/TortoiseSVN_en.xml:10371(entry) -msgid "-e" -msgstr "-e" +#: source/TortoiseSVN_en.xml:391(title) +msgid "TortoiseSVN's Features" +msgstr "TortoiseSVN 的特性" -#: source/TortoiseSVN_en.xml:10372(entry) -msgid "If this switch is given, SubWCRev will examine directories which are included with svn:externals, but only if they are from the same repository. The default behaviour is to ignore externals." -msgstr "如果给出这个开关，SubWCRev 就会检查包含svn:externals的目录，但是只限于在同一版本库。默认行为是忽略外部引用。" +#: source/TortoiseSVN_en.xml:392(para) +msgid "What makes TortoiseSVN such a good Subversion client? Here's a short list of features." +msgstr "是什么让 TortoiseSVN 成为一个好的 Subversion 客户端？下面是一个简短的特性列表。" -#: source/TortoiseSVN_en.xml:10388(title) -msgid "Keyword Substitution" -msgstr "关键字替换" +#: source/TortoiseSVN_en.xml:398(term) +msgid "Shell integration" +msgstr "外壳集成" -#: source/TortoiseSVN_en.xml:10389(para) -msgid "If a source and destination files are supplied, SubWCRev copies source to destination, performing keyword substitution as follows: " -msgstr "如果提供了源文件和目的文件，SubWCRev 会复制源文件到目标文件，执行如下所属的关键字替换: " +#: source/TortoiseSVN_en.xml:401(primary) +msgid "Windows shell" +msgstr "Windows 外壳" -#: source/TortoiseSVN_en.xml:10399(entry) -msgid "Keyword" -msgstr "关键字" +#: source/TortoiseSVN_en.xml:404(primary) +msgid "explorer" +msgstr "资源管理器" -#: source/TortoiseSVN_en.xml:10405(entry) -msgid "$WCREV$" -msgstr "$WCREV$" +#: source/TortoiseSVN_en.xml:406(para) +msgid "TortoiseSVN integrates seamlessly into the Windows shell (i.e. the explorer). This means you can keep working with the tools you're already familiar with. And you do not have to change into a different application each time you need functions of the version control!" +msgstr "TortoiseSVN 与Windows 外壳(例如资源管理器)无缝集成，你可以保持在熟悉的工具上工作，不需要在每次使用版本控制功能时切换应用程序。" -#: source/TortoiseSVN_en.xml:10406(entry) -msgid "Replaced with the highest commit revision in the working copy." -msgstr "用工作副本中最高的提交版本来替换" +#: source/TortoiseSVN_en.xml:413(para) +msgid "And you are not even forced to use the Windows Explorer. TortoiseSVN's context menus work in many other file managers, and in the File/Open dialog which is common to most standard Windows applications. You should, however, bear in mind that TortoiseSVN is intentionally developed as extension for the Windows Explorer. Thus it is possible that in other applications the integration is not as complete and e.g. the icon overlays may not be shown." +msgstr "并且你不一定必须使用 Windows 资源管理器，TortoiseSVN 的右键菜单可以工作在其他文件管理器，以及文件/打开对话框等标准的 Windows 应用程序中。你必须牢记，TortoiseSVN 是有意作为 Windows 资源管理器的扩展开发，因此在其他程序可能集成的并不完整，例如覆盖图标可能不会显示。" -#: source/TortoiseSVN_en.xml:10412(entry) -msgid "$WCDATE$" -msgstr "$WCDATE$" +#: source/TortoiseSVN_en.xml:427(term) +msgid "Icon overlays" +msgstr "覆盖图标" -#: source/TortoiseSVN_en.xml:10413(entry) -msgid "Replaced with the commit date/time of the highest commit revision. To avoid confusion, international format is used, ie. " -msgstr "用最高提交的版本的日期/时间替换。为了避免混淆，使用国际化格式，例如 " +#: source/TortoiseSVN_en.xml:429(para) +msgid "The status of every versioned file and folder is indicated by small overlay icons. That way you can see right away what the status of your working copy is." +msgstr "每个版本控制的文件和目录的状态使用小的覆盖图标表示，可以让你立刻看出工作副本的状态。" -#: source/TortoiseSVN_en.xml:10417(literal) -msgid "yyyy-mm-dd hh:mm:ss" -msgstr "yyyy-mm-dd hh:mm:ss" +#: source/TortoiseSVN_en.xml:437(term) +msgid "Easy access to Subversion commands" +msgstr "Subversion 命令的简便访问" -#: source/TortoiseSVN_en.xml:1042(title) -msgid "The Repository's Filesystem" -msgstr "版本库的文件系统" - -#: source/TortoiseSVN_en.xml:10421(entry) -msgid "$WCNOW$" -msgstr "$WCNOW$" +#: source/TortoiseSVN_en.xml:439(para) +msgid "All Subversion commands are available from the explorer context menu. TortoiseSVN adds its own submenu there." +msgstr "所有的 Subversion 命令存在于资源管理器的右键菜单，TortoiseSVN 在那里添加子菜单。" -#: source/TortoiseSVN_en.xml:10422(entry) -msgid "Replaced with the current system date/time. This can be used to indicate the build time. International format is used as described above." -msgstr "用当前的系统日期/时间替换。它用来指出构建时间。同样为了避免混淆，使用国际化格式。" +#: source/TortoiseSVN_en.xml:446(para) +msgid "Since TortoiseSVN is a Subversion client, we would also like to show you some of the features of Subversion itself:" +msgstr "因为 TortoiseSVN 是一个 Subversion 客户端，我们也很愿意为你展示一些 Subversion 本身的特性: " -#: source/TortoiseSVN_en.xml:10429(entry) -msgid "$WCRANGE$" -msgstr "$WCRANGE$" +#: source/TortoiseSVN_en.xml:452(term) +msgid "Directory versioning" +msgstr "目录版本控制" -#: source/TortoiseSVN_en.xml:10430(entry) -msgid "Replaced with the update revision range in the working copy. If the working copy is in a consistent state, this will be a single revision. If the working copy contains mixed revisions, either due to being out of date, or due to a deliberate update-to-revision, then the range will be shown in the form 100:200" -msgstr "在工作目录用更新版本范围替换。如果工作目录处于一致的状态，它是一个单一版本。如果工作目录包含混合版本，或者是过时，或者是故意更新到版本，那么这个范围会用象100:200这样的格式来显示。" +#: source/TortoiseSVN_en.xml:454(para) +msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." +msgstr "CVS 只能追踪单个文件的历史，但是 Subversion 实现了一个虚拟文件系统，可以追踪整个目录树的修改，文件和目录都是版本控制的，结果就是可以在客户端对文件和目录执行移动和复制命令。" -#: source/TortoiseSVN_en.xml:10441(entry) -msgid "$WCMIXED?TText:FText$" -msgstr "$WCMIXED?TText:FText$" +#: source/TortoiseSVN_en.xml:467(term) +msgid "Atomic commits" +msgstr "原子提交" -#: source/TortoiseSVN_en.xml:10442(entry) -msgid "Replaced with TText if there are mixed update revisions, or FText if not." -msgstr "当有混合版本时用TText 替换，否则用FText替换。" +#: source/TortoiseSVN_en.xml:469(para) +msgid "A commit either goes into the repository completely, or not at all. This allows developers to construct and commit changes as logical chunks." +msgstr "提交要么完全进入版本库，要么一点都没有，这允许开发者以一个逻辑块提交修改。" -#: source/TortoiseSVN_en.xml:10448(entry) -msgid "$WCMODS?TText:FText$" -msgstr "$WCMODS?TText:FText$" +#: source/TortoiseSVN_en.xml:477(term) +msgid "Versioned metadata" +msgstr "版本控制的元数据" -#: source/TortoiseSVN_en.xml:10449(entry) -msgid "Replaced with TText if there are local modifications, or FText if not." -msgstr "若本地存在修改，就用正确提示文本 TText 替换，否则用失败提示文本 FText 替换。" +#: source/TortoiseSVN_en.xml:479(para) +msgid "Each file and directory has an invisible set of properties attached. You can invent and store any arbitrary key/value pairs you wish. Properties are versioned over time, just like file contents." +msgstr "每个文件和目录都有一组附加的属性，你可以发明和保存任意的键/值对，属性是版本控制的，就像文件内容。" -#: source/TortoiseSVN_en.xml:1045(para) -msgid "In other words, the repository's root directory has two subdirectories: paint and calc." -msgstr "换句话说，版本库的根目录包含两个子目录: paint 和 calc。" +#: source/TortoiseSVN_en.xml:489(term) +msgid "Choice of network layers" +msgstr "可选的网络层" -#: source/TortoiseSVN_en.xml:10455(entry) -msgid "$WCURL$" -msgstr "$WCURL$" +#: source/TortoiseSVN_en.xml:491(para) +msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." +msgstr "Subversion 在版本库访问方面有一个抽象概念，利于人们去实现新的网络机制，Subversion 的高级服务器是 Apache 网络服务器的一个模块，使用 HTTP 的变种协议 WebDAV/DeltaV 通讯，这给了 Subversion 在稳定性和交互性方面很大的好处，可以直接使用服务器的特性，例如认证、授权、传输压缩和版本库浏览等等。也有一个轻型的，单独运行的 Subversion 服务器，这个服务器使用自己的协议，可以轻松的用 SSH 封装。" -#: source/TortoiseSVN_en.xml:10456(entry) -msgid "Replaced with the repository URL of the working copy path passed to SubWCRev." -msgstr "用传递给SubWCRev的工作目录的版本库地址替换。" +#: source/TortoiseSVN_en.xml:508(term) +msgid "Consistent data handling" +msgstr "一致的数据处理" -#: source/TortoiseSVN_en.xml:10470(title) -msgid "Keyword Example" -msgstr "关键字例子" +#: source/TortoiseSVN_en.xml:510(para) +msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." +msgstr "Subversion 使用二进制文件差异算法展现文件的区别，对于文本(人类可读)和二进制(人类不可读)文件具备一致的操作方式，两种类型的文件都压缩存放在版本库中，差异在网络上双向传递。" -#: source/TortoiseSVN_en.xml:10471(para) -msgid "The example below shows how keywords in a template file are substituted in the output file." -msgstr "下面的例子显示了模版文件中的关键字是如何在输出文件中被替换的。" +#: source/TortoiseSVN_en.xml:521(term) +msgid "Efficient branching and tagging" +msgstr "高效的分支和标签" -#: source/TortoiseSVN_en.xml:10475(screen) -#, no-wrap -msgid "" -"\n" -"// Test file for SubWCRev\n" -"\n" -"char *Revision = \"$WCREV$\";\n" -"char *Modified = \"$WCMODS?Modified:Not modified$\";\n" -"char *Date = \"$WCDATE$\";\n" -"char *RevRange = \"$WCRANGE$\";\n" -"char *Mixed = \"$WCMIXED?Mixed revision WC:Not mixed$\";\n" -"char *URL = \"$WCURL$\";\n" -"\n" -"#if $WCMODS?1:0$\n" -"#error Source is modified\n" -"#endif\n" -"\n" -"// EndOfFile\n" -msgstr "" -"\n" -"// Test file for SubWCRev\n" -"\n" -"char *Revision = \"$WCREV$\";\n" -"char *Modified = \"$WCMODS?Modified:Not modified$\";\n" -"char *Date = \"$WCDATE$\";\n" -"char *RevRange = \"$WCRANGE$\";\n" -"char *Mixed = \"$WCMIXED?Mixed revision WC:Not mixed$\";\n" -"char *URL = \"$WCURL$\";\n" -"\n" -"#if $WCMODS?1:0$\n" -"#error Source is modified\n" -"#endif\n" -"\n" -"// EndOfFile\n" +#: source/TortoiseSVN_en.xml:523(para) +msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." +msgstr "分支与标签的代价不与工程的大小成比例，Subversion 建立分支与标签时只是复制项目，使用了一种类似于硬链接的机制，因而这类操作通常只会花费很少并且相对固定的时间，以及很小的版本库空间。" -#: source/TortoiseSVN_en.xml:10491(para) -msgid "After running SubWCRev.exe, the output file looks like this:" -msgstr "SubWCRev.exe运行完之后，输出文件类似: " +#: source/TortoiseSVN_en.xml:534(term) +msgid "Hackability" +msgstr "良好的维护能力" -#: source/TortoiseSVN_en.xml:10494(screen) -#, no-wrap -msgid "" -"\n" -"// Test file for SubWCRev\n" -"\n" -"char *Revision = \"3701\";\n" -"char *Modified = \"Modified\";\n" -"char *Date = \"2005/06/15 11:15:12\";\n" -"char *RevRange = \"3699:3701\";\n" -"char *Mixed = \"Mixed revision WC\";\n" -"char *URL = \"http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/src/SubWCRev\";\n" -"\n" -"#if 1\n" -"#error Source is modified\n" -"#endif\n" -"\n" -"// EndOfFile\n" -msgstr "" -"\n" -"// Test file for SubWCRev\n" -"\n" -"char *Revision = \"3701\";\n" -"char *Modified = \"Modified\";\n" -"char *Date = \"2005/06/15 11:15:12\";\n" -"char *RevRange = \"3699:3701\";\n" -"char *Mixed = \"Mixed revision WC\";\n" -"char *URL = \"http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/src/SubWCRev\";\n" -"\n" -"#if 1\n" -"#error Source is modified\n" -"#endif\n" -"\n" -"// EndOfFile\n" +#: source/TortoiseSVN_en.xml:536(para) +msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." +msgstr "Subversion 没有历史负担，它由一系列良好的共享 C 库实现，具有定义良好的 API，这使 Subversion 非常容易维护，可以轻易的被其他语言和程序使用。" -#: source/TortoiseSVN_en.xml:1050(para) -msgid "To get a working copy, you must check out some subtree of the repository. (The term \"check out\" may sound like it has something to do with locking or reserving resources, but it doesn't; it simply creates a private copy of the project for you)." -msgstr "为了得到一个工作副本，你必须检出版本库的一个子树，(术语“检出”听起来像是锁定或者保留资源，实际上不是，它只是简单的得到一个项目的私有副本)。" +#: source/TortoiseSVN_en.xml:550(title) +msgid "Installing TortoiseSVN" +msgstr "安装 TortoiseSVN" -#: source/TortoiseSVN_en.xml:10517(title) -msgid "Frequently Asked Questions (FAQ)" -msgstr "常见问题(FAQ)" +#: source/TortoiseSVN_en.xml:552(title) +msgid "System requirements" +msgstr "系统要求" -#: source/TortoiseSVN_en.xml:10519(para) -msgid "Because TortoiseSVN is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an interactive online FAQ which contains a selection of the questions we are asked the most on the TortoiseSVN mailing lists dev@tortoisesvn.tigris.org and users@tortoisesvn.tigris.org." -msgstr "因为TortoiseSVN一直处于开发状态，所以有时很难保持文档完全是最新的。我们在维护了一份交互式的在线FAQ。那里面包括了TortoiseSVN邮件列表dev@tortoisesvn.tigris.org里最常被问到的问题。" +#: source/TortoiseSVN_en.xml:553(para) +msgid "TortoiseSVN runs on Win2k SP2, WinXP or higher. Windows 98, Windows ME and Windows NT4 are no longer supported since TortoiseSVN 1.2.0, but you can still download the older versions if you really need them." +msgstr "TortoiseSVN 可以运行在 Win2k SP2，WinXP 或更高的版本，TortoiseSVN 1.2.0 以后不再支持 Windows 98, Windows ME 和Windows NT4，但是如果需要的话，你仍旧可以下载以前的版本。" -#: source/TortoiseSVN_en.xml:10531(para) -msgid "We also maintain a project Issue Tracker which tells you about some of the things we have on our To-Do list, and bugs which have already been fixed. If you think you have found a bug, or want to request a new feature, check here first to see if someone else got there before you." -msgstr "我们还在维护了一个项目问题跟踪系统。在那里面可以查到哪些功能已经被加到了我们的To Do列表里，哪些错误已经被修正了。如果你认为发现了一个错误，或者需要一个新功能，请先到那里看看是否其他人已经在你之前提出过相同的内容了。" +#: source/TortoiseSVN_en.xml:559(para) +msgid "If you encounter any problems during or after installing TortoiseSVN please refer to first." +msgstr "如果在安装 TortoiseSVN 时发现了任何问题，请首先参考。" -#: source/TortoiseSVN_en.xml:10541(para) -msgid "If you have a question which is not answered anywhere else, the best place to ask it is on the mailing list." -msgstr "如果有一个问题在其他任何地方都找不到答案，提出这个问题的最好方式是通过邮件列表。" +#: source/TortoiseSVN_en.xml:567(title) +msgid "Installation" +msgstr "安装" -#: source/TortoiseSVN_en.xml:10552(title) -msgid "How Do I..." -msgstr "如何实现 …" +#: source/TortoiseSVN_en.xml:569(primary) +msgid "install" +msgstr "安装" -#: source/TortoiseSVN_en.xml:10554(para) -msgid "This appendix contains solutions to problems/questions you might have when using TortoiseSVN." -msgstr "这个附录包括了 TortoiseSVN 使用中可能碰到的一些困难或疑问的解决方法。" +#: source/TortoiseSVN_en.xml:571(para) +msgid "TortoiseSVN comes with an easy to use installer. Doubleclick on the installer file and follow the instructions. The installer will take care of the rest. If you want to install TortoiseSVN for all users then you must have administrator rights on your system. If you don't have those rights, TortoiseSVN will automatically install for the current user only." +msgstr "TortoiseSVN 有一个简单易用的安装程序，双击安装文件，根据指导，安装程序会完成剩下的工作，如果你希望为所有用户安装 TortoiseSVN，你必须有系统的管理员权限，如果你没有那些权限，TortoiseSVN 只会为当前用户安装。" -#: source/TortoiseSVN_en.xml:10560(title) -msgid "Move/copy a lot of files at once" -msgstr "一次移动或复制多个文件" +#: source/TortoiseSVN_en.xml:581(para) +msgid "If you don't have the latest C-runtime and MFC libraries installed, you still must have Administrator privileges to install TortoiseSVN. But once those libraries are installed, you can update or install TortoiseSVN without those privileges." +msgstr "如果你没有安装最新的 C 运行库和 MFC 库，你仍然必须拥有管理员权限才能安装 TortoiseSVN，一旦安装了那些库，你可以在没有特权的情况下更新或安装TortoiseSVN。" -#: source/TortoiseSVN_en.xml:10562(primary) -msgid "moving" -msgstr "移动" +#: source/TortoiseSVN_en.xml:590(title) +msgid "Language Packs" +msgstr "语言包" -#: source/TortoiseSVN_en.xml:10564(para) -msgid "Moving/Copying single files can be done by using TortoiseSVNRename.... But if you want to move/copy a lot of files, this way is just too slow and too much work." -msgstr "移动或复制单个文件可以通过 TortoiseSVN 重命名…实现。但是如果想移动或复制很多文件，这种方法就显得太慢而且工作量太大了。" +#: source/TortoiseSVN_en.xml:592(primary) +msgid "language packs" +msgstr "语言包" -#: source/TortoiseSVN_en.xml:10573(para) -msgid "The recommended way is by right-dragging the files to the new location. Simply right-click on the files you want to move/copy without releasing the mouse button. Then drag the files to the new location and release the mouse button. A context menu will appear where you can either choose Context MenuCopy in Subversion to here. or Context MenuMove in Subversion to here." -msgstr "推荐的方法是: 用鼠标右键拖拽这些文件到新的位置。就是用鼠标右键选中想要移动或复制的文件，不要释放鼠标右键。把选中的文件拖拽到新的位置后释放鼠标右键。在出现的右键菜单里可以选择右键菜单SVN 复制版本控制文件到当前位置或右键菜单SVN 移动版本控制文件到当前位置。" +#: source/TortoiseSVN_en.xml:595(primary) +msgid "translations" +msgstr "翻译" -#: source/TortoiseSVN_en.xml:1058(title) -msgid "Repository URLs" -msgstr "版本库的 URL" +#: source/TortoiseSVN_en.xml:597(para) +msgid "The TortoiseSVN user interface has been translated into many different languages, so you may be able to download a language pack to suit your needs. You can find the language packs on our translation status page. And if there is no language pack available yet, why not join the team and submit your own translation ;-)" +msgstr "TortoiseSVN 的界面已经翻译成了许多种语言，所以你可以下载符合你要求的语言包。你可以在我们的翻译状态页里看到语言包。如果没有你需要的，为什么不加入我们的团队并且提交你的翻译呢？-)" -#: source/TortoiseSVN_en.xml:1059(para) -msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" -msgstr "Subversion 可以通过多种方式访问－本地磁盘访问，或各种各样不同的网络协议，但一个版本库地址永远都是一个 URL，URL 方案反映了访问方法。" +#: source/TortoiseSVN_en.xml:608(para) +msgid "Each language pack is packaged as a .exe installer. Just run the install program and follow the instructions. Next time you restart, the translation will be available." +msgstr "每一种语言包都是一个 .exe 安装程序，只要根据向导运行安装程序，当你下一次启动程序时，翻译就会生效。" -#: source/TortoiseSVN_en.xml:10596(title) -msgid "Force users to enter a log message" -msgstr "强制用户写日志" +#: source/TortoiseSVN_en.xml:615(title) +msgid "Spellchecker" +msgstr "拼写检查器" -#: source/TortoiseSVN_en.xml:10598(primary) -msgid "log message" -msgstr "日志信息" +#: source/TortoiseSVN_en.xml:617(primary) +msgid "spellchecker" +msgstr "拼写检查器" -#: source/TortoiseSVN_en.xml:10600(para) -msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseSVN, the other works for all Subversion clients, but requires access to the server directly." -msgstr "有两种方法可以防止用户在不写日志的情况下进行提交操作。一种方式只对TortoiseSVN有效，另外一种方法对任何Subversion的客户端都有效，但是需要直接访问服务器。" +#: source/TortoiseSVN_en.xml:620(primary) +msgid "dictionary" +msgstr "词典" -#: source/TortoiseSVN_en.xml:10606(title) -msgid "Hook-script on the server" -msgstr "服务器端的钩子脚本(Hook-script)" - -#: source/TortoiseSVN_en.xml:10607(para) -msgid "If you have direct access to the repository server, you can install a pre-commit hook script which rejects all commits with an empty or too short log message." -msgstr "如果能够直接访问服务器，可以安装一个pre-commit钩子脚本，通过这个脚本可以阻止所有空白日志或者日志太简短的提交操作。" +#: source/TortoiseSVN_en.xml:622(para) +msgid "TortoiseSVN includes a spell checker which allows you to check your commit log messages. This is especially useful if the project language is not your native language. The spell checker uses the same dictionary files as OpenOffice and Mozilla." +msgstr "TortoiseSVN 包括了一个拼写检查器，可以检查你的提交日志信息，当你的项目语言不是你的本地语言时尤其有用，拼写检查器使用 OpenOffice 和 Mozilla 相同的词典。" -#: source/TortoiseSVN_en.xml:10612(para) -msgid "In the repository folder on the server, there's a subfolder hooks which contains some example hook scripts you can use. The file pre-commit.tmpl contains a sample script which will reject commits if no log message is supplied, or the message is too short. The file also contains comments on how to install/use this script. Just follow the instructions in that file." -msgstr "在服务器端的版本库目录下有一个hooks子目录，这个子目录下有一些钩子脚本的例子。在 pre-commit.tmpl 这个例子里，示范了当日志是空白或者过于简短的时候如何拒绝提交。这个例子的注释里包括了安装和使用这个脚本的说明，按照那里面的指示做就能够使用了。" +#: source/TortoiseSVN_en.xml:635(para) +msgid "The installer automatically adds the US and UK english dictionaries. If you want other languages, the easiest option is simply to install one of TortoiseSVN's language packs. This will install the appropriate dictionary files as well as the TortoiseSVN local user interface. Next time you restart, the dictionary will be available too." +msgstr "安装程序自动添加 US 和 UK 英语词典，如果你需要其他语言，最简单的选择是安装 TortoiseSVN 的语言包，这会安装合适的词典文件和 TortoiseSVN 的本地用户界面，当你下一次启动程序时，词典也将会生效。" -#: source/TortoiseSVN_en.xml:10622(para) -msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseSVN. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseSVN have the OK button disabled until the log message is long enough then please use the method described below." -msgstr "除了TortoiseSVN，如果还要同时使用其他的Subversion客户端，推荐使用这种方法。缺点是提交是被服务器端拒绝的，因此用户会看到一个错误消息。客户端无法在提交之前就知道会被拒绝。如果希望在日志的内容达到足够长之前，TortoiseSVN 的 OK 按钮处于无效的状态，请使用下面的方法。" +#: source/TortoiseSVN_en.xml:643(para) +msgid "Or you can install the dictionaries yourself. If you have OpenOffice or Mozilla installed, you can copy those dictionaries, which are located in the installation folders for those applications. Otherwise, you need to download the required dictionary files from http://lingucomponent.openoffice.org/spell_dic.html" +msgstr "或者你也可以自己安装词典。如果你安装了 OpenOffice 或 Mozilla，你可以复制这些词典，位于那些应用的安装目录。否则，你需要从 http://lingucomponent.openoffice.org/spell_dic.html 下载必要的词典文件。" -#: source/TortoiseSVN_en.xml:10633(title) -msgid "Project properties" -msgstr "工程(Project)属性" +#: source/TortoiseSVN_en.xml:659(para) +msgid "en_US.aff" +msgstr "en_US.aff" -#: source/TortoiseSVN_en.xml:10634(para) -msgid "TortoiseSVN uses properties to control some of its features. One of those properties is the tsvn:logminsize property." -msgstr "TortoiseSVN 使用属性来控制它的一些特性。这其中有一个 tsvn:logminsize 属性。" +#: source/TortoiseSVN_en.xml:664(para) +msgid "en_US.dic" +msgstr "en_US.dic" -#: source/TortoiseSVN_en.xml:10638(para) -msgid "If you set that property on a folder, then TortoiseSVN will disable the OK button in all commit dialogs until the user has entered a log message with at least the length specified in the property." -msgstr "如果给一个文件夹设置了这个属性，在提交对话框里的日志信息达到属性里定义的长度之前，提交对话框的 OK 按钮会处于无效状态。" +#: source/TortoiseSVN_en.xml:652(para) +msgid "Once you have got the dictionary files, you probably need to rename them so that the filenames only have the locale chars in it. Example: Then just copy them to the bin sub-folder of the TortoiseSVN installation folder. Normally this will be C:\\Program Files\\TortoiseSVN\\bin. If you don't want to litter the bin sub-folder, you can instead place your spell checker files in C:\\Program Files\\TortoiseSVN\\Languages. If that folder isn't there, you have to create it first. The next time you start TortoiseSVN, the spell checker will be available." +msgstr "一旦你得到了词典文件，你可能需要重命名文件，这样文件名只包含位置信息，例如: 然后把它们复制到TortoiseSVN 安装目录的 bin 子目录，通常情况下，可能是在 C:\\Program Files\\TortoiseSVN\\bin。如果你不希望弄乱bin子目录，你可以将拼写检查文件放置在C:\\Program Files\\TortoiseSVN\\Languages，如果那个目录不存在，你可以自己创建，当你下次启动TortoiseSVN 时，就可以使用拼写检查器。" -#: source/TortoiseSVN_en.xml:10643(para) -msgid "For detailed information on those project properties, please refer to " -msgstr "关于工程属性的具体信息，请参照 " +#: source/TortoiseSVN_en.xml:683(para) +msgid "Check the tsvn:projectlanguage setting. Refer to for information about setting project properties." +msgstr "检查 tsvn:projectlanguage 设置，关于设置项目属性可以参考。" -#: source/TortoiseSVN_en.xml:10650(title) -msgid "Update selected files from the repository" -msgstr "从版本库里更新选定的文件到本地" +#: source/TortoiseSVN_en.xml:690(para) +msgid "If no project language is set, or that language is not installed, try the language corresponding to the Windows locale." +msgstr "如果没有设置项目语言，或者那个语言没有安装，尝试使用对应 Windows 区域信息的语言。" -#: source/TortoiseSVN_en.xml:10652(primary) -#: source/TortoiseSVN_en.xml:4291(primary) -msgid "update" -msgstr "更新" +#: source/TortoiseSVN_en.xml:696(para) +msgid "If the exact Windows locale doesn't work, try the Base language, eg. de_CH (Swiss-German) falls back to de_DE (German)." +msgstr "如果精确的 Windows 区域信息不起作用，可以试一下基础语言，例如将 de_CH(Swiss-German) 修改为 de_DE (German)。" -#: source/TortoiseSVN_en.xml:10654(para) -msgid "Normally you update your working copy using TortoiseSVNUpdate. But if you only want to pick up some new files that a colleague has added without merging in any changes to other files at the same time, you need a different approach." -msgstr "通常，我们可以使用TortoiseSVN更新把工作副本更新到最新版。但是，如果只想更新某位同事添加的文件，而保留工作副本里其他文件的状态，就必须使用其它的方法。" +#: source/TortoiseSVN_en.xml:704(para) +msgid "If none of the above works, then the default language is english, which is included with the standard installation." +msgstr "如果以上都没有效果，则缺省语言是英语，包含在标准安装中。" -#: source/TortoiseSVN_en.xml:10664(para) -msgid "Use TortoiseSVNCheck for Modifications. and click on Check repository to see what has changed in the repository. Select the files you want to update locally, then use the context menu to update just those files." -msgstr "选择TortoiseSVN查看更新，然后点击查看版本库按钮，就能够看到上次更新以后版本库里发生了哪些变化。选中想更新到本地的文件，然后用右键菜单更新这些文件。" +#: source/TortoiseSVN_en.xml:678(para) +msgid "If you install multiple dictionaries, TortoiseSVN uses these rules to select which one to use. " +msgstr "如果你安装了多个词典，TortoiseSVN 使用下面的规则选择一个。" -#: source/TortoiseSVN_en.xml:1067(title) -msgid "Repository Access URLs" -msgstr "版本库访问 URL" +#: source/TortoiseSVN_en.xml:721(title) +msgid "Basic Concepts" +msgstr "基本概念" -#: source/TortoiseSVN_en.xml:10676(title) -msgid "Roll back revisions in the repository" -msgstr "回滚版本库里的版本" +#: source/TortoiseSVN_en.xml:723(primary) +msgid "Subversion book" +msgstr "Subversion 手册" -#: source/TortoiseSVN_en.xml:10678(primary) -msgid "rollback" -msgstr "回滚" +#: source/TortoiseSVN_en.xml:726(para) +msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." +msgstr "本章修改自《使用 Subversion 进行版本管理》的相同章节，它的在线版本位于: http://svnbook.red-bean.com/。" -#: source/TortoiseSVN_en.xml:10681(title) -msgid "Use the revision log dialog" -msgstr "使用版本日志对话框" +#: source/TortoiseSVN_en.xml:734(para) +msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." +msgstr "这一章是对 Subversion 一个简短随意的介绍，如果你对版本控制很陌生，这一章节完全是为你准备的，我们从讨论基本概念开始，深入理解 Subversion 的思想，然后展示许多简单的实例。" -#: source/TortoiseSVN_en.xml:10682(para) -msgid "The easiest way to revert the changes from a single revision, or from a range of revisions, is to use the revision log dialog. This is also the method to use of you want to discard recent changes and make an earlier revision the new HEAD." -msgstr "如果想恢复某个版本或者版本范围的变更，最简单的方法是使用版本日志对话框。这种方法也可以用来撤销最近的若干次变更，把以前的某个版本变成最新版。" +#: source/TortoiseSVN_en.xml:742(para) +msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." +msgstr "尽管我们的例子展示了人们如何分享程序源代码，仍然要记住 Subversion 可以控制所有类型的文件－它并没有限制只为程序员工作。" -#: source/TortoiseSVN_en.xml:10691(para) -msgid "Select the file or folder in which you need to revert the changes. If you want to revert all changes, this should be the top level folder." -msgstr "选中想要恢复变更的文件或者文件夹。如果想要恢复所有的变更，需要选中最顶层的文件夹。" +#: source/TortoiseSVN_en.xml:750(title) source/TortoiseSVN_en.xml:1256(title) +#: source/TortoiseSVN_en.xml:2892(title) +msgid "The Repository" +msgstr "版本库" -#: source/TortoiseSVN_en.xml:10698(para) -msgid "Select TortoiseSVNShow Log to display a list of revisions. You may need to use Get All or Next 100 to show the revision(s) you are interested in." -msgstr "选择TortoiseSVN显示日志，显示出版本列表。有可能需要使用全部显示或者下100 按钮，把想要恢复的版本显示出来。" +#: source/TortoiseSVN_en.xml:752(primary) +msgid "repository" +msgstr "版本库" -#: source/TortoiseSVN_en.xml:107(para) -msgid "The chapter on The Repository explains how to set up a local repository, which is useful for testing Subversion and TortoiseSVN using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." -msgstr "版本库这一章解释了如何设置一个本地版本库，怎样在一台 PC 上测试 Subversion 和 TortoiseSVN，这一章也介绍了一点版本库管理，也就是如何管理服务器上的版本库。" +#: source/TortoiseSVN_en.xml:754(para) +msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." +msgstr "Subversion 是一种集中的分享信息的系统，它的核心是版本库，储存所有的数据，版本库按照文件树形式储存数据－包括文件和目录，任意数量的客户端可以连接到版本库，读写这些文件。通过写数据，别人可以看到这些信息；通过读数据，可以看到别人的修改。" -#: source/TortoiseSVN_en.xml:10711(para) -msgid "Select the revision you wish to revert. If you want to undo a range of revisions, select the first one and hold the shift key while selecting the last one. Note that for multiple revisions, the range must be unbroken with no gaps. Right click on the selected revision(s), then select Context MenuRevert changes from this revision." -msgstr "选中想要恢复的版本。如果想要恢复一个版本范围，选中想要恢复的第一个版本，按住shift键，然后选中想要恢复的最后一个版本。注意，当恢复多个版本的时候，这些版本必须在列表中是连续的。用鼠标右键点击选中的版本(段)，然后选择右键菜单恢复这些版本的变更。" +#: source/TortoiseSVN_en.xml:766(title) +msgid "A Typical Client/Server System" +msgstr "一个典型的客户/服务器系统" -#: source/TortoiseSVN_en.xml:10726(para) -msgid "Or if you want to make an earlier revision the new HEAD revision, right click on the selected revision(s), then select Context MenuRevert to this revision. This will discard all changes after the selected revision." -msgstr "如果想要把以前的某个版本变成最新版本，右键点击选中的版本(范围)，然后选择右键菜单恢复到此版本。就能够撤销被选中版本后面所有的变更。" +#: source/TortoiseSVN_en.xml:769(para) +msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." +msgstr "所以为什么这很有趣呢？讲了这么多，让人感觉这是一种普通的文件服务器，但实际上，版本库是另一种文件服务器，而不是你常见的那一种。最特别的是 Subversion 会记录每一次的更改，不仅针对文件也包括目录本身，包括增加、删除和重新组织文件和目录。" -#: source/TortoiseSVN_en.xml:1073(entry) -msgid "Schema" -msgstr "方案" +#: source/TortoiseSVN_en.xml:779(para) +msgid "When a client reads data from the repository, it normally sees only the latest version of the filesystem tree. But the client also has the ability to view previous states of the filesystem. For example, a client can ask historical questions like, \"what did this directory contain last Wednesday?\", or \"who was the last person to change this file, and what changes did they make?\" These are the sorts of questions that are at the heart of any version control system: systems that are designed to record and track changes to data over time." +msgstr "当一个客户端从版本库读取数据时，通常只会看到最新的版本，但是客户端也可以去看以前的任何一个版本。举个例子，一个客户端可以问这样的历史问题，上个星期三的目录是怎样的？，或者是谁最后一个修改了这个文件，改动了什么？，这些是任何版本控制系统的核心问题: 系统是设计用来记录和跟踪每次修改的。" -#: source/TortoiseSVN_en.xml:10739(para) source/TortoiseSVN_en.xml:10796(para) -msgid "You have reverted the changes within your working copy. Check the results, then commit the changes." -msgstr "工作副本已经恢复到了变更以前的状态。检查恢复后的结果，然后提交变更。" +#: source/TortoiseSVN_en.xml:794(title) +msgid "Versioning Models" +msgstr "版本模型" -#: source/TortoiseSVN_en.xml:1074(entry) -msgid "Access Method" -msgstr "访问方法" +#: source/TortoiseSVN_en.xml:795(para) +msgid "All version control systems have to solve the same fundamental problem: how will the system allow users to share information, but prevent them from accidentally stepping on each other's feet? It's all too easy for users to accidentally overwrite each other's changes in the repository." +msgstr "所有的版本控制系统都需要解决这样一个基础问题: 怎样让系统允许用户共享信息，而不会让他们因意外而互相干扰？版本库里意外覆盖别人的更改非常的容易。" -#: source/TortoiseSVN_en.xml:10745(title) -msgid "Use the merge dialog" -msgstr "使用合并对话框" +#: source/TortoiseSVN_en.xml:804(title) +msgid "The Problem of File-Sharing" +msgstr "文件共享的问题" -#: source/TortoiseSVN_en.xml:10746(para) -msgid "To undo a larger range of revisions, you can use the Merge dialog. The previous method uses merging behind the scenes; this method uses it explicitly." -msgstr "如果要撤销更大版本范围的变更，可以使用合并对话框。上一个方法在后台使用了合并的机制，在这个方法里我们直接使用合并功能。" +#: source/TortoiseSVN_en.xml:805(para) +msgid "Consider this scenario: suppose we have two co-workers, Harry and Sally. They each decide to edit the same repository file at the same time. If Harry saves his changes to the repository first, then it's possible that (a few moments later) Sally could accidentally overwrite them with her own new version of the file. While Harry's version of the file won't be lost forever (because the system remembers every change), any changes Harry made won't be present in Sally's newer version of the file, because she never saw Harry's changes to begin with. Harry's work is still effectively lost - or at least missing from the latest version of the file - and probably by accident. This is definitely a situation we want to avoid!" +msgstr "考虑这个情景，我们有两个共同工作者，Harry 和 Sally，他们想同时编辑版本库里的同一个文件，如果首先 Harry 保存它的修改，过了一会，Sally 可能凑巧用自己的版本覆盖了这些文件，Harry 的更改不会永远消失(因为系统记录了每次修改)，Harry 所有的修改不会出现在 Sally 的文件中，所以 Harry 的工作还是丢失了—至少是从最新的版本中丢失了—而且是意外的，这就是我们要明确避免的情况！" -#: source/TortoiseSVN_en.xml:10753(para) -msgid "In your working copy select TortoiseSVNMerge." -msgstr "在工作副本上选择TortoiseSVN合并。" +#: source/TortoiseSVN_en.xml:821(title) +msgid "The Problem to Avoid" +msgstr "需要避免的问题" -#: source/TortoiseSVN_en.xml:10762(para) -msgid "In the From: field enter the full folder url of the branch or tag containing the changes you want to revert in your working copy. This should come up as the default URL." -msgstr "在起始: 文本框里输入想要恢复的变更所在的分支或标签的URL。它也将作为默认URL。" +#: source/TortoiseSVN_en.xml:826(title) source/TortoiseSVN_en.xml:842(title) +msgid "The Lock-Modify-Unlock Solution" +msgstr "锁定-修改-解锁 方案" -#: source/TortoiseSVN_en.xml:10770(para) -msgid "In the From Revision field enter the revision number that you are currently at. If you are sure there is no-one else making changes, you can use the HEAD revision." -msgstr "在起始版本文本框里输入当前工作副本的版本号。如果能够保证没有其他人会提交变更，可以使用最新版本。" +#: source/TortoiseSVN_en.xml:827(para) +msgid "Many version control systems use a lock-modify-unlock model to address this problem, which is a very simple solution. In such a system, the repository allows only one person to change a file at a time. First Harry must \"lock\" the file before he can begin making changes to it. Locking a file is a lot like borrowing a book from the library; if Harry has locked a file, then Sally cannot make any changes to it. If she tries to lock the file, the repository will deny the request. All she can do is read the file, and wait for Harry to finish his changes and release his lock. After Harry unlocks the file, his turn is over, and now Sally can take her turn by locking and editing." +msgstr "许多版本控制系统使用锁定-修改-解锁这种机制解决这种问题，在这样的模型里，在一个时间段里版本库的一个文件只允许被一个人修改。首先在修改之前，Harry 要“锁定”住这个文件，锁定很像是从图书馆借一本书，如果 Harry 锁住这个文件，Sally 不能做任何修改，如果 Sally 想请求得到一个锁，版本库会拒绝这个请求。在 Harry 结束编辑并且放开这个锁之前，她只可以阅读文件。Harry 解锁后，就要换班了，Sally 得到自己的轮换位置，锁定并且开始编辑这个文件。" -#: source/TortoiseSVN_en.xml:10778(para) -msgid "make sure the Use \"From:\" URL checkbox is checked." -msgstr "确认使用“起始: ”的 URL检查框处于被选中的状态。" +#: source/TortoiseSVN_en.xml:845(para) +msgid "The problem with the lock-modify-unlock model is that it's a bit restrictive, and often becomes a roadblock for users:" +msgstr "锁定-修改-解锁模型有一点问题就是限制太多，经常会成为用户的障碍: " -#: source/TortoiseSVN_en.xml:10784(para) -msgid "In the To Revision field enter the revision number that you want to revert to, ie. the one before the first revision to be reverted." -msgstr "在结束版本里输入想要恢复到的版本号。比如，想要恢复的最小版本号的前一个版本号。" +#: source/TortoiseSVN_en.xml:852(para) +msgid "Locking may cause administrative problems. Sometimes Harry will lock a file and then forget about it. Meanwhile, because Sally is still waiting to edit the file, her hands are tied. And then Harry goes on vacation. Now Sally has to get an administrator to release Harry's lock. The situation ends up causing a lot of unnecessary delay and wasted time." +msgstr "锁定可能导致管理问题。有时候 Harry 会锁住文件然后忘了此事，这就是说 Sally 一直等待解锁来编辑这些文件，她在这里僵住了。然后 Harry 去旅行了，现在 Sally 只好去找管理员放开锁，这种情况会导致不必要的耽搁和时间浪费。" -#: source/TortoiseSVN_en.xml:10791(para) source/TortoiseSVN_en.xml:7241(para) -#: source/TortoiseSVN_en.xml:7345(para) -msgid "Click OK to complete the merge." -msgstr "点击合并按钮完成合并。" +#: source/TortoiseSVN_en.xml:863(para) +msgid "Locking may cause unnecessary serialization. What if Harry is editing the beginning of a text file, and Sally simply wants to edit the end of the same file? These changes don't overlap at all. They could easily edit the file simultaneously, and no great harm would come, assuming the changes were properly merged together. There's no need for them to take turns in this situation." +msgstr "锁定可能导致不必要的线性化开发。如果 Harry 编辑一个文件的开始，Sally 想编辑同一个文件的结尾，这种修改不会冲突，设想修改可以正确的合并到一起，他们可以轻松的并行工作而没有太多的坏处，没有必要让他们轮流工作。" -#: source/TortoiseSVN_en.xml:1080(literal) -msgid "file://" -msgstr "file://" +#: source/TortoiseSVN_en.xml:875(para) +msgid "Locking may create a false sense of security. Pretend that Harry locks and edits file A, while Sally simultaneously locks and edits file B. But suppose that A and B depend on one another, and the changes made to each are semantically incompatible. Suddenly A and B don't work together anymore. The locking system was powerless to prevent the problem - yet it somehow provided a sense of false security. It's easy for Harry and Sally to imagine that by locking files, each is beginning a safe, insulated task, and thus inhibits them from discussing their incompatible changes early on." +msgstr "锁定可能导致错误的安全状态。假设 Harry 锁定和编辑一个文件 A，同时 Sally 锁定并编辑文件 B，如果 A 和 B 互相依赖，这种变化是必须同时作的，这样 A 和 B 不能正确的工作了，锁定机制对防止此类问题将无能为力—从而产生了一种处于安全状态的假相。很容易想象 Harry 和 Sally 都以为自己锁住了文件，而且从一个安全，孤立的情况开始工作，因而没有尽早发现他们不匹配的修改。" -#: source/TortoiseSVN_en.xml:10802(title) -msgid "Use svndumpfilter" -msgstr "使用 svndumpfilter" +#: source/TortoiseSVN_en.xml:893(title) source/TortoiseSVN_en.xml:921(title) +msgid "The Copy-Modify-Merge Solution" +msgstr "复制-修改-合并 方案" -#: source/TortoiseSVN_en.xml:10803(para) -msgid "Since TortoiseSVN never loses data, your rolled back revisions still exist as intermediate revisions in the repository. Only the HEAD revision was changed to a previous state. If you want to make revisions disappear completely from your repository, erasing all trace that they ever existed, you have to use more extreme measures. Unless there is a really good reason to do this, it is not recommended. One possible reason would be that someone committed a confidential document to a public repository." -msgstr "因为TortoiseSVN绝不会丢弃数据，所以那些被回滚的版本仍然以中间版本的形式被保留在版本库里。只是最新版本已经回到了以前的状态。如果想让版本库里的某些版本彻底消失，擦去这些版本曾经存在过的所有痕迹，就必须采取更极端的手段。不推荐使用这种方法，除非有很好的理由。比如某人向一个公开的版本库里提交了一份机密文件。" +#: source/TortoiseSVN_en.xml:894(para) +msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." +msgstr "Subversion，CVS 和一些版本控制系统使用复制-修改-合并模型，在这种模型里，每一个客户读取项目版本库建立一个私有工作副本—版本库中文件和目录的本地映射。用户并行工作，修改各自的工作副本，最终，各个私有的复制合并在一起，成为最终的版本，这种系统通常可以辅助合并操作，但是最终要靠人工去确定正误。" -#: source/TortoiseSVN_en.xml:10814(para) -msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." -msgstr "从版本库里删除数据的唯一方法就是使用svnadmin这个Subversion命令行工具。具体如何实现请参考版本库维护。" +#: source/TortoiseSVN_en.xml:906(para) +msgid "Here's an example. Say that Harry and Sally each create working copies of the same project, copied from the repository. They work concurrently, and make changes to the same file \"A\" within their copies. Sally saves her changes to the repository first. When Harry attempts to save his changes later, the repository informs him that his file A is out-of-date. In other words, that file A in the repository has somehow changed since he last copied it. So Harry asks his client to merge any new changes from the repository into his working copy of file A. Chances are that Sally's changes don't overlap with his own; so once he has both sets of changes integrated, he saves his working copy back to the repository." +msgstr "这是一个例子，Harry 和 Sally 为同一个项目各自建立了一个工作副本，工作是并行的，修改了同一个文件 A，Sally 首先保存修改到版本库，当 Harry 想去提交修改的时候，版本库提示文件 A 已经过期，换句话说，A 在他上次更新之后已经更改了，所以当他通过客户端请求合并版本库和他的工作副本之后，碰巧 Sally 的修改和他的不冲突，所以一旦他把所有的修改集成到一起，他可以将工作副本保存到版本库。" -#: source/TortoiseSVN_en.xml:1082(entry) -msgid "Direct repository access on local or network drive." -msgstr "直接版本库访问(本地磁盘或者网络磁盘)。" +#: source/TortoiseSVN_en.xml:925(title) +msgid "...Copy-Modify-Merge Continued" +msgstr "复制-修改-合并 方案(续)" -#: source/TortoiseSVN_en.xml:10825(title) -msgid "Compare two revisions of a file" -msgstr "比较一个文件的两个版本" +#: source/TortoiseSVN_en.xml:929(primary) +#: source/TortoiseSVN_en.xml:4476(primary) +msgid "conflict" +msgstr "冲突" -#: source/TortoiseSVN_en.xml:10827(primary) -msgid "compare files" -msgstr "比较文件" +#: source/TortoiseSVN_en.xml:931(para) +msgid "But what if Sally's changes do overlap with Harry's changes? What then? This situation is called a conflict, and it's usually not much of a problem. When Harry asks his client to merge the latest repository changes into his working copy, his copy of file A is somehow flagged as being in a state of conflict: he'll be able to see both sets of conflicting changes, and manually choose between them. Note that software can't automatically resolve conflicts; only humans are capable of understanding and making the necessary intelligent choices. Once Harry has manually resolved the overlapping changes (perhaps by discussing the conflict with Sally!), he can safely save the merged file back to the repository." +msgstr "但是如果 Sally 和 Harry 的修改重叠了该怎么办？这种情况叫做冲突，这通常不是个大问题，当 Harry 告诉他的客户端去合并版本库的最新修改到自己的工作副本时，他的文件 A 就会处于冲突状态: 他可以看到一对冲突的修改集，并手工的选择保留一组修改。需要注意的是软件不能自动的解决冲突，只有人可以理解并作出智能的选择，一旦 Harry 手工的解决了冲突(也许需要与 Sally 讨论)，他就可以安全的把合并的文件保存到版本库。" -#: source/TortoiseSVN_en.xml:10829(para) -msgid "If you want to compare two revisions in a file's history, for example revisions 100 and 200 of the same file, just use TortoiseSVNShow Log to list the revision history for that file. Pick the two revisions you want to compare then use Context MenuCompare Revisions." -msgstr "如果希望比较某个文件的两个历史版本，比如同一个文件修订版本100和200，可以用TortoiseSVN显示日志列出这个文件的历史版本纪录，选择希望比较的两个版本，然后使用右键菜单比较版本差异。" +#: source/TortoiseSVN_en.xml:946(para) +msgid "The copy-modify-merge model may sound a bit chaotic, but in practice, it runs extremely smoothly. Users can work in parallel, never waiting for one another. When they work on the same files, it turns out that most of their concurrent changes don't overlap at all; conflicts are infrequent. And the amount of time it takes to resolve conflicts is far less than the time lost by a locking system." +msgstr "复制-修改-合并模型感觉是有一点混乱，但在实践中，通常运行的很平稳，用户可以并行的工作，不必等待别人，当工作在同一个文件上时，也很少会有重叠发生，冲突并不频繁，处理冲突的时间远比等待解锁花费的时间少。" -#: source/TortoiseSVN_en.xml:10843(para) -msgid "If you want to compare the same file in two different trees, for example the trunk and a branch, you can use the repository browser to open up both trees, select the file in both places, then use Context MenuCompare Revisions." -msgstr "如果希望比较两个不同目录树下的同一个文件，比如主干和分支，可以使用版本库浏览器打开两个目录树，在两个目录树下选择同一个文件，然后使用 右键菜单比较版本差异。" +#: source/TortoiseSVN_en.xml:955(para) +msgid "In the end, it all comes down to one critical factor: user communication. When users communicate poorly, both syntactic and semantic conflicts increase. No system can force users to communicate perfectly, and no system can detect semantic conflicts. So there's no point in being lulled into a false promise that a locking system will somehow prevent conflicts; in practice, locking seems to inhibit productivity more than anything else." +msgstr "最后，一切都要归结到一条重要的因素: 用户交流。当用户交流贫乏，语法和语义的冲突就会增加，没有系统可以强制用户完美的交流，没有系统可以检测语义上的冲突，所以没有任何证据能够承诺锁定系统可以防止冲突，实践中，锁定除了约束了生产力，并没有做什么事。" -#: source/TortoiseSVN_en.xml:10853(para) -msgid "If you want to compare two trees to see what has changed, for example the trunk and a tagged release, you can use TortoiseSVNRevision Graph Select the two nodes to compare, then use Context MenuCompare HEAD Revisions. This will show a list of changed files, and you can then select individual files to view the changes in detail. Alternatively use Context MenuUnified Diff of HEAD Revisions to see a summary of all differences, with minimal context." -msgstr "如果希望比较两个目录树下的所有变化，比如主干和某个发布标签，可以使用TortoiseSVN版本分支图。选择两个想要比较的节点，然后使用右键菜单比较最新版本，就会列出一个变更文件列表。在列表上选择单个文件就能够浏览该文件的具体变更内容。另外一个方法是使用右键菜单最新版本的标准差异(Unified diff)显示所有变更的汇总和最少限度的上下文。" +#: source/TortoiseSVN_en.xml:965(para) +msgid "There is one common situation where the lock-modify-unlock model comes out better, and that is where you have un-mergeable files. For example if your repository contains some graphic images, and two people change the image at the same time, there is no way for those changes to be merged together. Either Harry or Sally will lose their changes." +msgstr "有一种情况下锁定-修改-解锁模型会更好，也就是你有不可合并的文件，例如你的版本库包含了图片，两个人同时编辑这个文件，没有办法将这两个修改合并，Harry 或 Sally 会丢失他们的修改。" -#: source/TortoiseSVN_en.xml:10876(title) -msgid "Include a common sub-project" -msgstr "包含一个普通的子项目" - -#: source/TortoiseSVN_en.xml:10878(primary) -msgid "common projects" -msgstr "普通项目" - -#: source/TortoiseSVN_en.xml:1088(literal) -#: source/TortoiseSVN_en.xml:1099(literal) -msgid "http://" -msgstr "http://" - -#: source/TortoiseSVN_en.xml:10880(para) -msgid "Sometimes you will want to include another project within your working copy, perhaps some library code. You don't want to make a duplicate of this code in your repository because then you would lose connection with the original (and maintained) code. Or maybe you have several projects which share core code. There are at least 3 ways of dealing with this." -msgstr "有时候你希望在你的工作副本中引入另一个项目，或许是一些库代码，你不必在你的版本库复制一份，因为你会失去与原始(且维护的)代码的联系，或者你可能有多个项目共享同一份核心代码，有至少三种方法处理这个问题。" - -#: source/TortoiseSVN_en.xml:10890(title) -msgid "Use svn:externals" -msgstr "使用 svn:externals" - -#: source/TortoiseSVN_en.xml:10891(para) -msgid "Set the svn:externals property for a folder in your project. This property consists of one or more lines; each line has the name of a subfolder which you want the use as the checkout folder for common code, and the repository URL that you want to be checked out there. For full details refer to ." -msgstr "在你的项目的一个目录设置svn:externals属性，这个属性包含一到多行；每一行都有一个用作检出的子目录的名字，和一个你希望检出的版本库URL，细节请参考。" - -#: source/TortoiseSVN_en.xml:10899(para) -msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The subfolders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." -msgstr "提交新的目录，然后当你更新时，Subversion会将那个项目的一个副本从它的版本库检出到工作目录，如果需要，子目录会自动创建，每当你更新你的工作副本，你会得到所有外部项目的最新版本。" +#: source/TortoiseSVN_en.xml:975(title) +msgid "What does Subversion Do?" +msgstr "Subversion 怎么做？" -#: source/TortoiseSVN_en.xml:1090(entry) -msgid "Access via WebDAV protocol to Subversion-aware Apache server." -msgstr "通过 WebDAV 协议访问支持 Subversion 的 Apache 服务器。" +#: source/TortoiseSVN_en.xml:976(para) +msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." +msgstr "Subversion 缺省使用复制-修改-合并模型，大多数情况下可以满足你的需求。然而，Subversion 1.2 后还是支持锁定，如果你有不可合并的文件，或者你只是想实行强制管理策略，Subversion 仍然会提供你需要的特性。" -#: source/TortoiseSVN_en.xml:10907(para) source/TortoiseSVN_en.xml:3816(para) -msgid "If the external project is in the same repository, any changes you make there there will be included in the commit list when you commit your main project." -msgstr "如果一个外部工程位于同一版本库中，当你向主项目提交你的修改时，你对外部工程做的修改也会包含在提交列表中。" +#: source/TortoiseSVN_en.xml:988(title) +msgid "Subversion in Action" +msgstr "Subversion 实战" -#: source/TortoiseSVN_en.xml:10912(para) source/TortoiseSVN_en.xml:3821(para) -msgid "If the external project is in a different repository, any changes you make to the external project will be notified when you commit the main project, but you have to commit those external changes separately." -msgstr "如果外部工程位于不同的版本库，当你向主项目提交你的修改时，你对外部工程做的修改会被通报，但是你必须单独的提交这些外部项目的修改。" +#: source/TortoiseSVN_en.xml:990(title) +msgid "Working Copies" +msgstr "工作副本" -#: source/TortoiseSVN_en.xml:10920(title) -msgid "Use a nested working copy" -msgstr "使用嵌套工作副本" +#: source/TortoiseSVN_en.xml:992(primary) +msgid "working copy" +msgstr "工作副本" -#: source/TortoiseSVN_en.xml:10921(para) -msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" -msgstr "在你的项目创建一个包含普通代码的新目录，但不将其添加到Subversion" +#: source/TortoiseSVN_en.xml:994(para) +msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." +msgstr "你已经阅读过了关于工作副本的内容，现在我们要讲一讲客户端怎样建立和使用它。" -#: source/TortoiseSVN_en.xml:10925(para) -msgid "Select TortoiseSVNCheckout for the new folder and checkout a copy of the common code into it. You now have a separate working copy nested within your main working copy." -msgstr "在新目录下选择TortoiseSVN检出，在其中检出普通代码的副本，现在你在主要的工作副本有了一个独立的嵌套的工作副本。" +#: source/TortoiseSVN_en.xml:999(para) +msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." +msgstr "一个 Subversion 工作副本是你本地机器一个普通的目录，保存着一些文件，你可以任意的编辑文件，而且如果是源代码文件，你可以像平常一样编译，你的工作副本是你的私有工作区，在你明确的做了特定操作之前，Subversion 不会把你的修改与其他人的合并，也不会把你的修改展示给别人。" -#: source/TortoiseSVN_en.xml:10935(para) -msgid "The two working copies are independent. When you commit changes to the parent, changes to the nested WC are ignored. Likewise when you update the parent, the nested WC is not updated." -msgstr "两个工作副本是独立的，当你在父目录提交修改，嵌套的工作副本会被忽略，同样当你更新你的父目录，嵌套的工作副本不会被更新。" +#: source/TortoiseSVN_en.xml:1009(para) +msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion provides you with commands to \"publish\" your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." +msgstr "当你在工作副本作了一些修改并且确认它们工作正常之后，Subversion 提供了一个命令可以“发布”你的修改给项目中的其他人(通过写到版本库)，如果别人发布了各自的修改，Subversion 提供了手段可以把这些修改与你的工作目录进行合并(通过读取版本库)。" -#: source/TortoiseSVN_en.xml:10942(title) -msgid "Use a relative location" -msgstr "使用相对位置" +#: source/TortoiseSVN_en.xml:1019(para) +msgid "A working copy also contains some extra files, created and maintained by Subversion, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." +msgstr "一个工作副本也包括一些由 Subversion 创建并维护的额外文件，用来协助执行这些命令。通常情况下，你的工作副本每一个文件夹有一个以 .svn 为名的文件夹，也被叫做工作副本管理目录，这个目录里的文件能够帮助 Subversion 识别哪一个文件做过修改，哪一个文件相对于别人的工作已经过期了。" -#: source/TortoiseSVN_en.xml:10943(para) -msgid "" -"If you use the same common core code in several projects, and you do not want to keep multiple working copies of it for every project that uses it, you can just check it out to a separate location which is related to all the other projects which use it. For example: \n" -"C:\\Projects\\Proj1\n" -"C:\\Projects\\Proj2\n" -"C:\\Projects\\Proj3\n" -"C:\\Projects\\Common\n" -" and refer to the common code using a relative path, eg. ..\\..\\Common\\DSPcore." -msgstr "" -"如果你在多个项目中使用共同的代码，而你不想为每个项目保存一份副本，你可以将其检出到一个单独的位置，与其他项目关联，例如: \n" -"C:\\Projects\\Proj1\n" -"C:\\Projects\\Proj2\n" -"C:\\Projects\\Proj3\n" -"C:\\Projects\\Common\n" -"然后使用相对路径例如..\\..\\Common\\DSPcore引用通用代码。" +#: source/TortoiseSVN_en.xml:1030(para) +msgid "A typical Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." +msgstr "一个典型的 Subversion 的版本库经常包含许多项目的文件(或者说源代码)，通常每一个项目都是版本库的子目录，在这种安排下，一个用户的工作副本往往对应版本库的的一个子目录。" -#: source/TortoiseSVN_en.xml:10958(para) -msgid "" -"If your projects are scattered in unrelated locations you can use a variant of this, which is to put the common code in one location and use drive letter substitution to map that location to something you can hard code in your projects, eg. Checkout the common code to D:\\Documents\\Framework or C:\\Documents and Settings\\{login}\\My Documents\\framework then use \n" -"SUBST X: \"D:\\Documents\\framework\"\n" -" to create the drive mapping used in your source code. Your code can then use absolute locations. \n" -"#include \"X:\\superio\\superio.h\"\n" -"" -msgstr "" -"如果你的项目分散到不相关的位置，你可以使用一个变种方式，可以将通用代码放到一个位置，且使用盘符映射到你可以在项目硬编码的内容，例如将通用代码检出到D:\\Documents\\Framework或C:\\Documents and Settings\\{login}\\My Documents\\framework，然后使用\n" -"SUBST X: \"D:\\Documents\\framework\"\n" -"在你的源代码创建磁盘映射，你的代码可以使用绝对位置。\n" -"#include \"X:\\superio\\superio.h\"\n" -"" +#: source/TortoiseSVN_en.xml:1037(para) +msgid "For example, suppose you have a repository that contains two software projects." +msgstr "举一个例子，你的版本库包含两个软件项目。" -#: source/TortoiseSVN_en.xml:1096(literal) -msgid "https://" -msgstr "https://" +#: source/TortoiseSVN_en.xml:1042(title) +msgid "The Repository's Filesystem" +msgstr "版本库的文件系统" -#: source/TortoiseSVN_en.xml:10976(para) -msgid "This method will only work in an all-PC environment, and you will need to document the required drive mappings so your team know where these mysterious files are. This method is strictly for use in closed development environments, and not recommended for general use." -msgstr "这个方法职能工作在完全PC的环境，你所做的就是记录必须的磁盘映射，所以你的团队知道这些神秘文件的位置，这个方法只能用于紧密地开发环境，在普通的使用中并不推荐。" +#: source/TortoiseSVN_en.xml:1045(para) +msgid "In other words, the repository's root directory has two subdirectories: paint and calc." +msgstr "换句话说，版本库的根目录包含两个子目录: paint 和 calc。" -#: source/TortoiseSVN_en.xml:1098(entry) -msgid "Same as , but with SSL encryption." -msgstr "与 相似，但是用 SSL 加密。" +#: source/TortoiseSVN_en.xml:1050(para) +msgid "To get a working copy, you must check out some subtree of the repository. (The term \"check out\" may sound like it has something to do with locking or reserving resources, but it doesn't; it simply creates a private copy of the project for you)." +msgstr "为了得到一个工作副本，你必须检出版本库的一个子树，(术语“检出”听起来像是锁定或者保留资源，实际上不是，它只是简单的得到一个项目的私有副本)。" -#: source/TortoiseSVN_en.xml:10986(title) -msgid "Create a shortcut to a repository" -msgstr "创建到版本库的快捷方式" +#: source/TortoiseSVN_en.xml:1058(title) +msgid "Repository URLs" +msgstr "版本库的 URL" -#: source/TortoiseSVN_en.xml:10988(primary) -msgid "shortcut" -msgstr "快捷方式" +#: source/TortoiseSVN_en.xml:1059(para) +msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" +msgstr "Subversion 可以通过多种方式访问－本地磁盘访问，或各种各样不同的网络协议，但一个版本库地址永远都是一个 URL，URL 方案反映了访问方法。" -#: source/TortoiseSVN_en.xml:10990(para) -msgid "" -"If you frequently need to open the repository browser at a particular location, you can create a desktop shortcut using the automation interface to TortoiseProc. Just create a new shortcut and set the target to: \n" -"TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n" -" Of course you need to include the real repository URL." -msgstr "" -"如果你经常需要从某个位置打开版本库浏览器，你可以使用 TortoiseProc 自动化接口创建一个快捷方式。只需要创建一个新的快捷方式，将目标设置为: \n" -"TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n" -" 当然你需要包含真实的版本库 URL。" +#: source/TortoiseSVN_en.xml:1067(title) +msgid "Repository Access URLs" +msgstr "版本库访问 URL" -#: source/TortoiseSVN_en.xml:11(firstname) -msgid "Stefan" -msgstr "Stefan" +#: source/TortoiseSVN_en.xml:1073(entry) +msgid "Schema" +msgstr "方案" -#: source/TortoiseSVN_en.xml:11002(title) -msgid "Ignore files which are already versioned" -msgstr "忽略已经版本控制的文件" +#: source/TortoiseSVN_en.xml:1074(entry) +msgid "Access Method" +msgstr "访问方法" -#: source/TortoiseSVN_en.xml:11004(primary) -msgid "unversion" -msgstr "没有版本控制" +#: source/TortoiseSVN_en.xml:1080(literal) +msgid "file://" +msgstr "file://" -#: source/TortoiseSVN_en.xml:11006(para) -msgid "If you accidentally added some files which should have been ignored, how do you get them out of version control without losing them? Maybe you have your own IDE configuration file which is not part of the project, but which took you a long time to set up just the way you like it." -msgstr "如果你不小心添加了一些应该被忽略的文件，你如何将它们从版本控制中去除而不会丢失它们？或许你有自己的IDE配置文件，不是项目的一部分，但将会花费很多时间使之按照自己的方式工作。" +#: source/TortoiseSVN_en.xml:1082(entry) +msgid "Direct repository access on local or network drive." +msgstr "直接版本库访问(本地磁盘或者网络磁盘)。" -#: source/TortoiseSVN_en.xml:11013(para) -msgid "If you have not yet committed the add, then all you have to do is use TortoiseSVNRevert... to undo the add. You should then add the file(s) to the ignore list so they don't get added again later by mistake." -msgstr "如果你还没有提交，你只需要TortoiseSVNRevert...来取消添加，你需要将这个文件添加到忽略列表，这样它们才不会被再次误添加近来。" +#: source/TortoiseSVN_en.xml:1088(literal) +#: source/TortoiseSVN_en.xml:1099(literal) +msgid "http://" +msgstr "http://" -#: source/TortoiseSVN_en.xml:11023(para) -msgid "If the files are already in the repository, you have to do a little more work. " -msgstr "如果文件已经存在于版本库，你需要做更多的工作。" +#: source/TortoiseSVN_en.xml:1090(entry) +msgid "Access via WebDAV protocol to Subversion-aware Apache server." +msgstr "通过 WebDAV 协议访问支持 Subversion 的 Apache 服务器。" -#: source/TortoiseSVN_en.xml:11028(para) -msgid "Move the file to somewhere safe, not inside your working copy." -msgstr "把文件移动到其它安全的位置，不在你的工作副本的目录内。" +#: source/TortoiseSVN_en.xml:1096(literal) +msgid "https://" +msgstr "https://" -#: source/TortoiseSVN_en.xml:11034(para) -msgid "TortoiseSVNCommit the parent folder. TortoiseSVN will see that the file is missing and you can mark it for deletion from the repository." -msgstr "TortoiseSVN提交父目录，TortoiseSVN会查看遗失文件和你从版本库标记删除的文件。" +#: source/TortoiseSVN_en.xml:1098(entry) +msgid "Same as , but with SSL encryption." +msgstr "与 相似，但是用 SSL 加密。" #: source/TortoiseSVN_en.xml:1104(literal) msgid "svn://" msgstr "svn://" -#: source/TortoiseSVN_en.xml:11045(para) -msgid "Move the file back to its original location." -msgstr "将文件移到原始位置" - -#: source/TortoiseSVN_en.xml:11050(para) -msgid "Add the file to the ignore list so you don't get into the same trouble again." -msgstr "将文件添加到忽略文件，所以你不必再为此烦心。" - -#: source/TortoiseSVN_en.xml:11057(para) -msgid "If you need to remove a whole folder/hierarchy from version control, the procedure is different again. " -msgstr "如果你需要将整个目录从版本控制中删除，过程会有一点区别。" - -#: source/TortoiseSVN_en.xml:1106(entry) -msgid "Unauthenticated TCP/IP access via custom protocol to an server." -msgstr "通过未认证的 TCP/IP 自定义协议访问 服务。" - -#: source/TortoiseSVN_en.xml:11062(para) -msgid "TortoiseSVNExport the folder to somewhere safe, not inside your working copy." -msgstr "TortoiseSVN导出文件夹到某个安全的地方而不是你的工作副本。" - -#: source/TortoiseSVN_en.xml:11072(para) -msgid "TortoiseSVNDelete the folder from your working copy." -msgstr "TortoiseSVN删除，从你的工作副本中删除该文件夹。" - #: source/TortoiseSVN_en.xml:1108(literal) #: source/TortoiseSVN_en.xml:1117(literal) #: source/TortoiseSVN_en.xml:2562(primary) msgid "svnserve" msgstr "svnserve" -#: source/TortoiseSVN_en.xml:11081(para) -msgid "TortoiseSVNCommit the deleted folder to remove it from the repository." -msgstr "TortoiseSVN提交对文件夹的删除操作，将它从版本库中移除。" +#: source/TortoiseSVN_en.xml:1106(entry) +msgid "Unauthenticated TCP/IP access via custom protocol to an server." +msgstr "通过未认证的 TCP/IP 自定义协议访问 服务。" -#: source/TortoiseSVN_en.xml:11090(para) -msgid "Move the exported folder back to its original location in your working copy." -msgstr "将导出的文件复制回工作副本原来的位置。" +#: source/TortoiseSVN_en.xml:1113(literal) +msgid "svn+ssh://" +msgstr "svn+ssh://" -#: source/TortoiseSVN_en.xml:11096(para) -msgid "Add the folder to the ignore list so you don't get into the same trouble again." -msgstr "将文件添加到忽略文件，所以你不必再为此烦心。" +#: source/TortoiseSVN_en.xml:1115(entry) +msgid "authenticated, encrypted TCP/IP access via custom protocol to an server" +msgstr "通过认证并加密的 TCP/IP 自定义协议访问 服务。" -#: source/TortoiseSVN_en.xml:11106(title) -msgid "Administrators" -msgstr "管理员" +#: source/TortoiseSVN_en.xml:1124(para) +msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file: access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." +msgstr "大多数情况下，Subversion 的 URL 使用标准语法，允许服务器名称和端口号作为 URL 的一部分。file:访问方法通常用来本地访问，尽管也可以使用 UNC 路径访问网络主机，采用的 URL 形式为 file://hostname/path/to/repos。对于本地主机，主机部分可以为空或者是localhost，因此，本地路径通常出现三个斜线－file:///path/to/repos。" -#: source/TortoiseSVN_en.xml:11108(para) -msgid "This appendix contains solutions to problems/questions you might have when you are responsible for deploying TortoiseSVN to multiple client computers." -msgstr "附录包含了将TortoiseSVN部署到多个客户端电脑时可能发生问题的解决方案。" +#: source/TortoiseSVN_en.xml:1137(para) +msgid "Also, users of the file: scheme on Windows platforms will need to use an unofficially standard syntax for accessing repositories that are on the same machine, but on a different drive than the client's current working drive. Either of the two following URL path syntaxes will work where X is the drive on which the repository resides:" +msgstr "另外，在 Windows 平台的 file: 方案有时候需要使用一种非正式的标准协议访问本地但不是程序运行磁盘的版本库，以下两种 URL 路径语法都可以工作，其中的 X 是版本库所在的磁盘: " -#: source/TortoiseSVN_en.xml:11115(title) -msgid "Deploy TortoiseSVN via group policies" -msgstr "通过组策略部署 TortoiseSVN" +#: source/TortoiseSVN_en.xml:1147(screen) +#, no-wrap +msgid "" +"\n" +"file:///X:/path/to/repos\n" +"...\n" +"file:///X|/path/to/repos\n" +"...\n" +msgstr "" +"\n" +"file:///X:/path/to/repos\n" +"...\n" +"file:///X|/path/to/repos\n" +"...\n" -#: source/TortoiseSVN_en.xml:11117(primary) -msgid "group policies" -msgstr "组策略" +#: source/TortoiseSVN_en.xml:1153(para) +msgid "Note that a URL uses ordinary slashes even though the native (non-URL) form of a path on Windows uses backslashes." +msgstr "注意 URL 使用普通的斜杠，而不是 Windows 本地(非 URL)形式的路径。" -#: source/TortoiseSVN_en.xml:11120(primary) -#: source/TortoiseSVN_en.xml:12305(glossterm) -msgid "GPO" -msgstr "GPO" +#: source/TortoiseSVN_en.xml:1157(para) +msgid "You can safely access an FSFS repository via a network share, but you cannot access a BDB repository in this way." +msgstr "你可以安全的访问网络共享上 FSFS 版本库，但是你不能以这种方式访问 BDB 版本库。" -#: source/TortoiseSVN_en.xml:11122(para) -msgid "The TortoiseSVN installer comes as an msi file, which means you should have no problems adding that msi file to the group policies of your domain controller." -msgstr "TortoiseSVN安装程序使用msi文件，意味着你必须能够将msi文件添加到你的域控制器的组策略中。" +#: source/TortoiseSVN_en.xml:1164(para) source/TortoiseSVN_en.xml:2681(para) +#: source/TortoiseSVN_en.xml:3056(para) +msgid "Do not create or access a Berkeley DB repository on a network share. It cannot exist on a remote filesystem. Not even if you have the network drive mapped to a drive letter. If you attempt to use Berkeley DB on a network share, the results are unpredictable - you may see mysterious errors right away, or it may be months before you discover that your repository database is subtly corrupted." +msgstr "不要创建和访问网络共享上的 Berkeley DB 版本库，它不能存在于一个远程的文件系统，即使是映射到盘符的共享。如果你希望在网络共享使用 Berkeley DB，结果难以预料－你可能会立刻看到奇怪的错误，也有可能几个月之后才发现数据库已经损坏了。" -#: source/TortoiseSVN_en.xml:11127(para) -msgid "A good walkthrough on how to do that can be found in the knowledge base article 314934 from Microsoft: http://support.microsoft.com/?kbid=314934." -msgstr "你可以从微软的知识库文章314934中看到如何做的方法: http://support.microsoft.com/?kbid=314934。" +#: source/TortoiseSVN_en.xml:1174(para) +msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." +msgstr "假定你修改了 button.c，因为 .svn 目录记录着文件的修改日期和原始内容，Subversion 可以告诉你已经修改了文件，然而，在你明确告诉它之前，Subversion 不会将你的改变公开。将改变公开的操作被叫做提交(或者是检入)，它提交修改到版本库中。" -#: source/TortoiseSVN_en.xml:1113(literal) -msgid "svn+ssh://" -msgstr "svn+ssh://" +#: source/TortoiseSVN_en.xml:1184(para) +msgid "To publish your changes to others, you can use Subversion's commit command." +msgstr "发布你的修改给别人，可以使用 Subversion 的提交命令。" -#: source/TortoiseSVN_en.xml:11134(para) -msgid "Versions 1.3.0 and later of TortoiseSVN must be installed under Computer Configuration and not under User Configuration. This is because those versions need the new CRT and MFC dlls, which can only be deployed per computer and not per user. If you really must install TortoiseSVN on a per user basis, then you must first install the MFC and CRT package version 8 from Microsoft on each computer you want to install TortoiseSVN as per user." -msgstr "TortoiseSVN的1.3和之后的版本，必须安装在电脑配置下，而不是用户配置。这是因为那些版本需要新的CRT和MFC的dll，只能部署在每电脑，而不是每用户。如果你必须以每用户防是安装TortoiseSVN，你必须在每个需要安装TortoiseSVN电脑上为每个用户安装MFC和CRT包。" +#: source/TortoiseSVN_en.xml:1188(para) +msgid "Now your changes to button.c have been committed to the repository; if another user checks out a working copy of /calc, they will see your changes in the latest version of the file." +msgstr "这时你对 button.c 的修改已经提交到了版本库，如果其他人取出了 /calc 的一个工作副本，他们会看到这个文件最新的版本。" -#: source/TortoiseSVN_en.xml:11146(title) -msgid "Redirect the upgrade check" -msgstr "重定向升级检查" +#: source/TortoiseSVN_en.xml:1194(para) +msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." +msgstr "设你有个合作者，Sally，她和你同时取出了 /calc 的一个工作副本，你提交了你对 button.c 的修改，Sally 的工作副本并没有改变，Subversion 只在用户要求的时候才改变工作副本。" -#: source/TortoiseSVN_en.xml:11148(primary) -msgid "upgrade check" -msgstr "升级检查" +#: source/TortoiseSVN_en.xml:1202(para) +msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." +msgstr "要使项目最新，Sally 可以要求 Subversion 更新她的工作副本，通过使用更新命令，可以将你和所有其他人在她上次更新之后的修改合并到她的工作副本。" -#: source/TortoiseSVN_en.xml:1115(entry) -msgid "authenticated, encrypted TCP/IP access via custom protocol to an server" -msgstr "通过认证并加密的 TCP/IP 自定义协议访问 服务。" +#: source/TortoiseSVN_en.xml:1210(para) +msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." +msgstr "注意，Sally 不必指定要更新的文件，Subversion 利用 .svn 以及版本库的进一步信息决定哪些文件需要更新。" -#: source/TortoiseSVN_en.xml:11150(para) -msgid "TortoiseSVN checks if there's a new version available every few days. If there is a newer version available, a dialog shows up informing the user about that." -msgstr "TortoiseSVN会每隔几天检查是否有新版本可以下载，如果有新版本存在，会给用户显示相关信息的对话框。" +#: source/TortoiseSVN_en.xml:1219(title) +msgid "Revisions" +msgstr "修订版本" -#: source/TortoiseSVN_en.xml:11156(title) -msgid "The upgrade dialog" -msgstr "升级对话框" +#: source/TortoiseSVN_en.xml:1221(primary) +#: source/TortoiseSVN_en.xml:8171(primary) +msgid "revision" +msgstr "修订版本" -#: source/TortoiseSVN_en.xml:11159(para) -msgid "If you're responsible for a lot of users in your domain, you might want your users to use only versions you have approved and not have them install always the latest version. You probably don't want that upgrade dialog to show up so your users don't go and upgrade immediately." -msgstr "如果你为你的域中的许多用户负责，你或许希望所有的用户使用你允许的版本，而不是最新的版本，你可能不希望显示升级对话框而使得用户立刻升级。" +#: source/TortoiseSVN_en.xml:1223(para) +msgid "An svn commit operation can publish changes to any number of files and directories as a single atomic transaction. In your working copy, you can change files' contents, create, delete, rename and copy files and directories, and then commit the complete set of changes as a unit." +msgstr "一个 svn commit 操作可以作为一个原子事务操作发布任意数量文件和目录的修改，在你的工作副本里，你可以改变文件内容、删除、改名和复制文件和目录，然后作为一个整体提交。" -#: source/TortoiseSVN_en.xml:11165(para) -msgid "" -"Versions 1.4.0 and later of TortoiseSVN allow you to redirect that upgrade check to your intranet server. You can set the registry key HKCU\\Software\\TortoiseSVN\\UpdateCheckURL (string value) to an URL pointing to a text file in your intranet. That textfile must have the following format: \n" -"1.4.1.6000\n" -"A new version of TortoiseSVN is available for you to download!\n" -"http://192.168.2.1/downloads/TortoiseSVN-1.4.1.6000-svn-1.4.0.msi\n" -" The first line in that file is the version string. You must make sure that it matches the exact version string of the TortoiseSVN installation package. The second line is a custom text, shown in the upgrade dialog. You can write there whatever you want. Just note that the space in the upgrade dialog is limited. Too long messages will get truncated! The third line is the URL to the new installation package. This URL is opened when the user clicks on the custom message label in the upgrade dialog. You can also just point the user to a webpage instead of the msi file directly. The URL is opened with the default web browser, so if you specify a webpage, that page is opened and shown to the user. If you specify the msi package, the browser will ask the user to save the msi file locally." -msgstr "" -"Versions 1.4.0和之后的TortoiseSVN允许你重定向你的升级检查到本地服务器，你可以设置注册表HKCU\\Software\\TortoiseSVN\\UpdateCheckURL(字符串值)指向本地网的文本文件。这个文本文件必须是下面的格式: screen>\n" -"1.4.1.6000\n" -"A new version of TortoiseSVN is available for you to download!\n" -"http://192.168.2.1/downloads/TortoiseSVN-1.4.1.6000-svn-1.4.0.msi\n" -"文件的第一行是版本串，你必须确定这与TortoiseSVN安装包的信息完全一致。第二行是自定义字符，显示在省级对话框，你可以在里面写任何信息，只是要注意升级对话框中的数据长度是有限制的，过长的信息会被截断。第三行是最新安装包的位置，当用户选择升级时就会打开这个URL。你可以将文件指向网页，而不是msi文件，如果你指向了msi包，浏览器会询问用户在本地保存msi文件。" +#: source/TortoiseSVN_en.xml:1231(para) +msgid "In the repository, each commit is treated as an atomic transaction: either all the commit's changes take place, or none of them take place. Subversion tries to retain this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." +msgstr "在版本库中，每次提交被当作一次原子事务操作: 要么所有的改变发生，要么都不发生，Subversion 努力保持原子性以应对程序错误、系统错误、网络问题和其他用户行为。" -#: source/TortoiseSVN_en.xml:11190(title) -msgid "Setting the SVN_ASP_DOT_NET_HACK environment variable" -msgstr "设置 SVN_ASP_DOT_NET_HACK 环境变量" +#: source/TortoiseSVN_en.xml:1238(para) +msgid "Each time the repository accepts a commit, this creates a new state of the filesystem tree, called a revision. Each revision is assigned a unique natural number, one greater than the number of the previous revision. The initial revision of a freshly created repository is numbered zero, and consists of nothing but an empty root directory." +msgstr "每当版本库接受了一个提交，文件系统进入了一个新的状态，叫做版本，每个版本被赋予一个独一无二的自然数，一个比一个大，初始修订号是 0，只创建了一个空目录，没有任何内容。" -#: source/TortoiseSVN_en.xml:11192(primary) -msgid "SVN_ASP_DOT_NET_HACK" -msgstr "SVN_ASP_DOT_NET_HACK" +#: source/TortoiseSVN_en.xml:1247(para) +msgid "A nice way to visualize the repository is as a series of trees. Imagine an array of revision numbers, starting at 0, stretching from left to right. Each revision number has a filesystem tree hanging below it, and each tree is a snapshot of the way the repository looked after each commit." +msgstr "可以形象的把版本库看作一系列树，想象有一组版本号，从 0 开始，从左到右，每一个修订号有一个目录树挂在它下面，每一个树好像是一次提交后的版本库“快照”。" -#: source/TortoiseSVN_en.xml:11194(para) -msgid "As of version 1.4.0 and later, the TortoiseSVN installer doesn't provide the user with the option to set the SVN_ASP_DOT_NET_HACK environment variable anymore, since that caused many problems and confusions with users which always install everything no matter if they know what it is for." -msgstr "1.4及之后的版本，TortoiseSVN安装包不会支持用户在环境变量中使用SVN_ASP_DOT_NET_HACK，因为这样导致许多问题，也会使一直安装任何事情，而不管是什么的用户感到迷惑。" +#: source/TortoiseSVN_en.xml:1260(title) +msgid "Global Revision Numbers" +msgstr "全局版本号" -#: source/TortoiseSVN_en.xml:11201(para) +#: source/TortoiseSVN_en.xml:1261(para) +msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" +msgstr "不像其它版本控制系统，Subversion 的版本号是针对整个目录树的，而不是单个文件。每一个版本号代表了一次提交后版本库整个目录树的特定状态，另一种理解是版本 N 代表版本库已经经过了 N 次提交。当 Subversion 用户讨论“foo.c的版本 5”时，他们的实际意思是“在版本 5 时的foo.c”。需要注意的是，一个文件的版本 N 和 M 并不表示它必定不同。" + +#: source/TortoiseSVN_en.xml:1276(para) +msgid "It's important to note that working copies do not always correspond to any single revision in the repository; they may contain files from several different revisions. For example, suppose you check out a working copy from a repository whose most recent revision is 4:" +msgstr "需要特别注意的是，工作副本并不一定对应版本库中的单一版本，他们可能包含多个版本的文件。举个例子，你从版本库检出一个工作副本，最新的版本是 4: " + +#: source/TortoiseSVN_en.xml:1283(screen) +#, no-wrap msgid "" -"But that option is only hidden for the user. You still can force the TortoiseSVN installer to set that environment variable by setting the ASPDOTNETHACK property to TRUE. For example, you can start the installer like this: \n" -"msiexec /i TortoiseSVN-1.4.0.msi ASPDOTNETHACK=TRUE\n" -"" +"\n" +"calc/Makefile:4\n" +" integer.c:4\n" +" button.c:4\n" msgstr "" -"但是这个选项只是对用户隐藏了，你仍然可以通过设置ASPDOTNETHACK属性为TRUE强制TortoiseSVN安装程序设置这个环境变量。例如，你可以这样启动安装脚本: \n" -"msiexec /i TortoiseSVN-1.4.0.msi ASPDOTNETHACK=TRUE\n" -"" +"\n" +"calc/Makefile:4\n" +" integer.c:4\n" +" button.c:4\n" -#: source/TortoiseSVN_en.xml:11212(title) -msgid "Automating TortoiseSVN" -msgstr "TortoiseSVN 操作" +#: source/TortoiseSVN_en.xml:1288(para) +msgid "At the moment, this working directory corresponds exactly to revision 4 in the repository. However, suppose you make a change to button.c, and commit that change. Assuming no other commits have taken place, your commit will create revision 5 of the repository, and your working copy will now look like this:" +msgstr "此刻，工作目录与版本库的版本 4 完全对应，然而，你修改了 button.c 并且提交之后，假设没有别的提交出现，你的提交会在版本库建立版本 5，你的工作副本会是这个样子的: " -#: source/TortoiseSVN_en.xml:11214(para) -msgid "Since all commands for TortoiseSVN are controlled through command line parameters, you can automate it with batch scripts or start specific commands and dialogs from other programs (e.g. your favourite text editor)." -msgstr "因为所有的命令使用命令行参数控制，你可以使用特定的批处理脚本或从其它程序(例如你喜欢的文本编辑器)启动。" +#: source/TortoiseSVN_en.xml:1296(screen) +#, no-wrap +msgid "" +"\n" +"calc/Makefile:4\n" +" integer.c:4\n" +" button.c:5\n" +msgstr "" +"\n" +"calc/Makefile:4\n" +" integer.c:4\n" +" button.c:5\n" -#: source/TortoiseSVN_en.xml:11220(para) -msgid "Remember that TortoiseSVN is a GUI client, and this automation guide shows you how to make the TortoiseSVN dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." -msgstr "请记住TortoiseSVN是一个GUI客户端，这个自动化指导为你展示了让TortoiseSVN对话框显示并收集客户输入，如果你希望编写不需要输入的脚本，你应该使用官方的Subversion命令行客户端。" +#: source/TortoiseSVN_en.xml:1301(para) +msgid "Suppose that, at this point, Sally commits a change to integer.c, creating revision 6. If you use svn update to bring your working copy up to date, then it will look like this:" +msgstr "假设此刻，Sally 提交了对 integer.c 的修改，建立修订版本 6，如果你使用 svn update 来更新你的工作副本，你会看到: " -#: source/TortoiseSVN_en.xml:11232(title) -#: source/TortoiseSVN_en.xml:11701(title) -msgid "TortoiseSVN Commands" -msgstr "TortoiseSVN 命令" +#: source/TortoiseSVN_en.xml:1307(screen) +#, no-wrap +msgid "" +"\n" +"calc/Makefile:6\n" +" integer.c:6\n" +" button.c:6\n" +msgstr "" +"\n" +"calc/Makefile:6\n" +" integer.c:6\n" +" button.c:6\n" -#: source/TortoiseSVN_en.xml:11234(primary) -msgid "automation" -msgstr "自动化" +#: source/TortoiseSVN_en.xml:1312(para) +msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." +msgstr "Sally 对 integer.c 的改变会出现在你的工作副本，你对 button.c 的改变还在，在这个例子里，Makefile 在 4、5、6 版本都是一样的，但是 Subversion 会把 Makefile 的版本设为 6 来表明它是最新的，所以你在工作副本顶级目录作一次干净的更新，会使所有内容对应版本库的同一修订版本。" -#: source/TortoiseSVN_en.xml:11237(primary) -msgid "command line" -msgstr "命令行" +#: source/TortoiseSVN_en.xml:1325(title) +msgid "How Working Copies Track the Repository" +msgstr "工作副本怎样跟踪版本库" -#: source/TortoiseSVN_en.xml:11239(para) -msgid "The TortoiseSVN GUI program is called TortoiseProc.exe. All commands are specified with the parameter where abcd is the required command name. Most of these commands need at least one path argument, which is given with . In the following table the command refers to the parameter and the path refers to the parameter." -msgstr "TortoiseSVN的GUI程序叫做TortoiseProc.exe。所有的命令通过参数指定，其中abcd是必须的命令名。大多数此类命令至少需要一个路径参数，使用指定。在下面的命令表格中，命令引用的是参数，余下的代表了参数。" +#: source/TortoiseSVN_en.xml:1326(para) +msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" +msgstr "对于工作副本的每一个文件，Subversion 在管理目录 .svn/ 记录两项关键的信息: " -#: source/TortoiseSVN_en.xml:1124(para) -msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file: access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." -msgstr "大多数情况下，Subversion 的 URL 使用标准语法，允许服务器名称和端口号作为 URL 的一部分。file:访问方法通常用来本地访问，尽管也可以使用 UNC 路径访问网络主机，采用的 URL 形式为 file://hostname/path/to/repos。对于本地主机，主机部分可以为空或者是localhost，因此，本地路径通常出现三个斜线－file:///path/to/repos。" +#: source/TortoiseSVN_en.xml:1332(para) +msgid "what revision your working file is based on (this is called the file's working revision), and" +msgstr "工作文件的基准版本(叫做文件的工作版本)和" -#: source/TortoiseSVN_en.xml:11248(para) -msgid "Since some of the commands can take a list of target paths (e.g. committing several specific files) the parameter can take several paths, separated by a * character." -msgstr "因为一些命令需要一个目标路径的列表(例如提交一些特定的文件)，参数可以接收多个路径，使用*分割。" +#: source/TortoiseSVN_en.xml:1339(para) +msgid "a timestamp recording when the local copy was last updated by the repository." +msgstr "一个本地副本最后更新的时间戳。" -#: source/TortoiseSVN_en.xml:11253(para) -msgid "TortoiseSVN uses temporary files to pass multiple arguments between the shell extension and the main program. From TortoiseSVN 1.5.0 on and later, parameter is obsolete and there is no need to add it anymore." -msgstr "TortoiseSVN 使用临时文件在 shell 扩展和主程序之间传递多个参数。从 TortoiseSVN 1.5.0 开始，废弃参数，不再需要增加此参数。" +#: source/TortoiseSVN_en.xml:1345(para) +msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" +msgstr "给定这些信息，通过与版本库通讯，Subversion 可以告诉我们工作文件是处与如下四种状态的那一种: " -#: source/TortoiseSVN_en.xml:11259(para) -msgid "The progress dialog which is used for commits, updates and many more commands usually stays open after the command has finished until the user presses the OK button. This can be changed by checking the corresponding option in the settings dialog. But using that setting will close the progress dialog, no matter if you start the command from your batchfile or from the TortoiseSVN context menu." -msgstr "进度对话框用来显示提交，更新等命令，结束后通常需要用户点确认按钮才退出，这个可以通过检查对应的对话框选项中设置。但是使用那个设置会关闭进度窗口，无论你是使用批处理文件还是用TortoiseSVN右键菜单。" +#: source/TortoiseSVN_en.xml:1352(term) +msgid "Unchanged, and current" +msgstr "未修改且是当前的" -#: source/TortoiseSVN_en.xml:11267(para) -msgid "To specify a different location of the configuration file, use the param . This will override the default path, including any registry setting." -msgstr "为了指定另外一个的配置文件，可以使用参数，这将会覆盖默认的路径和注册表设置。" +#: source/TortoiseSVN_en.xml:1354(para) +msgid "The file is unchanged in the working directory, and no changes to that file have been committed to the repository since its working revision. A commit of the file will do nothing, and an update of the file will do nothing." +msgstr "文件在工作目录里没有修改，在工作版本之后没有修改提交到版本库。svn commit 操作不做任何事情，svn update 不做任何事情。" -#: source/TortoiseSVN_en.xml:11272(para) -msgid "To close the progress dialog at the end of a command automatically without using the permanent setting you can pass the parameter. " -msgstr "如果想在进度对话框执行完毕后自动关闭，而又不必设置永久性的参数，可以传递参数。" +#: source/TortoiseSVN_en.xml:1365(term) +msgid "Locally changed, and current" +msgstr "本地已修改且是当前的" -#: source/TortoiseSVN_en.xml:11278(para) -msgid " don't close the dialog automatically" -msgstr " 不自动关闭对话框" +#: source/TortoiseSVN_en.xml:1367(para) +msgid "The file has been changed in the working directory, and no changes to that file have been committed to the repository since its base revision. There are local changes that have not been committed to the repository, thus an commit of the file will succeed in publishing your changes, and an update of the file will do nothing." +msgstr "工作副本已经修改，从基准版本之后没有修改提交到版本库。本地修改没有提交，因此 svn commit 会成功的提交，svn update 不做任何事情。" -#: source/TortoiseSVN_en.xml:11283(para) -msgid " auto close if no errors" -msgstr " 如果没发生错误则自动关闭对话框" +#: source/TortoiseSVN_en.xml:1379(term) +msgid "Unchanged, and out-of-date" +msgstr "本地未修改且过时" -#: source/TortoiseSVN_en.xml:11288(para) -msgid " auto close if no errors and conflicts" -msgstr " 如果没发生错误和冲突则自动关闭对话框" +#: source/TortoiseSVN_en.xml:1381(para) +msgid "The file has not been changed in the working directory, but it has been changed in the repository. The file should eventually be updated, to make it current with the public revision. An commit of the file will do nothing, and an update of the file will fold the latest changes into your working copy." +msgstr "这个文件在工作副本没有修改，但在版本库中已经修改了。这个文件应当更新到最新公共版本。svn commit 不做任何事情，svn update 将会更新工作副本到最新的版本。" -#: source/TortoiseSVN_en.xml:11293(para) -msgid " auto close if no errors, conflicts and merges" -msgstr "如果没有错误、冲突和合并，会自动关闭" +#: source/TortoiseSVN_en.xml:1393(term) +msgid "Locally changed, and out-of-date" +msgstr "本地已修改且过时" -#: source/TortoiseSVN_en.xml:11298(para) -msgid " auto close if no errors, conflicts and merges for local operations" -msgstr "如果没有错误、冲突和合并，会自动关闭" +#: source/TortoiseSVN_en.xml:1395(para) +msgid "The file has been changed both in the working directory, and in the repository. An commit of the file will fail with an \"out-of-date\" error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." +msgstr "这个文件在工作副本和版本库都被修改。svn commit 将会失败，这个文件必须首先更新，svn update 命令会合并公共和本地修改，如果 Subversion 不能自动完成，将会让用户解决冲突。" -#: source/TortoiseSVN_en.xml:113(para) -msgid "The Daily Use Guide is the most important section as it explains all the main features of TortoiseSVN and how to use them. It takes the form of a tutorial, starting with checking out a working copy, modifying it, committing your changes, etc. It then progresses to more advanced topics." -msgstr "日常使用指南是最重要的章节，介绍了 TortoiseSVN 最主要特性的使用。它以教程的形式，从检出一个工作副本开始，然后修改，提交你的修改，之后进入高级主题。" +#: source/TortoiseSVN_en.xml:1412(title) +msgid "Summary" +msgstr "摘要" -#: source/TortoiseSVN_en.xml:11305(para) -msgid "The table below lists all the commands which can be accessed using the TortoiseProc.exe command line. As described above, these should be used in the form /command:abcd. In the table, the /command prefix is omitted to save space." -msgstr "下面的列表列出了所有可以使用TortoiseProc.exe访问的命令，就像上面的描述，必须使用/command:abcd的形式，在列表中，因为节省空间的关系省略了/command的前缀。" +#: source/TortoiseSVN_en.xml:1413(para) +msgid "We've covered a number of fundamental Subversion concepts in this chapter:" +msgstr "我们在这一章里学习了许多 Subversion 基本概念: " -#: source/TortoiseSVN_en.xml:11324(title) -msgid "List of available commands and options" -msgstr "有效命令及选项列表" +#: source/TortoiseSVN_en.xml:1419(para) +msgid "We've introduced the notions of the central repository, the client working copy, and the array of repository revision trees." +msgstr "我们介绍了中央版本库、客户工作副本和版本库中版本树队列的概念。" -#: source/TortoiseSVN_en.xml:11330(entry) -msgid "Command" -msgstr "命令" +#: source/TortoiseSVN_en.xml:1425(para) +msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." +msgstr "我们介绍了两个协作者如何使用使用复制-修改-合并模型，用 Subversion 发布和获得对方的修改。" -#: source/TortoiseSVN_en.xml:11337(entry) -msgid "Shows the About-dialog. This is also shown if no command is given." -msgstr "显示关于对话框。如果没有给命令也会显示。" +#: source/TortoiseSVN_en.xml:1432(para) +msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." +msgstr "我们讨论了一些 Subversion 跟踪和管理工作副本信息的方式。" -#: source/TortoiseSVN_en.xml:11344(entry) -msgid "Opens the log dialog. The path specifies the file or folder for which the log should be shown. Three additional options can be set: , and " -msgstr "打开日志对话框，路径指定了日志显示的文件或目录，另外还有三个选项可以设置: 、和" +#: source/TortoiseSVN_en.xml:1445(title) +msgid "Setting Up A Server" +msgstr "配置服务器" -#: source/TortoiseSVN_en.xml:11348(option) -msgid "/startrev:xxx" -msgstr "/startrev:xxx" +#: source/TortoiseSVN_en.xml:1447(para) +msgid "To use TortoiseSVN (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." +msgstr "为了使用TortoiseSVN(或任何其他Subversion客户端)，你需要放置你的版本库，你可以将版本库存于本地并使用file://协议访问，也可以放置于服务器，使用http://或svn://访问，这两种服务器协议也可以被加密，使用https://或svn+ssh://。本章介绍了在Windows主机上设置一个服务器的步骤。" -#: source/TortoiseSVN_en.xml:11349(option) -msgid "/endrev:xxx" -msgstr "/endrev:xxx" +#: source/TortoiseSVN_en.xml:1458(para) +msgid "If you don't have a server and/or if you only work alone then local repositories are probably your best choice. You can skip this chapter and go directly to ." +msgstr "如果你没有一个服务器，或者你独自工作，本地版本库会是你的最佳选择，你可以跳过本章，直接到。" -#: source/TortoiseSVN_en.xml:11350(option) -msgid "/strict" -msgstr "/strict" +#: source/TortoiseSVN_en.xml:1467(title) +msgid "Apache Based Server" +msgstr "基于 Apache 的服务器" -#: source/TortoiseSVN_en.xml:11355(entry) -msgid "Opens the checkout dialog. The specifies the target directory and the specifies the URL to checkout from." -msgstr "打开检出对话框，指定了目标路径，而制定了检出的URL。" +#: source/TortoiseSVN_en.xml:1471(primary) +msgid "Apache" +msgstr "Apache" -#: source/TortoiseSVN_en.xml:11356(option) -#: source/TortoiseSVN_en.xml:11371(option) -#: source/TortoiseSVN_en.xml:11399(option) -#: source/TortoiseSVN_en.xml:11407(option) -#: source/TortoiseSVN_en.xml:11415(option) -#: source/TortoiseSVN_en.xml:11422(option) -#: source/TortoiseSVN_en.xml:11431(option) -#: source/TortoiseSVN_en.xml:11444(option) -#: source/TortoiseSVN_en.xml:11445(option) -#: source/TortoiseSVN_en.xml:11447(option) -#: source/TortoiseSVN_en.xml:11466(option) -#: source/TortoiseSVN_en.xml:11479(option) -#: source/TortoiseSVN_en.xml:11486(option) -#: source/TortoiseSVN_en.xml:11496(option) -#: source/TortoiseSVN_en.xml:11502(option) -#: source/TortoiseSVN_en.xml:11510(option) -#: source/TortoiseSVN_en.xml:11516(option) -#: source/TortoiseSVN_en.xml:11538(option) -#: source/TortoiseSVN_en.xml:11549(option) -#: source/TortoiseSVN_en.xml:11558(option) -#: source/TortoiseSVN_en.xml:11573(option) -#: source/TortoiseSVN_en.xml:11583(option) -#: source/TortoiseSVN_en.xml:11590(option) -#: source/TortoiseSVN_en.xml:11599(option) -#: source/TortoiseSVN_en.xml:11606(option) -#: source/TortoiseSVN_en.xml:11623(option) -msgid "/path" -msgstr "/path" +#: source/TortoiseSVN_en.xml:1473(para) +msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" +msgstr "所有可能的服务器当中，Apache为基础的服务器是最灵活的，尽管配置有一点复杂，但是提供了其他服务器没有的便利: " -#: source/TortoiseSVN_en.xml:11357(option) -msgid "/url" -msgstr "/url" +#: source/TortoiseSVN_en.xml:1479(primary) +#: source/TortoiseSVN_en.xml:1483(term) +msgid "WebDAV" +msgstr "WebDAV" -#: source/TortoiseSVN_en.xml:11363(entry) -msgid "Opens the import dialog. The path specifies the directory with the data to import." -msgstr "打开导入对话框，路径制定了数据导入路径。" +#: source/TortoiseSVN_en.xml:1485(para) +msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a \"Webfolder\" in the Windows explorer and then access it like any other folder in the filesystem" +msgstr "Apache为基础的Subversion服务器使用WebDAV协议，许多其他程序支持这个协议，你可以在Windows资源管理器中将这样的版本库装载为一个“网络文件夹”，就像访问文件系统的其他目录一样访问它。" -#: source/TortoiseSVN_en.xml:1137(para) -msgid "Also, users of the file: scheme on Windows platforms will need to use an unofficially standard syntax for accessing repositories that are on the same machine, but on a different drive than the client's current working drive. Either of the two following URL path syntaxes will work where X is the drive on which the repository resides:" -msgstr "另外，在 Windows 平台的 file: 方案有时候需要使用一种非正式的标准协议访问本地但不是程序运行磁盘的版本库，以下两种 URL 路径语法都可以工作，其中的 X 是版本库所在的磁盘: " +#: source/TortoiseSVN_en.xml:1496(term) +msgid "Browsing The Repository" +msgstr "浏览版本库" -#: source/TortoiseSVN_en.xml:11370(entry) -msgid "Updates the working copy in to HEAD. If the option is given then a dialog is shown to ask the user to which revision the update should go. To avoid the dialog specify a revision number . Other options are and ." -msgstr "将工作副本的更新到HEAD，如果给定参数，就会弹出一个对话框询问用户需要更新到哪个修订版本。为了防止指定修订版本号的对话框，需要选项和。" +#: source/TortoiseSVN_en.xml:1498(para) +msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." +msgstr "你可以将浏览器指向版本库的URL，无需安装Subversion客户端就可以浏览内容，这样可以扩大访问你数据的用户圈。" -#: source/TortoiseSVN_en.xml:11372(option) -msgid "/rev" -msgstr "/rev" +#: source/TortoiseSVN_en.xml:1508(term) source/TortoiseSVN_en.xml:3383(title) +msgid "Authentication" +msgstr "认证" -#: source/TortoiseSVN_en.xml:11375(option) -msgid "/rev:1234" -msgstr "/rev:1234" +#: source/TortoiseSVN_en.xml:1510(para) +msgid "You can use any authentication mechanism Apache supports, including SSPI and LDAP." +msgstr "你可以使用所有Apache支持的认证机制，包括SSPI和LDAP。" -#: source/TortoiseSVN_en.xml:11376(option) -msgid "/nonrecursive" -msgstr "/nonrecursive" +#: source/TortoiseSVN_en.xml:1517(term) +msgid "Security" +msgstr "安全" -#: source/TortoiseSVN_en.xml:11377(option) -msgid "/ignoreexternals" -msgstr "/ignoreexternals" +#: source/TortoiseSVN_en.xml:1519(para) +msgid "Since Apache is very stable and secure, you automatically get the same security for your repository. This includes SSL encryption." +msgstr "因为Apache非常稳定和安全，你的版本库可以自动获得同样的安全性，包括SSL加密。" -#: source/TortoiseSVN_en.xml:11382(entry) -msgid "Opens the commit dialog. The path specifies the target directory or the list of files to commit. You can also specify the /logmsg switch to pass a predefined log message to the commit dialog. Or, if you don't want to pass the log message on the command line, use /logmsgfile:path, where points to a file containing the log message. To prefill the bug ID box (in case you've set up integration with bugtrackers properly), you can use the to do that." -msgstr "打开提交对话框，路经指定了目标路径或需要提交的文件列表，你也可以使用参数/logmsg给提交窗口传递预定义的日志信息，或者你不希望将日志传递给命令行，你也可以使用/logmsgfile:path，指向了保存日志信息的文件。为了预先填入bug的ID(如果你设置了集成bug追踪属性)，你可以使用完成这个任务。" +#: source/TortoiseSVN_en.xml:1529(title) +msgid "Installing Apache" +msgstr "安装 Apache" -#: source/TortoiseSVN_en.xml:11388(option) -msgid "path" -msgstr "path" +#: source/TortoiseSVN_en.xml:1534(para) +msgid "Please note that Windows XP without the servicepack 1 will lead to bogus network data and could therefore corrupt your repository!" +msgstr "请注意，Windows XP如果没有安装SP1将会导致不正常的网络传输，从而搞坏你的版本库！" -#: source/TortoiseSVN_en.xml:11392(option) -msgid "/bugid:\"the bug id here\"" -msgstr "/bugid:\"the bug id here\"" +#: source/TortoiseSVN_en.xml:1542(para) +msgid "Download the latest version of the Apache webserver from http://httpd.apache.org/download.cgi. Make sure that you download the version > 2.0.54 - the version 1.3.xx won't work! Also, versions lower than 2.0.54 won't work with Subversion 1.2 because of a bug in how Apache < 2.0.54 was built for Windows." +msgstr "从Apache网站http://httpd.apache.org/download.cgi下载最新版本的Apache，请确定你下载的版本高于2.0.54－1.3.xx的版本不能工作！同样，低于2.0.54的版本不能与Subversion 1.2一起工作，因为Apache低于2.0.54的Windows版本的编译存在问题。" -#: source/TortoiseSVN_en.xml:11398(entry) -msgid "Adds the files in to version control." -msgstr "将的文件添加到版本控制 。" +#: source/TortoiseSVN_en.xml:1555(para) +msgid "Once you have the Apache2 installer you can doubleclick on it and it will guide you through the installation process. Make sure that you enter the server-URL correctly (if you don't have a dns name for your server just enter the ip-address). I recommend to install apache for All Users, on Port 80, as a Service. Note: if you already have IIS or any other program running which listens on port 80 the installation might fail. If that happens, go to the programs directory, \\Apache Group\\Apache2\\conf and locate the file httpd.conf. Edit that file so that Listen 80 is changed to a free port, e.g. Listen 81. Then restart the installation - this time it should finish without problems." +msgstr "一旦你有了Apache2安装程序，你可以双击它，然后它会指导你的安装过程，请确认你输入的server的URL正确(如果你的服务器没有dns名称，请直接输入IP地址)。我建议安装Apache为所有用户，在80端口，作为一个服务。注意: 如果你已经有了IIS或其他监听80段口的程序，安装会失败，如果发生这种情况，直接到程序的安装目录\\Apache Group\\Apache2\\conf，打开httpd.conf。编辑文件的Listen 80为其他可用的端口，例如Listen 81，然后重新启动－这样就不会那个问题了。" -#: source/TortoiseSVN_en.xml:11405(entry) -msgid "Reverts local modifications of a working copy. The tells which items to revert." -msgstr "恢复工作副本的本地修改，说明恢复哪些条目。" +#: source/TortoiseSVN_en.xml:1577(para) +msgid "Now test if the Apache-webserver is running correctly by pointing your webbrowser to http://localhost/ - a preconfigured Website should show up." +msgstr "现在可以测试Apache服务器了，将浏览器指向http://localhost/－将会看到一个预先配置的网站。" -#: source/TortoiseSVN_en.xml:11413(entry) -msgid "Cleans up interrupted or aborted operations and unlocks the working copy in ." -msgstr "清理中断和终止的操作，将工作副本的解锁。" +#: source/TortoiseSVN_en.xml:1586(para) +msgid "If you decide to install Apache as a service, be warned that by default it will run as the local system account. It would be a more secure practice for you to create a separate account for Apache to run as." +msgstr "如果你决定将Apache安装为服务，缺省情况以本地系统帐户运行会发出警告，更安全的方法是为Apache创建一个单独的运行帐户。" -#: source/TortoiseSVN_en.xml:11420(entry) -msgid "Marks a conflicted file specified in as resolved. If is given, then resolving is done without asking the user first if it really should be done." -msgstr "将指定文件的冲突标示为解决，如果给定，解决不会向用户确认操作。" +#: source/TortoiseSVN_en.xml:1592(para) +msgid "Make sure that the account on the server that Apache is running as has an explicit entry in the repository directory's access control list (right-click directory | properties | security), with full control. Otherwise, users will not be able to commit their changes." +msgstr "请确认Apache运行的帐户是版本库目录的访问控制列表(右键目录|属性|安全)中一个明确的条目，对目录有完全的控制能力，否则，用户不能提交他们的修改。" -#: source/TortoiseSVN_en.xml:11423(option) -#: source/TortoiseSVN_en.xml:11489(option) -#: source/TortoiseSVN_en.xml:11616(option) -msgid "/noquestion" -msgstr "/noquestion" +#: source/TortoiseSVN_en.xml:1598(para) +msgid "Even if Apache runs as local system, you still need such an entry (which will be the SYSTEM account in this case)." +msgstr "即使Apache运行于本地系统，你仍然需要这个条目(这种情况下将是SYSTEM帐户)。" -#: source/TortoiseSVN_en.xml:11430(entry) -msgid "Creates a repository in " -msgstr "在创建一个版本库。" +#: source/TortoiseSVN_en.xml:1602(para) +msgid "If Apache does not have this permission set up, your users will get \"Access denied\" error messages, which show up in the Apache error log as error 500." +msgstr "如果没有设置Apache的访问权限，你的用户会得到“拒绝访问(Access denied)”的错误信息，在Apache的错误日志中为错误500。" -#: source/TortoiseSVN_en.xml:11436(entry) -msgid "Opens the switch dialog. The path specifies the target directory." -msgstr "打开选项对话框。路径参数指定目标目录。" +#: source/TortoiseSVN_en.xml:1530(para) +msgid "The first thing you need before installing Apache is a computer with either Windows2000 / WinXP+SP1 or Windows2003. " +msgstr "无论是Windows2000、WinXP+SP1还是Windows2003，在安装Apache之前需要做的第一件事。" -#: source/TortoiseSVN_en.xml:11443(entry) -msgid "Exports the working copy in to another directory. If the points to an unversioned directory, a dialog will ask for an URL to export to the dir in ." -msgstr "将的工作副本导出到另一个目录，如果指向另一个未版本控制目录，对话框会询问要导出到的URL。" +#: source/TortoiseSVN_en.xml:1611(title) +msgid "Installing Subversion" +msgstr "安装 Subversion" -#: source/TortoiseSVN_en.xml:11452(entry) -msgid "Opens the merge dialog. The path specifies the target directory. Three additional options can be set: , and . These pre-fill the relevant fields in the merge dialog." -msgstr "打开合并对话框，路经指定了目标目录，可以设置另外三个参数: 、和，这些值将会预先填入相关的字段。" +#: source/TortoiseSVN_en.xml:1615(para) +msgid "Download the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "从http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91下载最新版本的Subversion。" -#: source/TortoiseSVN_en.xml:11456(option) -msgid "/mergefrom:xxx" -msgstr "/mergefrom:xxx" +#: source/TortoiseSVN_en.xml:1623(para) +msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." +msgstr "运行Subversion安装程序，并根据指导安装，如果Subversion认识到你安装了Apache，你就几乎完成了工作，如果它没有找到Apache服务器，你还有额外的步骤。" -#: source/TortoiseSVN_en.xml:11457(option) -msgid "/mergeto:xxx" -msgstr "/mergeto:xxx" +#: source/TortoiseSVN_en.xml:1633(primary) +#: source/TortoiseSVN_en.xml:2044(primary) +msgid "mod_authz_svn" +msgstr "mod_authz_svn" -#: source/TortoiseSVN_en.xml:11458(option) -msgid "/fromurl:URL" -msgstr "/fromurl:URL" +#: source/TortoiseSVN_en.xml:1635(para) +msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." +msgstr "使用Windwos资源管理器，来到Subversion的安装目录(通常是c:\\program files\\Subversion)，找到文件/httpd/mod_dav_svn.so和mod_authz_svn.so，复制这些文件到Apache的模块目录(通常是c:\\program files\\apache group\\apache2\\modules )。" -#: source/TortoiseSVN_en.xml:11464(entry) -msgid "Brings up the branch/tag dialog. The is the working copy to branch/tag from." -msgstr "带来branch/tag对话框，是branch/tag在工作副本中的出处。" +#: source/TortoiseSVN_en.xml:1648(para) +msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." +msgstr "从 Subversion 安装目录将 /bin/libdb*.dll 和 /bin/intl3_svn.dll 复制到 Apache 的 bin 目录。" -#: source/TortoiseSVN_en.xml:1147(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:1656(para) +msgid "Edit Apache's configuration file (usually C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf) with a text editor such as Notepad and make the following changes:" +msgstr "使用记事本之类的文本编辑器修改Apache的配置文件(通常是 C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf)，做出如下修改: " + +#: source/TortoiseSVN_en.xml:1662(para) msgid "" -"\n" -"file:///X:/path/to/repos\n" -"...\n" -"file:///X|/path/to/repos\n" -"...\n" +"Uncomment (remove the '#' mark) the following lines: \n" +"#LoadModule dav_fs_module modules/mod_dav_fs.so\n" +"#LoadModule dav_module modules/mod_dav.so\n" +" Add the following two lines to the end of the LoadModule section. \n" +"LoadModule dav_svn_module modules/mod_dav_svn.so\n" +"LoadModule authz_svn_module modules/mod_authz_svn.so\n" +"" msgstr "" -"\n" -"file:///X:/path/to/repos\n" -"...\n" -"file:///X|/path/to/repos\n" -"...\n" +"去掉以下几行的注释(删除 '#'标记): \n" +"#LoadModule dav_fs_module modules/mod_dav_fs.so\n" +"#LoadModule dav_module modules/mod_dav.so\n" +" 将以下两行到 LoadModule 节的末尾。\n" +"LoadModule dav_svn_module modules/mod_dav_svn.so\n" +"LoadModule authz_svn_module modules/mod_authz_svn.so\n" +"" -#: source/TortoiseSVN_en.xml:11472(entry) -msgid "Opens the settings dialog." -msgstr "打开设置对话框。" +#: source/TortoiseSVN_en.xml:1681(title) source/TortoiseSVN_en.xml:9963(term) +msgid "Configuration" +msgstr "配置" -#: source/TortoiseSVN_en.xml:11478(entry) -msgid "Removes the file(s) in from version control." -msgstr "从版本控制里移除中的文件。" +#: source/TortoiseSVN_en.xml:1692(para) +msgid "" +"At the end of the Config file add the following lines: \n" +"<Location /svn>\n" +"DAV svn\n" +"SVNListParentPath on\n" +"SVNParentPath D:\\SVN\n" +"#SVNIndexXSLT \"/svnindex.xsl\"\n" +"AuthType Basic\n" +"AuthName \"Subversion repositories\"\n" +"AuthUserFile passwd\n" +"#AuthzSVNAccessFile svnaccessfile\n" +"Require valid-user\n" +"</Location>\n" +" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." +msgstr "" +"在配置文件最后添加如下几行: \n" +"<Location /svn>\n" +"DAV svn\n" +"SVNListParentPath on\n" +"SVNParentPath D:\\SVN\n" +"#SVNIndexXSLT \"/svnindex.xsl\"\n" +"AuthType Basic\n" +"AuthName \"Subversion repositories\"\n" +"AuthUserFile passwd\n" +"#AuthzSVNAccessFile svnaccessfile\n" +"Require valid-user\n" +"</Location>\n" +"这个配置告诉 Apache 你的所有 Subversion 版本库位于D:\\SVN，版本库对外的URL是: http://MyServer/svn/ 。访问被文件passwd中的用户/密码限制。" -#: source/TortoiseSVN_en.xml:11485(entry) -msgid "Renames the file in . The new name for the file is asked with a dialog. To avoid the question about renaming similar files in one step, pass ." -msgstr "重命名的文件，会在对话框中询问新文件，为了防止一个步骤中询问相似文件，传递。" +#: source/TortoiseSVN_en.xml:1719(para) +msgid "" +"To create the passwd file, open the command prompt (DOS-Box) again, change to the apache2 folder (usually c:\\program files\\apache group\\apache2) and create the file by entering \n" +"bin\\htpasswd -c passwd <username>\n" +" This will create a file with the name passwd which is used for authentication. Additional users can be added with \n" +"bin\\htpasswd passwd <username>\n" +"" +msgstr "" +"为了创建passwd文件，再次打开命令行提示符(DOS)，来到apache2目录(通常是c:\\program files\\apache group\\apache2)通过输入下面的命令创建文件\n" +"bin\\htpasswd -c passwd <username>\n" +" This will create a file with the name passwd which is used for authentication. Additional users can be added with \n" +"bin\\htpasswd passwd <username>\n" +"" -#: source/TortoiseSVN_en.xml:11494(entry) -msgid "Starts the external diff program specified in the TortoiseSVN settings. The specifies the first file. If the option is set, then the diff program is started with those two files. If is ommitted, then the diff is done between the file in and its BASE." -msgstr "启动TortoiseSVN设置的外置比较程序，指定了第一个文件，如果设置了，比较程序会启动两个文件，如果省略，比较程序会比较和它的BASE。" +#: source/TortoiseSVN_en.xml:1738(para) +msgid "Restart the Apache service again." +msgstr "再次重启Apache服务。" -#: source/TortoiseSVN_en.xml:11498(option) -#: source/TortoiseSVN_en.xml:11500(option) -msgid "/path2" -msgstr "/path2" +#: source/TortoiseSVN_en.xml:1743(para) +msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." +msgstr "将浏览器指向http://MyServer/svn/MyNewRepository(MyNewRepository是你此前创建的版本库名)，如果一切正常，你会被提示输入用户名和密码，然后你会看到版本库的内容。" -#: source/TortoiseSVN_en.xml:11507(entry) -msgid "Starts the conflicteditor specified in the TortoiseSVN settings with the correct files for the conflicted file in ." -msgstr "打开TortoiseSVN设置的冲突工具，在中需要设置冲突文件的正确文件。" +#: source/TortoiseSVN_en.xml:1682(para) +msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseSVN yet. To get Apache to know which URL shall be used for Subversion repositories you have to edit the Apache config file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " +msgstr "现在你已经设置了Apache和Subversion，但是Apache不知道如何处理Subversion客户端，例如TortoiseSVN。为了让Apache知道哪个目录是用来作为Subversion版本库，你需要使用编辑器(例如记事本)编辑Apache的配置文件(通常是c:\\program files\\apache group\\apache2\\conf\\httpd.conf): " -#: source/TortoiseSVN_en.xml:11515(entry) -msgid "Opens the relocate dialog. The specifies the working copy path to relocate." -msgstr "打开重定位对话框，指定了重定位的工作副本路径。" +#: source/TortoiseSVN_en.xml:1756(primary) +msgid "SVNPath" +msgstr "SVNPath" -#: source/TortoiseSVN_en.xml:11522(entry) -msgid "Opens the help file." -msgstr "打开帮助文件" +#: source/TortoiseSVN_en.xml:1759(primary) +#: source/TortoiseSVN_en.xml:1929(primary) +msgid "SVNParentPath" +msgstr "SVNParentPath" -#: source/TortoiseSVN_en.xml:11528(entry) -msgid "Opens the check-for-modifications dialog. The path specifies the working copy directory." -msgstr "打开为修改检出对话框，路经指定了工作副本目录。" +#: source/TortoiseSVN_en.xml:1764(title) +msgid "Apache httpd.conf Settings" +msgstr "设置 Apache 的 httpd.conf" -#: source/TortoiseSVN_en.xml:1153(para) -msgid "Note that a URL uses ordinary slashes even though the native (non-URL) form of a path on Windows uses backslashes." -msgstr "注意 URL 使用普通的斜杠，而不是 Windows 本地(非 URL)形式的路径。" +#: source/TortoiseSVN_en.xml:1770(entry) +msgid "Setting" +msgstr "设置" -#: source/TortoiseSVN_en.xml:11535(entry) -msgid "Starts the repository browser dialog, pointing to the URL of the working copy given in or points directly to an URL. An additional option can be used to specify the revision which the repository browser should show. If the is omitted, it defaults to HEAD." -msgstr "打开版本库浏览对话框，URL为工作副本指向的或直接指出的，另外一个选项是，可以用来指定要显示的修订版本号，如果省略，缺省是HEAD。" +#: source/TortoiseSVN_en.xml:1771(entry) +msgid "Explanation" +msgstr "解释" -#: source/TortoiseSVN_en.xml:11540(option) -#: source/TortoiseSVN_en.xml:11542(option) -msgid "/rev:xxx" -msgstr "/rev:xxx" +#: source/TortoiseSVN_en.xml:1776(entry) +msgid "<Location /svn>" +msgstr "<Location /svn>" -#: source/TortoiseSVN_en.xml:11548(entry) -msgid "Adds all targets in to the ignore list, i.e. adds the svn:ignore property to those files." -msgstr "将中的对象加入到忽略列表，也就是将这些文件添加到svn:ignore属性。" +#: source/TortoiseSVN_en.xml:1779(systemitem) +msgid "http://MyServer/svn/" +msgstr "http://MyServer/svn/" -#: source/TortoiseSVN_en.xml:11556(entry) -msgid "Opens the blame dialog for the file specified in . If the options and are set, then the dialog asking for the blame range is not shown but the revision values of those options are used instead. If the option is set, TortoiseBlame will open with the specified line number showing." -msgstr "打开指定文件的追溯对话框，如果设置了和，对话框询问追溯范围的对话框不会显示，如果设置了，TortoiseBlame会打开特定文件的某一行。" +#: source/TortoiseSVN_en.xml:1777(entry) +msgid "means that the Subversion repositories are available from the URL " +msgstr "意思是Subversion版本库的URL是" -#: source/TortoiseSVN_en.xml:11559(option) -msgid "startrev" -msgstr "startrev" +#: source/TortoiseSVN_en.xml:1783(entry) +msgid "DAV svn" +msgstr "DAV svn" -#: source/TortoiseSVN_en.xml:11560(option) -msgid "endrev" -msgstr "endrev" +#: source/TortoiseSVN_en.xml:1784(entry) +msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." +msgstr "告诉Apache是哪个模块响应那个URL的请求－此刻是Subversion模块。" -#: source/TortoiseSVN_en.xml:11564(option) -msgid "/line:nnn" -msgstr "/line:nnn" +#: source/TortoiseSVN_en.xml:1790(entry) +msgid "SVNListParentPath on" +msgstr "SVNListParentPath on" -#: source/TortoiseSVN_en.xml:1157(para) -msgid "You can safely access an FSFS repository via a network share, but you cannot access a BDB repository in this way." -msgstr "你可以安全的访问网络共享上 FSFS 版本库，但是你不能以这种方式访问 BDB 版本库。" +#: source/TortoiseSVN_en.xml:1791(entry) +msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under SVNParentPath." +msgstr "对于Subversion1.3或者更高版本，这个指示表示显示所有SVNParentPath下的版本库。" -#: source/TortoiseSVN_en.xml:11571(entry) -msgid "Saves a file from an URL or working copy path given in to the location given in . The revision is given in . This can be used to get a file with a specific revision." -msgstr "将指定的工作副本或URL的文件保存到，修订版本号在，这样可以得到特定修订版本的文件。" +#: source/TortoiseSVN_en.xml:1797(entry) +msgid "SVNParentPath D:\\SVN" +msgstr "SVNParentPath D:\\SVN" -#: source/TortoiseSVN_en.xml:11574(option) -msgid "/savepath:path" -msgstr "/savepath:path" +#: source/TortoiseSVN_en.xml:1800(filename) +msgid "D:\\SVN" +msgstr "D:\\SVN" -#: source/TortoiseSVN_en.xml:11575(option) -msgid "/revision:xxx" -msgstr "/revision:xxx" +#: source/TortoiseSVN_en.xml:1798(entry) +msgid "tells Subversion to look for repositories below " +msgstr "告诉Subversion需要查看的版本库位于之下" -#: source/TortoiseSVN_en.xml:11581(entry) -msgid "Creates a patch file for the path given in ." -msgstr "创建下的补丁文件。" +#: source/TortoiseSVN_en.xml:1804(entry) +msgid "SVNIndexXSLT \"/svnindex.xsl\"" +msgstr "SVNIndexXSLT \"/svnindex.xsl\"" -#: source/TortoiseSVN_en.xml:11588(entry) -msgid "Shows the revision graph for the path given in ." -msgstr "显示目录下的版本变化图。" +#: source/TortoiseSVN_en.xml:1805(entry) +msgid "Used to make the browsing with a webbrowser more pretty." +msgstr "使用它可以在用浏览器浏览时更好看。" -#: source/TortoiseSVN_en.xml:11595(entry) -msgid "Locks a file or all files in a directory. The 'lock' dialog is shown so the user can enter a comment for the lock. " -msgstr "锁定一个文件或一个目录内的所有文件。它会显示‘锁定’对话框，所以用户可以为锁定输入注释。" +#: source/TortoiseSVN_en.xml:1811(entry) +msgid "AuthType Basic" +msgstr "AuthType Basic" -#: source/TortoiseSVN_en.xml:11604(entry) -msgid "Unlocks a file or all files in a directory.. " -msgstr "解锁一个文件或一个目录内的所有文件... " +#: source/TortoiseSVN_en.xml:1812(entry) +msgid "is to activate basic authentication, i.e. Username/password" +msgstr "激活基本认证，就是用户名/密码" -#: source/TortoiseSVN_en.xml:11611(entry) -msgid "Rebuilds the windows icon cache. Only use this in case the windows icons are corrupted. A side effect of this (which can't be avoided) is that the icons on the desktop get rearranged. " -msgstr "重建windows的图标缓存，只有windows的图标缓存出了问题才需要这样做，一个副作用就是(不可避免)桌面的图标会重新组织。" +#: source/TortoiseSVN_en.xml:1818(entry) +msgid "AuthName \"Subversion repositories\"" +msgstr "AuthName \"Subversion repositories\"" -#: source/TortoiseSVN_en.xml:11621(entry) -msgid "Shows the properties dialog for the path given in ." -msgstr "显示 给出的路径之属性对话框。" +#: source/TortoiseSVN_en.xml:1819(entry) +msgid "is used as an information whenever an authentication dialog pops up to tell the user what the authentication is for" +msgstr "用来说明何时弹出要求用户输入认证信息的认证对话框" -#: source/TortoiseSVN_en.xml:11630(para) -msgid "" -"Examples (which should be entered on one line): \n" -"TortoiseProc.exe /command:commit /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n" -" /logmsg:\"test log message\" /closeonend\n" -"\n" -"TortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend\n" -"\n" -"TortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n" -" /startrev:50 /endrev:60 /closeonend\n" -"" -msgstr "" -"例子(必须在一行输入): \n" -"TortoiseProc.exe /command:commit /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n" -" /logmsg:\"test log message\" /closeonend\n" -"\n" -"TortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend\n" -"\n" -"TortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n" -" /startrev:50 /endrev:60 /closeonend\n" -"" - -#: source/TortoiseSVN_en.xml:1164(para) source/TortoiseSVN_en.xml:2681(para) -#: source/TortoiseSVN_en.xml:3056(para) -msgid "Do not create or access a Berkeley DB repository on a network share. It cannot exist on a remote filesystem. Not even if you have the network drive mapped to a drive letter. If you attempt to use Berkeley DB on a network share, the results are unpredictable - you may see mysterious errors right away, or it may be months before you discover that your repository database is subtly corrupted." -msgstr "不要创建和访问网络共享上的 Berkeley DB 版本库，它不能存在于一个远程的文件系统，即使是映射到盘符的共享。如果你希望在网络共享使用 Berkeley DB，结果难以预料－你可能会立刻看到奇怪的错误，也有可能几个月之后才发现数据库已经损坏了。" - -#: source/TortoiseSVN_en.xml:11645(title) -msgid "Command Line Interface Cross Reference" -msgstr "命令行交叉索引" - -#: source/TortoiseSVN_en.xml:11647(primary) -msgid "command line client" -msgstr "命令行客户端" - -#: source/TortoiseSVN_en.xml:11650(primary) -msgid "CLI" -msgstr "CLI" - -#: source/TortoiseSVN_en.xml:11653(para) -msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseSVN is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseSVN's GUI operations." -msgstr "有时候，本手册会参考Subversion的文档，会以命令行方式(CLI)描述Subversion术语，为了理解TortoiseSVN后台的操作，我们编辑了一份列表，用来展示命令行命令和对应的TortoiseSVN的GUI操作的关系。" - -#: source/TortoiseSVN_en.xml:11662(para) -msgid "Even though there are CLI equivalents to what TortoiseSVN does, remember that TortoiseSVN does not call the CLI but uses the Subversion library directly." -msgstr "即使有命令行对应TortoiseSVN的操作，请记住TortoiseSVN没有调用命令行，而是直接使用了Subversion库。" - -#: source/TortoiseSVN_en.xml:11668(para) -msgid "If you think you have found a bug in TortoiseSVN, we may ask you to try to reproduce it using the CLI, so that we can distinguish TSVN issues from Subversion issues. This reference tells you which command to try." -msgstr "如果你发现了TortoiseSVN的bug，我们会希望你能用命令行重现它，这样我们可以区分这是TSVN还是Subversion的问题，这个参考告诉你该找那个命令。" +#: source/TortoiseSVN_en.xml:1825(entry) +msgid "AuthUserFile passwd" +msgstr "AuthUserFile passwd" -#: source/TortoiseSVN_en.xml:11676(title) -msgid "Conventions and Basic Rules" -msgstr "约定和基本规则" +#: source/TortoiseSVN_en.xml:1826(entry) +msgid "specifies which password file to use for authentication" +msgstr "指定使用的认证密码文件" -#: source/TortoiseSVN_en.xml:11677(para) -msgid "In the descriptions which follow, the URL for a repository location is shown simply as URL, and an example might be http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk. The working copy path is shown simply as PATH, and an example might be C:\\TortoiseSVN\\trunk." -msgstr "在这个描述里，版本库位置URL使用URL显示，一个例子是http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk，工作副本使用PATH显示，一个例子是C:\\TortoiseSVN\\trunk。" +#: source/TortoiseSVN_en.xml:1831(entry) +msgid "AuthzSVNAccessFile" +msgstr "AuthzSVNAccessFile" -#: source/TortoiseSVN_en.xml:11687(para) -msgid "Because TortoiseSVN is a Windows Shell Extension, it is not able to use the notion of a current working directory. All working copy paths must be given using the absolute path, not a relative path." -msgstr "因为TortoiseSVN是一个Windows外壳扩展，它不能使用当前工作副本的概念，所有的工作副本必须使用绝对路径，而不是相对的。" +#: source/TortoiseSVN_en.xml:1832(entry) +msgid "Location of the Access file for paths inside a Subversion repository" +msgstr "位置Subversion版本库的访问控制文件的路径" -#: source/TortoiseSVN_en.xml:11694(para) -msgid "Certain items are optional, and these are often controlled by checkboxes or radio buttons in TortoiseSVN. These options are shown in [square brackets] in the command line definitions." -msgstr "特定项目是可选的，TortoiseSVN里这是通过多选项和单选项控制的，这些选项是在命令行定义的[方括号]里显示的。" +#: source/TortoiseSVN_en.xml:1838(entry) +msgid "Require valid-user" +msgstr "Require valid-user" -#: source/TortoiseSVN_en.xml:11703(title) -#: source/TortoiseSVN_en.xml:12205(glossterm) -msgid "Checkout" -msgstr "检出" +#: source/TortoiseSVN_en.xml:1839(entry) +msgid "specifies that only users who entered a correct username/password are allowed to access the URL" +msgstr "指定只有输入了正确的用户/密码的用户可以访问URL" -#: source/TortoiseSVN_en.xml:11704(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:1851(para) msgid "" -"\n" -"svn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n" +"If you want your repository to have read access for everyone but write access only for specific users you can change the line \n" +"Require valid-user\n" +" to \n" +"<LimitExcept GET PROPFIND OPTIONS REPORT>\n" +"Require valid-user\n" +"</LimitExcept>\n" +"" msgstr "" -"\n" -"svn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n" - -#: source/TortoiseSVN_en.xml:11707(para) -msgid "If Only checkout the top folder is checked, use the -N switch." -msgstr "如果希望只检出顶级目录被选中，使用-N选项。" - -#: source/TortoiseSVN_en.xml:11711(para) source/TortoiseSVN_en.xml:11754(para) -msgid "If Omit externals is checked, use the --ignore-externals switch." -msgstr "如果希望忽略外部被选中，使用--ignore-externals选型。" - -#: source/TortoiseSVN_en.xml:11715(para) -msgid "If you are checking out a specific revision, specify that after the URL using -r switch." -msgstr "如果你正在检出特定的修订版本，在URL后使用-r指定。" - -#: source/TortoiseSVN_en.xml:11721(title) -#: source/TortoiseSVN_en.xml:12511(glossterm) -msgid "Update" -msgstr "更新" +"如果你希望所有人可以读你的版本库，但是只有特定用户可以写，你可以修改下面几行\n" +"Require valid-user\n" +" to \n" +"<LimitExcept GET PROPFIND OPTIONS REPORT>\n" +"Require valid-user\n" +"</LimitExcept>\n" +"" -#: source/TortoiseSVN_en.xml:11722(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:1866(para) msgid "" -"\n" -"svn info URL_of_WC\n" -"svn update [-r rev] PATH\n" +"Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" +"#AuthzSVNAccessFile svnaccessfile\n" +" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" -"\n" -"svn info URL_of_WC\n" -"svn update [-r rev] PATH\n" - -#: source/TortoiseSVN_en.xml:11726(para) -msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseSVN first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." -msgstr "更新多个项目在Subversion还不是原子操作，所以TortoiseSVN会首先找到版本库的HEAD修订版本，然后将所有项目更新到特定修订版本，防止出现混合修订版本的工作副本。" - -#: source/TortoiseSVN_en.xml:11733(para) -msgid "If only one item is selected for updating or the selected items are not all from the same repository, TortoiseSVN just updates to HEAD." -msgstr "如果只有一个项目被选中更新，或选中的项目来自不同的版本库，TortoiseSVN只会更新到HEAD。" - -#: source/TortoiseSVN_en.xml:11738(para) -msgid "No command line options are used here. Update to revision also implements the update command, but offers more options." -msgstr "没有使用命令行选项，更新到修订版本也实现了更新命令，但提供了更多的选项。" - -#: source/TortoiseSVN_en.xml:1174(para) -msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." -msgstr "假定你修改了 button.c，因为 .svn 目录记录着文件的修改日期和原始内容，Subversion 可以告诉你已经修改了文件，然而，在你明确告诉它之前，Subversion 不会将你的改变公开。将改变公开的操作被叫做提交(或者是检入)，它提交修改到版本库中。" - -#: source/TortoiseSVN_en.xml:11745(title) -msgid "Update to Revision" -msgstr "更新到版本" +"使用passwd可以整体的控制对版本库的访问，但是如果你希望精确的控制版本库目录访问，你可以修改需要下面几行\n" +"#AuthzSVNAccessFile svnaccessfile\n" +"，并且创建Subversion的访问控制文件。Apache将会确保只有有效的用户可以访问你的/svn目录，然后将用户名传递给Subversion的AuthzSVNAccessFile模块，这样就可以根据Subversion访问控制文件实现更细粒度的访问控制。请注意路径可以是repos:path或简单的path，如果你不指定特定的版本库，访问控制规则会应用到SVNParentPath下所有的版本库，使用的授权策略文件的格式将在描述。" -#: source/TortoiseSVN_en.xml:11746(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:1893(para) msgid "" -"\n" -"svn info URL_of_WC\n" -"svn update [-r rev] [-N] [--ignore-externals] PATH\n" +"To make browsing the repository with a web browser more 'pretty', uncomment the line \n" +"#SVNIndexXSLT \"/svnindex.xsl\"\n" +" and put the files svnindex.xsl, svnindex.css and menucheckout.ico in your document root directory (usually C:/Program Files/Apache Group/Apache2/htdocs). The directory is set with the DocumentRoot directive in your Apache config file." msgstr "" -"\n" -"svn info URL_of_WC\n" -"svn update [-r rev] [-N] [--ignore-externals] PATH\n" +"如果要使浏览器浏览仓库时更“漂亮”，请将下行去掉注释 \n" +"#SVNIndexXSLT \"/svnindex.xsl\"\n" +"，将文件 svnindex.xsl, svnindex.css 和 menucheckout.ico 放到你的文档根目录中(通常是 C:/Program Files/Apache Group/Apache2/htdocs)。 这个目录在 Apache 配置文件中用 DocumentRoot 指示。" -#: source/TortoiseSVN_en.xml:11750(para) -msgid "If Only update the top folder is checked, use the -N switch." -msgstr "如果希望只更新顶级目录，使用-N选项。" +#: source/TortoiseSVN_en.xml:1906(para) +msgid "You can get those three files directly from our source repository at http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/svnindex. If you're asked for authentication for this link, enter guest as username and leave the password empty." +msgstr "你可以直接在我们的代码库http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/svnindex中拿到这三个文件。如果访问这个链接需要认证，输入用户名称 guest，无需密码。" -#: source/TortoiseSVN_en.xml:11760(title) -#: source/TortoiseSVN_en.xml:12231(glossterm) -msgid "Commit" -msgstr "提交" +#: source/TortoiseSVN_en.xml:1915(para) +msgid "The xsl file from the TortoiseSVN repository has a nice gimmick: if you browse the repository with your webbrowser, then every folder in your repository has an icon on the right shown. If you click on that icon, the TortoiseSVN checkout dialog is started for this URL." +msgstr "TortoiseSVN 版本库中的 xsl 文件有个特性：如果你用浏览器浏览版本库，那么每个版本库中的目录右边会有个图标。如果你点击此图标，那么 TortoiseSVN 会为此 URL 启动检出对话框。" -#: source/TortoiseSVN_en.xml:11761(para) -msgid "In TortoiseSVN, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." -msgstr "在TortoiseSVN，提交对话框使用Subversion命令，第一部分是检查工作副本哪些文件可能被提交，然后你可以检查列表，比较与BASE的区别，选择你希望提交包含的项目。" +#: source/TortoiseSVN_en.xml:1761(para) +msgid "A short explanation of what you just entered: But that's just an example. There are many, many more possibilities of what you can do with the Apache webserver. " +msgstr "你刚才输入的解释是: 但是那只是一个例子，对于Apache你有很多的选择。" -#: source/TortoiseSVN_en.xml:11768(screen) -#: source/TortoiseSVN_en.xml:11930(screen) -#: source/TortoiseSVN_en.xml:11958(screen) -#, no-wrap -msgid "" -"\n" -"svn status -v PATH\n" -msgstr "" -"\n" -"svn status -v PATH\n" +#: source/TortoiseSVN_en.xml:1927(title) +msgid "Multiple Repositories" +msgstr "多版本库" -#: source/TortoiseSVN_en.xml:11771(para) source/TortoiseSVN_en.xml:11859(para) -msgid "If Show unversioned files is checked, TortoiseSVN will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." -msgstr "如果选择了显示未版本控制的文件，TortoiseSVN会遵循忽略规则显示工作目录中所有未版本控制的文件和文件夹。这个特性在Subversion中没有等价操作，因为svn status 命令不扫描未版本控制的文件夹。" +#: source/TortoiseSVN_en.xml:1932(primary) +msgid "Index of projects" +msgstr "项目索引" -#: source/TortoiseSVN_en.xml:11779(para) -msgid "If you check any unversioned files and folders, those items will first be added to your working copy." -msgstr "如果你选择了未版本控制的文件和文件夹，这些项目都会先增加到你的工作副本。" +#: source/TortoiseSVN_en.xml:1934(para) +msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file everytime you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseSVN command TortoiseSVNCreate repository here... and a new project has a home..." +msgstr "如果你使用SVNParentPath指示，你就不必在每次添加新Subversion版本库时修改Apache的配置文件，只需要在第一个版本库所在的位置建立新的版本库就可以了。在我的公司，我可以使用SMB(普通的windows文件访问)直接访问服务器的文件夹，所以我直接在那里创建一个目录，运行TortoiseSVN命令TortoiseSVN在此创建版本库...，然后一个新的项目..." -#: source/TortoiseSVN_en.xml:11783(screen) -#: source/TortoiseSVN_en.xml:12073(screen) -#, no-wrap -msgid "" -"\n" -"svn add PATH...\n" -msgstr "" -"\n" -"svn add PATH...\n" +#: source/TortoiseSVN_en.xml:1948(para) +msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." +msgstr "如果你使用Subversion 1.3或更高版本，可以使用SVNListParentPath on指示，这样当你使用浏览器访问父路径而不是具体某个版本库时就会显示所有版本库列表。" -#: source/TortoiseSVN_en.xml:11786(para) -msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseSVN uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." -msgstr "当你点击确认，开始执行Subversion提交。如果你不修改所有的文件检查框，TortoiseSVN 会递归提交工作副本。如果你取消选择一些文件，那么就必须使用非递归提交 (-N) ，每个路径都必须在命令行上单独指定。" +#: source/TortoiseSVN_en.xml:1954(para) +msgid "If your Subversion server is earlier than 1.3 you will just get a nasty error page showing. To get a nice looking listing of all available projects instead, you can use the following PHP script which generates the index for you automatically. (You will need to install PHP on your server in order to use the script shown below)." +msgstr "如果你的Subversion是早于1.3的版本，你会得到错误页，为了得到一个更好看的项目列表，你可以使用下面PHP脚本为你自动生成索引。(为了使用下面的PHP，你需要安装PHP)。" -#: source/TortoiseSVN_en.xml:11794(screen) +#: source/TortoiseSVN_en.xml:1963(programlisting) #, no-wrap msgid "" "\n" -"svn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n" -msgstr "" -"\n" -"svn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n" - -#: source/TortoiseSVN_en.xml:11797(para) source/TortoiseSVN_en.xml:12003(para) -#: source/TortoiseSVN_en.xml:12086(para) -msgid "LogMessage here represents the contents of the log message edit box. This can be empty." -msgstr "日志消息是日志编辑框的内容。它可以为空。" - -#: source/TortoiseSVN_en.xml:11801(para) -msgid "If Keep locks is checked, use the --no-unlock switch." -msgstr "如果选择了保持锁，就使用--no-unlock开关。" - -#: source/TortoiseSVN_en.xml:11807(title) -#: source/TortoiseSVN_en.xml:12277(glossterm) -msgid "Diff" -msgstr "差异" - -#: source/TortoiseSVN_en.xml:11808(screen) -#, no-wrap -msgid "" +"<html>\n" +"<head>\n" +"<title>Subversion Repositories</title>\n" +"</head>\n" +"<body>\n" "\n" -"svn diff PATH\n" -msgstr "" +"<h2>Subversion Repositories</h2>\n" +"<p>\n" +"<?php\n" +" $svnparentpath = \"C:/svn\";\n" +" $svnparenturl = \"/svn\";\n" "\n" -"svn diff PATH\n" - -#: source/TortoiseSVN_en.xml:11811(para) -msgid "If you use Diff from the main context menu, you are diffing a modified file against its BASE revision. The output from the CLI command above also does this and produces output in unified-diff format. However, this is not what TortoiseSVN is using. TortoiseSVN uses TortoiseMerge (or a diff program of your choosing) to display differences visually between fulltext files, so there is no direct CLI equivalent." -msgstr "如果你在右键菜单使用差异，就会将修改的文件与基础版本比较。控制台的命令输出也是执行这个操作，输出统一差异格式。然而，TortoiseSVN不使用它。TortoiseSVN 使用TortoiseMerge (或者你选择的比较差异程序)可视化的全文显示差异，所以它没有控制台等价操作。" - -#: source/TortoiseSVN_en.xml:11820(para) -msgid "You can also diff any 2 files using TortoiseSVN, whether or not they are version controlled. TortoiseSVN just feeds the two files into the chosen diff program and lets it work out where the differences lie." -msgstr "你可以使用TortoiseSVN,比较任意两个文件的差异，不管他们是否受版本控制。TortoiseSVN只是把这两个文件传递给已经选择的比较差异程序，让它比较差异。" - -#: source/TortoiseSVN_en.xml:11828(title) -msgid "Show Log" -msgstr "显示日志" - -#: source/TortoiseSVN_en.xml:11829(screen) -#, no-wrap -msgid "" -"\n" -"svn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n" -" or\n" -"svn log -v -r M:N [--stop-on-copy] PATH\n" -msgstr "" -"\n" -"svn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n" -" 或者\n" -"svn log -v -r M:N [--stop-on-copy] PATH\n" - -#: source/TortoiseSVN_en.xml:11834(para) -msgid "By default, TortoiseSVN tries to fetch 100 log messages using the --limit method. If the settings instruct it to use old APIs, then the second form is used to fetch the log messages for 100 repository revisions." -msgstr "默认情况下，TortoiseSVN尝试用--limit方法取得100个日志消息。如果设置了让它使用旧借口，那么就使用第二种个是获得100个日志消息。" - -#: source/TortoiseSVN_en.xml:1184(para) -msgid "To publish your changes to others, you can use Subversion's commit command." -msgstr "发布你的修改给别人，可以使用 Subversion 的提交命令。" - -#: source/TortoiseSVN_en.xml:11840(para) -msgid "If Stop on copy/rename is checked, use the --stop-on-copy switch." -msgstr "如果选择了停止于复制/改名，就使用--stop-on-copy开关。" - -#: source/TortoiseSVN_en.xml:11846(title) -#: source/TortoiseSVN_en.xml:4748(title) -msgid "Check for Modifications" -msgstr "检查所作的修改" - -#: source/TortoiseSVN_en.xml:11847(screen) -#, no-wrap -msgid "" -"\n" -"svn status -v PATH\n" -" or\n" -"svn status -u -v PATH\n" -msgstr "" +" $dh = opendir( $svnparentpath );\n" +" if( $dh ) {\n" +" while( $dir = readdir( $dh ) ) {\n" +" $svndir = $svnparentpath . \"/\" . $dir;\n" +" $svndbdir = $svndir . \"/db\";\n" +" $svnfstypefile = $svndbdir . \"/fs-type\";\n" +" if( is_dir( $svndir ) && is_dir( $svndbdir ) ) {\n" +" echo \"<a href=\\\"\" . $svnparenturl . \"/\" .\n" +" $dir . \"\\\">\" . $dir . \"</a>\\n\";\n" +" if( file_exists( $svnfstypefile ) ) {\n" +" $handle = fopen (\"$svnfstypefile\", \"r\");\n" +" $buffer = fgets($handle, 4096);\n" +" fclose( $handle );\n" +" $buffer = chop( $buffer );\n" +" if( strcmp( $buffer, \"fsfs\" )==0 ) {\n" +" echo \" (FSFS) <br />\\n\";\n" +" } else {\n" +" echo \" (BDB) <br />\\n\";\n" +" }\n" +" } else {\n" +" echo \" (BDB) <br />\\n\";\n" +" }\n" +" }\n" +" }\n" +" closedir( $dh );\n" +" }\n" +"?>\n" +"</p>\n" "\n" -"svn status -v PATH\n" -" 或者\n" -"svn status -u -v PATH\n" - -#: source/TortoiseSVN_en.xml:11852(para) -msgid "The initial status check looks only at your working copy. If you click on Check repository then the repository is also checked to see which files would be changed by an update, which requires the -u switch." -msgstr "只在你的工作副本执行初始的状态检查。如果你点击检查版本库，那么也检查版本库，察看哪些文件会被更新操作修改，它需要-u开关。" - -#: source/TortoiseSVN_en.xml:11869(title) -msgid "Revision Graph" -msgstr "版本图" - -#: source/TortoiseSVN_en.xml:11870(para) -msgid "The revision graph is a feature of TortoiseSVN only. There's no equivalent in the command line client." -msgstr "版本图是TortoiseSVN特有的，命令行客户端没有等价实现。" - -#: source/TortoiseSVN_en.xml:11874(para) -msgid "" -"What TortoiseSVN does is an \n" -"svn info URL_of_WC\n" -"svn log -v URL\n" -" where URL is the repository root and then analyzes the data returned." +"</body>\n" +"</html>\n" msgstr "" -"TortoiseSVN执行了这些操作 \n" -"svn info URL_of_WC\n" -"svn log -v URL\n" -"其中URL是版本库的 根，返回分析数据。" - -#: source/TortoiseSVN_en.xml:1188(para) -msgid "Now your changes to button.c have been committed to the repository; if another user checks out a working copy of /calc, they will see your changes in the latest version of the file." -msgstr "这时你对 button.c 的修改已经提交到了版本库，如果其他人取出了 /calc 的一个工作副本，他们会看到这个文件最新的版本。" - -#: source/TortoiseSVN_en.xml:11885(title) -msgid "Repo Browser" -msgstr "版本库浏览器" - -#: source/TortoiseSVN_en.xml:11886(screen) -#, no-wrap -msgid "" "\n" -"svn info URL_of_WC\n" -"svn list [-r rev] -v URL\n" -msgstr "" +"<html>\n" +"<head>\n" +"<title>Subversion Repositories</title>\n" +"</head>\n" +"<body>\n" "\n" -"svn info URL_of_WC\n" -"svn list [-r rev] -v URL\n" - -#: source/TortoiseSVN_en.xml:11890(para) -msgid "You can use svn info to determine the repository root, which is the top level shown in the repository browser. You cannot navigate Up above this level. Also, this command returns all the locking information shown in the repository browser." -msgstr "你可以使用svn info检查版本库的根，它在版本库浏览器的顶级显示。你不能浏览它的上级目录。同样，这个命令返回所有显示在版本库浏览器的锁信息。" - -#: source/TortoiseSVN_en.xml:11897(para) -msgid "The svn list call will list the contents of a directory, given a URL and revision." -msgstr "给出URL和可选的版本号，svn list列出目录中的内容。" - -#: source/TortoiseSVN_en.xml:11903(title) -msgid "Edit Conflicts" -msgstr "编辑冲突" - -#: source/TortoiseSVN_en.xml:11904(para) -msgid "This command has no CLI equivalent. It invokes TortoiseMerge or an external 3-way diff/merge tool to look at the files involved in the conflict and sort out which lines to use." -msgstr "这个命令没有控制台等价实现。它调用TortoiseMerge或者外部三路差异/合并工具察看棘手的冲突，挑选出冲突行。" - -#: source/TortoiseSVN_en.xml:11911(title) -msgid "Resolved" -msgstr "已解决" - -#: source/TortoiseSVN_en.xml:11912(screen) -#, no-wrap -msgid "" +"<h2>Subversion Repositories</h2>\n" +"<p>\n" +"<?php\n" +" $svnparentpath = \"C:/svn\";\n" +" $svnparenturl = \"/svn\";\n" "\n" -"svn resolved PATH\n" -msgstr "" +" $dh = opendir( $svnparentpath );\n" +" if( $dh ) {\n" +" while( $dir = readdir( $dh ) ) {\n" +" $svndir = $svnparentpath . \"/\" . $dir;\n" +" $svndbdir = $svndir . \"/db\";\n" +" $svnfstypefile = $svndbdir . \"/fs-type\";\n" +" if( is_dir( $svndir ) && is_dir( $svndbdir ) ) {\n" +" echo \"<a href=\\\"\" . $svnparenturl . \"/\" .\n" +" $dir . \"\\\">\" . $dir . \"</a>\\n\";\n" +" if( file_exists( $svnfstypefile ) ) {\n" +" $handle = fopen (\"$svnfstypefile\", \"r\");\n" +" $buffer = fgets($handle, 4096);\n" +" fclose( $handle );\n" +" $buffer = chop( $buffer );\n" +" if( strcmp( $buffer, \"fsfs\" )==0 ) {\n" +" echo \" (FSFS) <br />\\n\";\n" +" } else {\n" +" echo \" (BDB) <br />\\n\";\n" +" }\n" +" } else {\n" +" echo \" (BDB) <br />\\n\";\n" +" }\n" +" }\n" +" }\n" +" closedir( $dh );\n" +" }\n" +"?>\n" +"</p>\n" "\n" -"svn resolved PATH\n" - -#: source/TortoiseSVN_en.xml:11917(title) -msgid "Rename" -msgstr "改名" +"</body>\n" +"</html>\n" -#: source/TortoiseSVN_en.xml:11918(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2014(para) msgid "" -"\n" -"svn rename CURR_PATH NEW_PATH\n" +"Uncomment (remove the '#' char) from the following line in your Apache config file: \n" +"#LoadModule rewrite_module modules/mod_rewrite.so\n" +"" msgstr "" -"\n" -"svn rename CURR_PATH NEW_PATH\n" - -#: source/TortoiseSVN_en.xml:11923(title) -#: source/TortoiseSVN_en.xml:12265(glossterm) -msgid "Delete" -msgstr "删除" +"去掉Apache配置文件中下面这一行的注释(去掉字符'#'): \n" +"#LoadModule rewrite_module modules/mod_rewrite.so\n" +"" -#: source/TortoiseSVN_en.xml:11924(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2023(para) msgid "" -"\n" -"svn delete PATH\n" +"Add the following lines just below your <Location> block where you define your Subversion stuff: \n" +" RewriteEngine on\n" +" RewriteRule ^/svn$ /svn_index.php [PT]\n" +" RewriteRule ^/svn/$ /svn_index.php [PT]\n" +" RewriteRule ^/svn/index.html$ /svn_index.php [PT] \n" +"" msgstr "" -"\n" -"svn delete PATH\n" +"在你的<Location>里定义Subversion功能的下面增加如下几行: \n" +" RewriteEngine on\n" +" RewriteRule ^/svn$ /svn_index.php [PT]\n" +" RewriteRule ^/svn/$ /svn_index.php [PT]\n" +" RewriteRule ^/svn/index.html$ /svn_index.php [PT] \n" +"" -#: source/TortoiseSVN_en.xml:11929(title) -#: source/TortoiseSVN_en.xml:12444(glossterm) -msgid "Revert" -msgstr "恢复" +#: source/TortoiseSVN_en.xml:2008(para) +msgid "Save the lines above to a file svn_index.php and store that file in your web root folder. Next you have to tell Apache to show that page instead of the error: " +msgstr "将上面的内容存为svn_index.php，放在你的web根目录，然后你要告诉Apache显示此页而不是错误: " -#: source/TortoiseSVN_en.xml:11933(para) -msgid "The first stage is a status check which determines the items in your working copy which can potentially be reverted. You can review the list, diff files against BASE and select the items you want to be included in the revert." -msgstr "首先开始状态检查，察看你的工作副本有哪些项目可以被撤销。你可以复审文件列表，检查这些文件的修改，然后选择你要撤销的项目。" +#: source/TortoiseSVN_en.xml:2039(title) +msgid "Path-Based Authorization" +msgstr "路径为基础的授权" -#: source/TortoiseSVN_en.xml:11939(para) -msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseSVN uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." -msgstr "当你点击确认时，开始Subversion撤销操作。如果你不修改所有的文件检查框，TortoiseSVN 会递归撤销 (-R)工作副本的修改。如果你取消选择一些文件，那么就必须使用非递归撤销 ，每个路径都必须在命令行上单独指定。\"" +#: source/TortoiseSVN_en.xml:2041(primary) +msgid "Authorization" +msgstr "授权" -#: source/TortoiseSVN_en.xml:1194(para) -msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Subversion only modifies working copies at the user's request." -msgstr "设你有个合作者，Sally，她和你同时取出了 /calc 的一个工作副本，你提交了你对 button.c 的修改，Sally 的工作副本并没有改变，Subversion 只在用户要求的时候才改变工作副本。" +#: source/TortoiseSVN_en.xml:2046(para) +msgid "The mod_authz_svn module permits fine-grained control of access permissions based on usernames and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." +msgstr "mod_authz_svn模块可以根据用户名和路径实现细粒度的权限控制，对所有的Apache服务器有效，在Subversion 1.3以上版本的svnserve上也实现了路径为基础的授权。" -#: source/TortoiseSVN_en.xml:11946(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2052(para) msgid "" -"\n" -"svn revert [-R] PATH...\n" +"An example file would look like this: \n" +"[groups]\n" +"admin = john, kate\n" +"devteam1 = john, rachel, sally\n" +"devteam2 = kate, peter, mark\n" +"docs = bob, jane, mike\n" +"training = zak\n" +"# Default access rule for ALL repositories\n" +"# Everyone can read, admins can write, Dan German is excluded.\n" +"[/]\n" +"* = r\n" +"@admin = rw\n" +"dangerman =\n" +"# Allow developers complete access to their project repos\n" +"[proj1:/]\n" +"@devteam1 = rw\n" +"[proj2:/]\n" +"@devteam2 = rw\n" +"[bigproj:/]\n" +"@devteam1 = rw\n" +"@devteam2 = rw\n" +"trevor = rw\n" +"# Give the doc people write access to all the docs folders\n" +"[/trunk/doc]\n" +"@docs = rw\n" +"# Give trainees write access in the training repository only\n" +"[TrainingRepos:/]\n" +"@training = rw\n" +"" msgstr "" -"\n" -"svn revert [-R] PATH...\n" +"一个可能的例子: \n" +"[groups]\n" +"admin = john, kate\n" +"devteam1 = john, rachel, sally\n" +"devteam2 = kate, peter, mark\n" +"docs = bob, jane, mike\n" +"training = zak\n" +"# Default access rule for ALL repositories\n" +"# Everyone can read, admins can write, Dan German is excluded.\n" +"[/]\n" +"* = r\n" +"@admin = rw\n" +"dangerman =\n" +"# Allow developers complete access to their project repos\n" +"[proj1:/]\n" +"@devteam1 = rw\n" +"[proj2:/]\n" +"@devteam2 = rw\n" +"[bigproj:/]\n" +"@devteam1 = rw\n" +"@devteam2 = rw\n" +"trevor = rw\n" +"# Give the doc people write access to all the docs folders\n" +"[/trunk/doc]\n" +"@docs = rw\n" +"# Give trainees write access in the training repository only\n" +"[TrainingRepos:/]\n" +"@training = rw\n" +"" -#: source/TortoiseSVN_en.xml:11951(title) -#: source/TortoiseSVN_en.xml:12214(glossterm) -#: source/TortoiseSVN_en.xml:6513(title) -msgid "Cleanup" -msgstr "清理" +#: source/TortoiseSVN_en.xml:2084(para) +msgid "Note that checking every path can be an expensive operation, particularly in the case of the revision log. The server checks every changed path in each revision and checks it for readability, which can be time-consuming on revisions which affect large numbers of files." +msgstr "请注意，检查每一条路径是一件消耗极大的操作，特别是修订版本日志，服务器会检查在每一个修订版本的每一条路径是否可读，对于影响很多文件的修订将会花费很多时间。" -#: source/TortoiseSVN_en.xml:11952(screen) -#, no-wrap -msgid "" -"\n" -"svn cleanup PATH\n" -msgstr "" -"\n" -"svn cleanup PATH\n" +#: source/TortoiseSVN_en.xml:2091(para) +msgid "Authentication and authorizarion are separate processes. If a user wants to gain access to a repository path, she has to meet both, the usual authentication requirements and the authorization requirements of the access file." +msgstr "认证和授权是不同的过程，如果用户希望获得对版本库的访问，他需要同时实现这两个步骤，对于要访问文件的普通认证请求和授权请求。" -#: source/TortoiseSVN_en.xml:11957(title) -msgid "Get Lock" -msgstr "获得锁" +#: source/TortoiseSVN_en.xml:2099(title) +msgid "Authentication With a Windows Domain" +msgstr "使用 Windows 域认证" -#: source/TortoiseSVN_en.xml:11961(para) -msgid "The first stage is a status check which determines the files in your working copy which can potentially be locked. You can select the items you want to be locked." -msgstr "首先开始状态检查，察看你的工作副本有哪些项目可以被加锁。你可以选择想加锁的项目。" +#: source/TortoiseSVN_en.xml:2101(primary) +msgid "Windows domain" +msgstr "Windows 域" -#: source/TortoiseSVN_en.xml:11966(screen) -#, no-wrap -msgid "" -"\n" -"svn lock -m \"LockMessage\" [--force] PATH...\n" -msgstr "" -"\n" -"svn lock -m \"LockMessage\" [--force] PATH...\n" +#: source/TortoiseSVN_en.xml:2104(primary) +msgid "domaincontroller" +msgstr "域控制器" -#: source/TortoiseSVN_en.xml:11969(para) -msgid "LockMessage here represents the contents of the lock message edit box. This can be empty." -msgstr "加锁信息是加锁编辑框的内容。它可以为空。\"" +#: source/TortoiseSVN_en.xml:2106(para) +msgid "As you might have noticed you need to make a username/password entry in the passwd file for each user separately. And if (for security reasons) you want your users to periodically change their passwords you have to make the change manually." +msgstr "你已经注意到了，你需要为每个用户在passwd文件中创建用户名/密码条目，如果(因为安全原因)他们希望周期性的修改他们的密码，你需要手动的做出修改。" -#: source/TortoiseSVN_en.xml:11973(para) -msgid "If Steal the locks is checked, use the --force switch." -msgstr "如果选择了强制锁定 ，就使用--force开关。" +#: source/TortoiseSVN_en.xml:2113(para) +msgid "But there's a solution for that problem - at least if you're accessing the repository from inside a LAN with a windows domain controller: mod_auth_sspi!" +msgstr "但是对于此问题有另一个解决方案－至少是你在使用域控制器的LAN中访问版本库时: mod_auth_sspi！" -#: source/TortoiseSVN_en.xml:11979(title) -msgid "Release Lock" -msgstr "释放锁" +#: source/TortoiseSVN_en.xml:2119(primary) +msgid "SSPI" +msgstr "SSPI" -#: source/TortoiseSVN_en.xml:11980(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2121(para) +msgid "The original SSPI module was offered by Syneapps including sourcecode. But the development for it has been stopped. But don't despair, the community has picked it up and improved it. It has a new home on SourceForge." +msgstr "最初的SSPI是由Syneapps提供的，包括源代码，但是此开发已经终止，不过不要失望，社区重新拾起代码并进行了改进，它现在的新主页在SourceForge。" + +#: source/TortoiseSVN_en.xml:2132(para) +msgid "Download the module, copy the file mod_auth_sspi.so into the Apache modules folder." +msgstr "下载这个模块，将文件mod_auth_sspi.so复制到Apache的modules目录。" + +#: source/TortoiseSVN_en.xml:2139(para) msgid "" -"\n" -"svn unlock PATH\n" +"Edit the Apache config file: add the line \n" +"LoadModule sspi_auth_module modules/mod_auth_sspi.so\n" +" to the LoadModule's section. Make sure you insert this line before the line \n" +"LoadModule auth_module modules/mod_auth.so\n" +"" msgstr "" -"\n" -"svn unlock PATH\n" - -#: source/TortoiseSVN_en.xml:11985(title) -msgid "Branch/Tag" -msgstr "分支/标记" +"编辑Apache的配置文件: 增加行\n" +"LoadModule sspi_auth_module modules/mod_auth_sspi.so\n" +" to the LoadModule's section. Make sure you insert this line before the line \n" +"LoadModule auth_module modules/mod_auth.so\n" +"" -#: source/TortoiseSVN_en.xml:11986(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2152(para) msgid "" -"\n" -"svn copy -m \"LogMessage\" URL URL\n" -" or\n" -"svn copy -m \"LogMessage\" URL@rev URL@rev\n" -" or\n" -"svn copy -m \"LogMessage\" PATH URL\n" +"To make the Subversion location use this type of authentication you have to change the line \n" +"AuthType Basic\n" +" to \n" +"AuthType SSPI\n" +" also you need to add \n" +"SSPIAuth On\n" +"SSPIAuthoritative On\n" +"SSPIDomain <domaincontroller>\n" +"SSPIOmitDomain on\n" +"SSPIUsernameCase lower\n" +"SSPIPerRequestAuth on\n" +"SSPIOfferBasic On\n" +" within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" -"\n" -"svn copy -m \"LogMessage\" URL URL\n" -" 或\n" -"svn copy -m \"LogMessage\" URL@rev URL@rev\n" -" 或\n" -"svn copy -m \"LogMessage\" PATH URL\n" +"为了让 Subversion Location 使用此认证类型，你需要将这一行\n" +"AuthType Basic\n" +" 修改为 \n" +"AuthType SSPI\n" +" 并且在 <Location /svn> 中增加 \n" +"SSPIAuth On\n" +"SSPIAuthoritative On\n" +"SSPIDomain <domaincontroller>\n" +"SSPIOmitDomain on\n" +"SSPIUsernameCase lower\n" +"SSPIPerRequestAuth on\n" +"SSPIOfferBasic On\n" +"。 如果你没有域控制器，可以将域控制器的名称置为 <domaincontroller>。" -#: source/TortoiseSVN_en.xml:11993(para) -msgid "The Branch/Tag dialog performs a copy to the repository. There are 3 radio button options: which correspond to the 3 command line variants above." -msgstr "分支/标签对话框在版本库执行复制。有三个单选按钮: 对应上面的三个命令行参数。" +#: source/TortoiseSVN_en.xml:2178(para) +msgid "Note that if you are authenticating using SSPI, then you don't need the AuthUserFile line to define a password file any more. Apache authenticates your username and password against your windows domain instead. You will need to update the users list in your svnaccessfile to reference DOMAIN\\username as well." +msgstr "请注意，当你使用SSPI认证时，没有必要使用AuthUserFile定义密码文件，Apache使用Windows域验证用户名和密码，你需要更新svnaccessfile中的用户列表来参考DOMAIN\\username。" -#: source/TortoiseSVN_en.xml:11997(listitem) -#: source/TortoiseSVN_en.xml:6904(term) -msgid "HEAD revision in the repository" -msgstr "版本库中的最新版本" +#: source/TortoiseSVN_en.xml:2188(para) +msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (\"JUser\" is different from \"juser\")." +msgstr "Subversion的AuthzSVNAccessFile文件对用户名大小写敏感(“JUser”与“juser”不同)。" -#: source/TortoiseSVN_en.xml:11998(listitem) -msgid "Specific revision in repository" -msgstr "指定版本库中的版本" +#: source/TortoiseSVN_en.xml:2192(para) +msgid "In Microsoft's world, Windows domains and usernames are not case sensitive. Even so, some network administrators like to create user accounts in CamelCase (e.g. \"JUser\")." +msgstr "在微软的世界，Windows域和用户名不是大小写敏感，即使如此，一些网络管理员还是喜欢创建首字母大写的用户帐号(例如“JUser”)。" -#: source/TortoiseSVN_en.xml:11999(listitem) -#: source/TortoiseSVN_en.xml:6930(term) -msgid "Working copy" -msgstr "工作副本" +#: source/TortoiseSVN_en.xml:2197(para) +msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." +msgstr "使用SSPI的一个问题是用户名和密码是用户在提示输入时发送到Subversion的，而IE经常会不管你的帐户是如何建立的都会自动发送你的用户名。" -#: source/TortoiseSVN_en.xml:12(surname) -msgid "Küng" -msgstr "Küng" +#: source/TortoiseSVN_en.xml:2205(para) +msgid "The end result is that you may need at least two entries in your AuthzSVNAccessFile for each user -- a lowercase entry and an entry in the same case that Internet Explorer passes to Apache. You will also need to train your users to also type in their credentials using lower case when accessing repositories via TortoiseSVN." +msgstr "结果就是你必须为每一个用户在AuthzSVNAccessFile创建至少两个条目－－一个小写的条目和一个与IE传递给Apache一样的条目，你也需要训练你的用户在通过TortoiseSVN输入访问版本库的凭证时使用小写字母。" -#: source/TortoiseSVN_en.xml:120(para) -msgid "SubWCRev is a separate program included with TortoiseSVN which can extract the information from your working copy and write it into a file. This is useful for including build information in your projects." -msgstr "SubWCRev 是 TortoiseSVN 的一个独立程序，可以从工作副本抽取信息并记录到一个文件，可以用来在项目中包含构建信息。" +#: source/TortoiseSVN_en.xml:2213(para) +msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." +msgstr "Apache的错误和访问日志是你最好解密朋友，例如帮助你检测传递给Subversion的AuthzSVNAccessFile模块的用户名，你或许需要试验svnaccessfile中用户串的精确格式(例如DOMAIN\\user还是DOMAIN//user)来使一切工作正常。" -#: source/TortoiseSVN_en.xml:12010(screen) -#, no-wrap -msgid "" -"\n" -"svn info URL_of_WC\n" -"svn switch [-r rev] URL PATH\n" -msgstr "" -"\n" -"svn info URL_of_WC\n" -"svn switch [-r rev] URL PATH\n" +#: source/TortoiseSVN_en.xml:2225(title) +msgid "SSL and InternetExplorer" +msgstr "SSL 和 IE" -#: source/TortoiseSVN_en.xml:12016(title) -#: source/TortoiseSVN_en.xml:12358(glossterm) -msgid "Merge" -msgstr "合并" +#: source/TortoiseSVN_en.xml:2226(para) +msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseSVN and any other Subversion client are still able to authenticate." +msgstr "如果你使用SSL保护你的服务器，并使用windows域来进行认证，你会发现不能使用IE浏览版本库了，不需要担心－那只是因为IE没有经过认证，其他浏览器没有这个问题，TortoiseSVN和其他Subversion客户端仍然可以得到认证。" -#: source/TortoiseSVN_en.xml:12017(screen) -#, no-wrap -msgid "" -"\n" -"svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n" -msgstr "" -"\n" -"svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n" - -#: source/TortoiseSVN_en.xml:1202(para) -msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." -msgstr "要使项目最新，Sally 可以要求 Subversion 更新她的工作副本，通过使用更新命令，可以将你和所有其他人在她上次更新之后的修改合并到她的工作副本。" - -#: source/TortoiseSVN_en.xml:12020(para) -msgid "The Dry run performs the same merge with the --dry-run switch." -msgstr "Dry run与使用--dry-run选项的merge相同。" - -#: source/TortoiseSVN_en.xml:12024(screen) -#, no-wrap -msgid "" -"\n" -"svn diff From_URL@revN To_URL@revM\n" -msgstr "" -"\n" -"svn diff From_URL@revN To_URL@revM\n" - -#: source/TortoiseSVN_en.xml:12027(para) -msgid "The Unified diff shows the diff operation which will be used to do the merge." -msgstr "Unified diff显示了用来合并的区别操作。" +#: source/TortoiseSVN_en.xml:2240(para) +msgid "define a separate <Location /path> directive in the apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." +msgstr "在Apache的配置文件定义一个单独的<Location /path>指示，添加SSPIBasicPreferred On，这将使IE重新能够认证，但是其他浏览器和Subversion不能对这个location经过认证。" -#: source/TortoiseSVN_en.xml:12033(title) -#: source/TortoiseSVN_en.xml:12286(glossterm) -msgid "Export" -msgstr "输出" +#: source/TortoiseSVN_en.xml:2250(para) +msgid "Offer browsing with unencrypted authentication (without SSL) too. Strangely IE doesn't have any problems with authenticating if the connection is not secured with SSL." +msgstr "也提供未加密(没有SSL)认证的浏览，奇怪的IE在没有使用SSL的认证时没有任何问题。" -#: source/TortoiseSVN_en.xml:12034(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2258(para) msgid "" -"\n" -"svn export [-r rev] [--ignore-externals] URL Export_PATH\n" +"In the ssl \"standard\" setup there's often the following statement in apache's virtual ssl host: \n" +"SetEnvIf User-Agent \".*MSIE.*\" \\\n" +" nokeepalive ssl-unclean-shutdown \\\n" +" downgrade-1.0 force-response-1.0\n" +" There are (were?) good reasons for this configuration, see http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49 But if you want ntlm authentication you have to use keepalive: http://www.microsoft.com/resources/documentation/WindowsServ/2003/standard/proddocs/en-us/qos_enablekeepalives.asp If You uncomment the whole \"SetEnvIf\" You should be able to authenticate IE with windows authentication over SSL against the apache on Win32 with included mod_auth_sspi." msgstr "" -"\n" -"svn export [-r rev] [--ignore-externals] URL Export_PATH\n" +"在SSL的“标准”设置，通常在apache的虚拟SSL主机有下面的内容: \n" +"SetEnvIf User-Agent \".*MSIE.*\" \\\n" +" nokeepalive ssl-unclean-shutdown \\\n" +" downgrade-1.0 force-response-1.0\n" +"对这种设置有好的原因吗，见http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49，但是如果你希望ntlm认证，你需要使用keepalive: http://www.microsoft.com/resources/documentation/WindowsServ/2003/standard/proddocs/en-us/qos_enablekeepalives.asp，如果你取消整个\"SetEnvIf\"的注释，你就可以使IE经过Win32上配置了mod_auth_sspi和SSL的认证。" -#: source/TortoiseSVN_en.xml:12037(para) -msgid "This form is used when accessed from an unversioned folder, and the folder is used as the destination." -msgstr "这个形式是当从一个未版本控制目录访问，并且文件夹作为目标。" +#: source/TortoiseSVN_en.xml:2235(para) +msgid "If you still want to use IE to browse the repository you can either: " +msgstr "如果你一直希望使用IE浏览你的版本库，你可以选择: " -#: source/TortoiseSVN_en.xml:12041(para) -msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." -msgstr "导出一个工作副本到一个目录没有使用Subversion的库，所以没有等同的命令行匹配。" +#: source/TortoiseSVN_en.xml:2285(title) +msgid "Multiple Authentication Sources" +msgstr "多重认证源" -#: source/TortoiseSVN_en.xml:12046(para) -msgid "What TortoiseSVN does is to copy all files to the new location while showing you the progress of the operation. Unversioned files/folders can optionally be exported too." -msgstr "TortoiseSVN做的只是将所有文件复制到一个新的位置，并且会显示操作的过程。未版本控制的文件/文件夹也可以被导出。" +#: source/TortoiseSVN_en.xml:2287(primary) +msgid "Multiple authentication" +msgstr "多重认证" -#: source/TortoiseSVN_en.xml:12051(para) -msgid "In both cases, if Omit externals is checked, use the --ignore-externals switch." -msgstr "在两种情况下，如果Omit externals被选中，就相当于使用了--ignore-externals选项。" +#: source/TortoiseSVN_en.xml:2289(para) +msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." +msgstr "也可以为Subversion使用不止一个的认证源，为此，你需要将每一种认证设置为non-authoritative，这样Apache会在多个源检查用户名/密码。" -#: source/TortoiseSVN_en.xml:12058(title) -#: source/TortoiseSVN_en.xml:12404(glossterm) -msgid "Relocate" -msgstr "重新定位" +#: source/TortoiseSVN_en.xml:2295(para) +msgid "A common scenario is to use both Windows domain authentication and a passwd file, so that you can provide SVN access to users who don't have a Windows domain login." +msgstr "一个常见的场景就是同时使用Windows域和passwd文件认证，这样你可以为没有Windows域帐户的用户提供访问SVN的权限。" -#: source/TortoiseSVN_en.xml:12059(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2302(para) msgid "" -"\n" -"svn switch --relocate From_URL To_URL\n" +"To enable both Windows domain and passwd file authentication, add the following entries within the <Location> block of your Apache config file: \n" +"AuthAthoritative Off\n" +"SSPIAuthoritative Off\n" +"" msgstr "" -"\n" -"svn switch --relocate From_URL To_URL\n" - -#: source/TortoiseSVN_en.xml:12064(title) -msgid "Create Repository Here" -msgstr "在当前位置创建版本库" +"为了开启Windows域和密码文件认证，在Apache配置文件的<Location>中添加下面的条目: \n" +"AuthAthoritative Off\n" +"SSPIAuthoritative Off\n" +"" -#: source/TortoiseSVN_en.xml:12065(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2313(para) msgid "" +"Here is an example of the full Apache configuration for combined Windows domain & passwd file authentication: \n" +"<Location /svn>\n" +"DAV svn\n" +"SVNListParentPath on\n" +"SVNParentPath D:\\SVN\n" "\n" -"svnadmin create --fs-type fsfs PATH\n" -" or\n" -"svnadmin create --fs-type bdb PATH\n" -msgstr "" +"AuthName \"Subversion repositories\"\n" +"AuthzSVNAccessFile svnaccessfile.txt\n" "\n" -"svnadmin create --fs-type fsfs PATH\n" -" 或\n" -"svnadmin create --fs-type bdb PATH\n" - -#: source/TortoiseSVN_en.xml:12072(title) -#: source/TortoiseSVN_en.xml:12148(glossterm) -msgid "Add" -msgstr "添加" - -#: source/TortoiseSVN_en.xml:12076(para) -msgid "If you selected a folder, TortoiseSVN first scans it recursively for items which can be added." -msgstr "如果选择了一个文件夹，TortoiseSVN会首先会递归的访问可以添加的条目。" - -#: source/TortoiseSVN_en.xml:12082(title) -#: source/TortoiseSVN_en.xml:12321(glossterm) -#: source/TortoiseSVN_en.xml:3605(title) -msgid "Import" -msgstr "导入" - -#: source/TortoiseSVN_en.xml:12083(screen) -#, no-wrap -msgid "" +"# NT Domain Logins.\n" +"AuthType SSPI\n" +"SSPIAuth On\n" +"SSPIAuthoritative Off\n" +"SSPIDomain <domaincontroller>\n" +"SSPIOfferBasic On\n" "\n" -"svn import -m LogMessage PATH URL\n" +"# Htpasswd Logins.\n" +"AuthType Basic\n" +"AuthAuthoritative Off\n" +"AuthUserFile passwd\n" +"\n" +"Require valid-user\n" +"</Location>\n" +"" msgstr "" +"下面是组合使用 Windows 域&passwd 文件认证的完整配置: \n" +"<Location /svn>\n" +"DAV svn\n" +"SVNListParentPath on\n" +"SVNParentPath D:\\SVN\n" "\n" -"svn import -m LogMessage PATH URL\n" - -#: source/TortoiseSVN_en.xml:12092(title) -#: source/TortoiseSVN_en.xml:12169(glossterm) -msgid "Blame" -msgstr "追溯" - -#: source/TortoiseSVN_en.xml:12093(screen) -#, no-wrap -msgid "" +"AuthName \"Subversion repositories\"\n" +"AuthzSVNAccessFile svnaccessfile.txt\n" "\n" -"svn blame -r N:M -v PATH\n" -"svn log -r N:M PATH\n" -msgstr "" +"# NT Domain Logins.\n" +"AuthType SSPI\n" +"SSPIAuth On\n" +"SSPIAuthoritative Off\n" +"SSPIDomain <domaincontroller>\n" +"SSPIOfferBasic On\n" "\n" -"svn blame -r N:M -v PATH\n" -"svn log -r N:M PATH\n" - -#: source/TortoiseSVN_en.xml:12097(para) -msgid "If you use TortoiseBlame to view the blame info, the file log is also required to show log messages in a tooltip. If you view blame as a textfile, this information is not required." -msgstr "如果你使用TortoiseBlame来查看追溯信息，文件日志也需要在工具提上上显示日志信息，如果你以文件方式查看追溯，这个信息不是必须的。" +"# Htpasswd Logins.\n" +"AuthType Basic\n" +"AuthAuthoritative Off\n" +"AuthUserFile passwd\n" +"\n" +"Require valid-user\n" +"</Location>\n" +"" -#: source/TortoiseSVN_en.xml:1210(para) -msgid "Note that Sally didn't need to specify which files to update; Subversion uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." -msgstr "注意，Sally 不必指定要更新的文件，Subversion 利用 .svn 以及版本库的进一步信息决定哪些文件需要更新。" +#: source/TortoiseSVN_en.xml:2343(title) +msgid "Securing the server with SSL" +msgstr "用 SSL 使服务器更安全" -#: source/TortoiseSVN_en.xml:12105(title) -msgid "Add to Ignore List" -msgstr "加入忽略列表" +#: source/TortoiseSVN_en.xml:2345(primary) +msgid "SSL" +msgstr "SSL" -#: source/TortoiseSVN_en.xml:12106(screen) -#, no-wrap -msgid "" -"\n" -"svn propget svn:ignore PATH > tempfile\n" -"{edit new ignore item into tempfile}\n" -"svn propset svn:ignore -F tempfile PATH\n" -msgstr "" -"\n" -"svn propget svn:ignore PATH > tempfile\n" -"{编辑新的忽略内容到tempfile文件中}\n" -"svn propset svn:ignore -F tempfile PATH\n" +#: source/TortoiseSVN_en.xml:2347(para) +msgid "The apache server doesn't have SSL support installed by default due to US-export restrictions. But you can easily download the required module from somewhere else and install it yourself." +msgstr "Apache服务器缺省并不支持SSL，这是因为美国的出口限制，但是你可以从其他地方下载安装。" -#: source/TortoiseSVN_en.xml:12111(para) -msgid "Because the svn:ignore property is often a multi-line value, it is shown here as being changed via a text file rather than directly on the command line." -msgstr "因为svn:ignore通常是多行的，这里是通过文件显示，而不是直接使用命令行操作。" +#: source/TortoiseSVN_en.xml:2354(para) +msgid "First you need the required files to enable SSL. You can find those in the package available at http://hunter.campbus.com/. Just unzip the package and then copy mod_ssl.so to the modules folder of Apache and the file openssl.exe to the bin folder. Also copy the file conf/ssl.conf to the conf folder of Apache." +msgstr "首先，你需要一些文件来开启SSL，你可以在http://hunter.campbus.com/找到这些包，只需要解压缩这些文件，然后将mod_ssl.so复制到Apache的modules目录，将文件openssl.exe复制到bin目录，将文件conf/ssl.conf复制到Apache的conf目录。" -#: source/TortoiseSVN_en.xml:12118(title) -msgid "Create Patch" -msgstr "创建补丁" +#: source/TortoiseSVN_en.xml:2370(para) +msgid "Open the file ssl.conf in the Apache conf folder with a text editor." +msgstr "使用文本编辑器打开Apache的conf目录的ssl.conf。" -#: source/TortoiseSVN_en.xml:12119(screen) -#, no-wrap +#: source/TortoiseSVN_en.xml:2377(para) msgid "" -"\n" -"svn diff PATH > patchfile\n" +"Place a comment char (#) in front of the following lines: \n" +"DocumentRoot \"c:/apache/htdocs\"\n" +"ServerName www.example.com:443\n" +"ServerAdmin you@example.com\n" +"ErrorLog logs/error_log\n" +"TransferLog logs/access_log\n" +"" msgstr "" -"\n" -"svn diff PATH > patchfile\n" - -#: source/TortoiseSVN_en.xml:12122(para) -msgid "TortoiseSVN creates a patchfile in unified diff format by comparing the working copy with its BASE version." -msgstr "TortoiseSVN通过比较工作副本和它的基础版本产生一个标准区别格式(unified diff format)的补丁文件。" +"注释掉(使用#)下面几行: \n" +"DocumentRoot \"c:/apache/htdocs\"\n" +"ServerName www.example.com:443\n" +"ServerAdmin you@example.com\n" +"ErrorLog logs/error_log\n" +"TransferLog logs/access_log\n" +"" -#: source/TortoiseSVN_en.xml:12128(title) -msgid "Apply Patch" -msgstr "应用补丁(Apply Patch)" +#: source/TortoiseSVN_en.xml:2390(para) +msgid "" +"change the line \n" +"SSLCertificateFile conf/ssl.crt/server.crt\n" +" to \n" +"SSLCertificateFile conf/ssl/my-server.cert\n" +" the line \n" +"SSLCertificateKeyFile conf/ssl.key/server.key\n" +" to \n" +"SSLCertificateKeyFile conf/ssl/my-server.key\n" +" and the line \n" +"SSLMutex file:logs/ssl_mutex\n" +" to \n" +"SSLMutex default\n" +"" +msgstr "" +"此行\n" +"SSLCertificateFile conf/ssl.crt/server.crt\n" +"改为\n" +"SSLCertificateFile conf/ssl/my-server.cert\n" +"此行\n" +"SSLCertificateKeyFile conf/ssl.key/server.key\n" +"改为\n" +"SSLCertificateKeyFile conf/ssl/my-server.key\n" +"此行\n" +"SSLMutex file:logs/ssl_mutex\n" +"改为\n" +"SSLMutex default\n" +"" -#: source/TortoiseSVN_en.xml:12129(para) -msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." -msgstr "如果补丁和工作副本不是同一版本的话，那么应用补丁会是一件很棘手的事情。幸运的是，你可以使用 TortoiseMerge(在Subversion中没有等同的工具)。" +#: source/TortoiseSVN_en.xml:2418(para) +msgid "" +"Delete the lines \n" +"<IfDefine SSL>\n" +" and \n" +"</IfDefine>\n" +"" +msgstr "" +"删除此行\n" +"<IfDefine SSL>\n" +" and \n" +"</IfDefine>\n" +"" -#: source/TortoiseSVN_en.xml:12146(title) -msgid "Glossary" -msgstr "术语表" +#: source/TortoiseSVN_en.xml:2430(para) +msgid "If you want that all the apache modules are aware of the SSL ability, change the registry key HKEY_LOCAL_MACHINE\\SYSTEM\\ControlSet001\\Services\\Apache2\\ImagePath from \"C:\\Program Files\\Apache Group\\Apache2\\bin\\Apache.exe\" -k runservice to \"C:\\Program Files\\Apache Group\\Apache2\\bin\\Apache.exe\" -D SSL -k runservice." +msgstr "如果你想所有apache模块知道SSL能力，就将注册表键HKEY_LOCAL_MACHINE\\SYSTEM\\ControlSet001\\Services\\Apache2\\ImagePath的值从\"C:\\Program Files\\Apache Group\\Apache2\\bin\\Apache.exe\" -k runservice修改为 \"C:\\Program Files\\Apache Group\\Apache2\\bin\\Apache.exe\" -D SSL -k runservice。" -#: source/TortoiseSVN_en.xml:12150(para) -msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." -msgstr "向你的工作副本中增加文件或者目录时使用的Subversion命令。在你提交的时候新的项就会被加入到版本库中。" +#: source/TortoiseSVN_en.xml:2437(para) +msgid "This will set an internal flag which apache modules can read the next time you start the apache service." +msgstr "这会设置一个内部标记，当下次启动apache服务时，apache模块会读取它。" -#: source/TortoiseSVN_en.xml:12158(glossterm) -msgid "BASE revision" -msgstr "基础版本(BASE revision)" +#: source/TortoiseSVN_en.xml:2443(para) +msgid "" +"Open the Apache config file (httpd.conf) and uncomment the line \n" +"#LoadModule ssl_module modules/mod_ssl.so\n" +"" +msgstr "" +"打开Apache配置文件(httpd.conf)，并且去掉此行的注释\n" +"#LoadModule ssl_module modules/mod_ssl.so\n" +"" -#: source/TortoiseSVN_en.xml:12160(para) -msgid "The current base revision of a file or folder in your working copy. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision." -msgstr "当前工作副本里的文件或目录的基础版本。是文件或目录最后被检出、更新或者提交时的版本。基础版本通常和HEAD版本不一致。" +#: source/TortoiseSVN_en.xml:2452(para) +msgid "Openssl needs a config file. You can download a working one from http://tud.at/programm/openssl.cnf. Save the file to bin/openssl.cnf. Please note: the file has the type *.cnf. Windows treats such files in a special way but it really is just a text file!" +msgstr "Openssl需要一个配置文件，你可以从http://tud.at/programm/openssl.cnf下载一个正在使用的，请注意: *.cnf类型的文件尽管是普通的文本文件，Windows对这种文件会特别处理！" -#: source/TortoiseSVN_en.xml:12171(para) -msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number." -msgstr "这个命令只能用于文本文件，它将会标记每一行来显示版本库修订版本的最后修改的修订和作出修改的人。我们的GUI实现叫做TortoiseBlame，在你将鼠标移到修订版本号码上时，它也会显示时间和日志信息。" +#: source/TortoiseSVN_en.xml:2466(para) +msgid "" +"Next you need to create an SSL certificate. To do that open a command prompt (DOS-Box) and change to the apache folder (e.g. C:\\program files\\apache group\\apache2) and type the following command: \n" +"bin\\openssl req -config bin\\openssl.cnf -new -out my-server.csr\n" +" You will be asked for a passphrase. Please don't use simple words but whole sentences, e.g. a part of a poem. The longer the phrase the better. Also you have to enter the URL of your server. All other questions are optional but we recommend you fill those in too." +msgstr "" +"然后你需要创建一个SSL证书，为此打开一个命令行窗口，进入apache目录(例如C:\\program files\\apache group\\apache2)，然后输入下面的命令: \n" +"bin\\openssl req -config bin\\openssl.cnf -new -out my-server.csr\n" +"你会被讯问密语，请不要使用简单的单词，而是使用整段话，例如一段诗，越长越好。你也需要输入server的URL，其他所有问题都是可选的，但是我们建议你最好输入这些信息。" -#: source/TortoiseSVN_en.xml:12181(glossterm) -msgid "BDB" -msgstr "BDB" +#: source/TortoiseSVN_en.xml:2481(para) +msgid "" +"Normally the privkey.pem file is created automatically, but if it isn't you need to type this command to generate it: \n" +"bin\\openssl genrsa -out privkey.pem 2048\n" +"" +msgstr "" +"通常会自动产生privkey.pem文件，但是如果没有，请输入下面的命令生成它: \n" +"bin\\openssl genrsa -out privkey.pem 2048\n" +"" -#: source/TortoiseSVN_en.xml:12183(para) -msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." -msgstr "伯克利DB(Berkeley DB)，版本库可以使用的一种经过充分测试的后台数据库实现，不能在通过网络共享的文件系统上使用，伯克利DB是Subversion 1.2版以前的缺省版本库格式。" +#: source/TortoiseSVN_en.xml:2489(para) +msgid "" +"Next type the commands \n" +"bin\\openssl rsa -in privkey.pem -out my-server.key\n" +" and (on one line) \n" +"bin\\openssl x509 -in my-server.csr -out my-server.cert\n" +" -req -signkey my-server.key -days 4000\n" +" This will create a certificate which will expire in 4000 days. And finally enter: \n" +"bin\\openssl x509 -in my-server.cert -out my-server.der.crt -outform DER\n" +" These commands created some files in the Apache folder (my-server.der.crt, my-server.csr, my-server.key, .rnd, privkey.pem, my-server.cert). Copy the files to the folder conf/ssl (e.g. C:\\program files\\apache group\\apache2\\conf\\ssl) - if this folder does not exist you have to create it first." +msgstr "" +"然后输入这个命令\n" +"bin\\openssl rsa -in privkey.pem -out my-server.key\n" +"并且输入(在同一行)\n" +"bin\\openssl x509 -in my-server.csr -out my-server.cert\n" +" -req -signkey my-server.key -days 4000\n" +"这样会创建一个在4000天里过期的证书，最后输入: \n" +"bin\\openssl x509 -in my-server.cert -out my-server.der.crt -outform DER\n" +"这些命令在Apache目录(my-server.der.crt、my-server.csr、my-server.key、.rnd、privkey.pem、my-server.cert)里创建了一些文件，复制这些文件到目录conf/ssl(例如C:\\program files\\apache group\\apache2\\conf\\ssl)－如果这个目录不存在，你需要首先创建一个。" -#: source/TortoiseSVN_en.xml:1219(title) -msgid "Revisions" -msgstr "修订版本" +#: source/TortoiseSVN_en.xml:2518(para) +msgid "Restart the apache service." +msgstr "重启apache服务" -#: source/TortoiseSVN_en.xml:12190(glossterm) -msgid "Branch" -msgstr "分支" +#: source/TortoiseSVN_en.xml:2523(para) +msgid "Point your browser to https://servername/svn/project ..." +msgstr "将你的浏览器指向https://servername/svn/project ..." -#: source/TortoiseSVN_en.xml:12192(para) -msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bugfixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." -msgstr "有一个版本控制系统经常使用，来描述在某个时间点的两个人追随不同的路径的术语。你可以创建一个分支离开开发的主线来添加一个新特性，而不必影响主线的稳定，或者你可以创建一个分支用来发布bug修正，而新的开发发生在不稳定的主干。在Subversion，分支是使用廉价的复制实现的。" +#: source/TortoiseSVN_en.xml:2531(title) +msgid "Forcing SSL access" +msgstr "强制 SSL 访问" -#: source/TortoiseSVN_en.xml:12207(para) -msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." -msgstr "一个Subversion命令在空目录通过从版本库下载版本控制的文件来创建本地工作副本。" +#: source/TortoiseSVN_en.xml:2532(para) +msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-ssl (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." +msgstr "当你设置了SSL让你的版本库更安全，你一定希望关闭普通的非ssl访问，为此，你需要在Subversion的<Location> 增加指示: SSLRequireSSL。" -#: source/TortoiseSVN_en.xml:1221(primary) -#: source/TortoiseSVN_en.xml:8171(primary) -msgid "revision" -msgstr "修订版本" +#: source/TortoiseSVN_en.xml:2539(para) +msgid "" +"An example <Location> block would look like this: \n" +"<Location /svn>\n" +"DAV svn\n" +"SVNParentPath D:\\SVN\n" +"SSLRequireSSL\n" +"AuthType Basic\n" +"AuthName \"Subversion repositories\"\n" +"AuthUserFile passwd\n" +"#AuthzSVNAccessFile svnaccessfile\n" +"Require valid-user\n" +"</Location>\n" +"" +msgstr "" +"一个<Location>实例就像这个样子: \n" +"<Location /svn>\n" +"DAV svn\n" +"SVNParentPath D:\\SVN\n" +"SSLRequireSSL\n" +"AuthType Basic\n" +"AuthName \"Subversion repositories\"\n" +"AuthUserFile passwd\n" +"#AuthzSVNAccessFile svnaccessfile\n" +"Require valid-user\n" +"</Location>\n" +"" -#: source/TortoiseSVN_en.xml:12216(para) -msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." -msgstr "来自《Subversion手册》的引用: 递归的清理工作副本，删除锁定和保留的未完成操作。如果你得到工作副本已锁定的错误，运行这个命令删除无用的锁定，并将工作副本恢复到可用状态。" +#: source/TortoiseSVN_en.xml:2558(title) +msgid "Svnserve Based Server" +msgstr "基于 svnserve 的服务器" -#: source/TortoiseSVN_en.xml:1223(para) -msgid "An svn commit operation can publish changes to any number of files and directories as a single atomic transaction. In your working copy, you can change files' contents, create, delete, rename and copy files and directories, and then commit the complete set of changes as a unit." -msgstr "一个 svn commit 操作可以作为一个原子事务操作发布任意数量文件和目录的修改，在你的工作副本里，你可以改变文件内容、删除、改名和复制文件和目录，然后作为一个整体提交。" +#: source/TortoiseSVN_en.xml:2564(para) +msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." +msgstr "有一些情况下，不能使用Apache作为你的服务器，Subversion包括Svnserve－一个轻型的独立服务器，使用普通TCP/IP连接之上的自定义协议。" -#: source/TortoiseSVN_en.xml:12233(para) -msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." -msgstr "一个Subversion操作，用来将本地修改的内容传递回版本库，创建一个新的版本库修订版本。" +#: source/TortoiseSVN_en.xml:2570(para) +msgid "In most cases svnserve is easier to setup and runs faster than the Apache based server." +msgstr "大多数情况下svnserve的设置更加简单，也比Apache的服务器更加快。" -#: source/TortoiseSVN_en.xml:12241(glossterm) -msgid "Conflict" -msgstr "冲突" +#: source/TortoiseSVN_en.xml:2576(title) +msgid "Installing svnserve" +msgstr "安装 svnserve" -#: source/TortoiseSVN_en.xml:12243(para) -msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." -msgstr "当版本库的修改合并到本地修改，有时候修改发生在同一行，这种情况下，Subversion不能自动决定使用文件的那一行，在提交之前，你需要手工编辑文件解决冲突。" +#: source/TortoiseSVN_en.xml:2580(para) +msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "从http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91得到最新版本的Subversion。" -#: source/TortoiseSVN_en.xml:12253(glossterm) -msgid "Copy" -msgstr "复制" +#: source/TortoiseSVN_en.xml:2588(para) +msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." +msgstr "如果你已经安装了Subversion，svnserve已经运行，你需要在继续之前把它停下来。" -#: source/TortoiseSVN_en.xml:12255(para) -msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." -msgstr "在Subversion版本库，你可以创建一个文件或整个目录树的副本，这是通过廉价复制实现的，看起来很像链接到原来的位置，几乎不占用任何空间。创建一个保存历史的副本，这样你就可以跟踪副本之前的修改。" +#: source/TortoiseSVN_en.xml:2594(para) +msgid "Run the Subversion installer. If you run the installer on your server you can skip step 4." +msgstr "运行Subversion安装程序，如果你在你的服务器上运行，可以跳过第4步。" -#: source/TortoiseSVN_en.xml:12267(para) -msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the commited revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and resurrect it complete with history." -msgstr "当你删除了一个版本控制的条目(并且提交这个修改)，这个条目将不会存在于版本库以后的修订。但它还是存在于版本库的以前的修订版本里，如果必要，你可以复制一个删除的条目回来，并且保持所有的历史。" +#: source/TortoiseSVN_en.xml:2600(para) +msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" +msgstr "打开资源管理器，进入Subversion的安装目录(通常是C:\\Program Files\\Subversion)的bin目录，找到文件svnserve.exe，intl3_svn.dll，libapr.dll，libapriconv.dll，libapriutil.dll，libdb*.dll，libeay32.dll和ssleay32.dll，复制这些文件，或所有bin目录内的文件到你的服务器目录，例如c:\\svnserve。" -#: source/TortoiseSVN_en.xml:12279(para) -msgid "Shorthand for Show Differences. Very useful when you want to see exactly what changes have been made." -msgstr "显示区别的快捷方式，当你希望查看你所做修改的时候非常有用。" +#: source/TortoiseSVN_en.xml:2622(title) +msgid "Running svnserve" +msgstr "运行 svnserve" -#: source/TortoiseSVN_en.xml:12288(para) -msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local .svn folders." -msgstr "这个命令创建了一个版本控制目录的副本，就像工作副本，但是没有.svn目录。" +#: source/TortoiseSVN_en.xml:2623(para) +msgid "" +"Now that svnserve is installed, you need it running on your server. The simplest approach is to run the following from a DOS shell or create a windows shortcut: \n" +"svnserve.exe --daemon\n" +" svnserve will now start waiting for incoming requests on port 3690. The --daemon switch tells svnserve to run as a daemon process, so it will always exist until it is manually terminated." +msgstr "" +"现在svnserve已经安装了，你需要在你的server运行它，最简单的方法是在DOS窗口或者windows快捷方式输入: \n" +"svnserve.exe --daemon\n" +"svnserve将会在端口3690等待请求，--daemon选项告诉svnserve以守护进程方式运行，这样在手动终止之前不会退出。" -#: source/TortoiseSVN_en.xml:12296(glossterm) -msgid "FSFS" -msgstr "FSFS" +#: source/TortoiseSVN_en.xml:2634(para) +msgid "If you have not yet created a repository, follow the instructions given with the Apache server setup ." +msgstr "如果你没有创建一个版本库，根据下面的Apache服务器设置指令。" -#: source/TortoiseSVN_en.xml:12298(para) -msgid "FS Filesystem. A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." -msgstr "FS文件系统，版本库可以使用的一种Subversion专用的后台文件系统格式，能够在通过网络共享的文件系统上使用，FSFS是Subversion 1.2版以后的缺省版本库格式。" +#: source/TortoiseSVN_en.xml:2639(para) +msgid "To test that svnserve is working, use TortoiseSVNRepo-Browser to view a repository." +msgstr "为了验证svnserve正常工作，使用TortoiseSVN版本库浏览器来查看版本库。" -#: source/TortoiseSVN_en.xml:12307(para) -msgid "Group policy object" -msgstr "组策略对象" +#: source/TortoiseSVN_en.xml:2647(para) +msgid "" +"Assuming your repository is located in c:\\repos\\TestRepo, and your server is called localhost, enter: \n" +"svn://localhost/repos/TestRepo\n" +" when prompted by the repo browser." +msgstr "" +"假定你的版本库位于c:\\repos\\TestRepo，你的服务器叫做localhost，输入: \n" +"svn://localhost/repos/TestRepo\n" +"当被版本库浏览器提示输入。" -#: source/TortoiseSVN_en.xml:1231(para) -msgid "In the repository, each commit is treated as an atomic transaction: either all the commit's changes take place, or none of them take place. Subversion tries to retain this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." -msgstr "在版本库中，每次提交被当作一次原子事务操作: 要么所有的改变发生，要么都不发生，Subversion 努力保持原子性以应对程序错误、系统错误、网络问题和其他用户行为。" +#: source/TortoiseSVN_en.xml:2656(para) +msgid "" +"You can also increase security and save time entering Url's with svnserve by using the --root switch to set the root location and restrict access to a specified directory on the server: \n" +"svnserve.exe --daemon --root drive:\\path\\to\\repository\\root\n" +" Using the previous test as a guide, svnserve would now run as: \n" +"svnserve.exe --daemon --root c:\\repos\n" +" And in TortoiseSVN our repo-browser Url is now shortened to: \n" +"svn://localhost/TestRepo\n" +" Note that the --root switch is also needed if your repository is located on a different partition or drive than the location of svnserve on your server." +msgstr "" +"你也可以使用--root选项设置根位置来限制访问服务器的目录，从而增加安全性和节约输入svnserve URL的时间: \n" +"svnserve.exe --daemon --root drive:\\path\\to\\repository\n" +"以前面的测试为例，svnserve运行命令为: \n" +"svnserve.exe --daemon --root c:\\repos\n" +"然后在TortoiseSVN中我们的版本库浏览器URL缩短为: \n" +"svn://localhost/TestRepo\n" +"注意，当svnserve和版本库位于不同分区或盘符时也需要--root选项。" -#: source/TortoiseSVN_en.xml:12313(glossterm) -msgid "HEAD revision" -msgstr "最新版本(HEAD revision)" +#: source/TortoiseSVN_en.xml:2675(para) +msgid "Svnserve will service any number of repositories. Just locate them somewhere below the root folder you just defined, and access them using a URL relative to that root." +msgstr "Svnserve 可以提供任意数量的版本库服务。只要将这些版本库放到你刚才定义的根目录下即可，然后使用相对于根的URL访问它们。" -#: source/TortoiseSVN_en.xml:12315(para) -msgid "The latest revision of a file or folder in the repository." -msgstr "版本库里文件或目录的最新版本。" +#: source/TortoiseSVN_en.xml:2692(title) +msgid "Run svnserve as a Service" +msgstr "以服务形式运行 svnserve" -#: source/TortoiseSVN_en.xml:12323(para) -msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." -msgstr "在一个修订里将整个目录导入到版本库的Subversion命令。" +#: source/TortoiseSVN_en.xml:2694(primary) +msgid "svnservice" +msgstr "svnservice" -#: source/TortoiseSVN_en.xml:12330(glossterm) -msgid "Lock" -msgstr "锁" +#: source/TortoiseSVN_en.xml:2696(para) +msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." +msgstr "使用普通用户直接运行 svnserve 通常不是最好的方法。它意味着你的服务器必须有一个用户登录，还要记着重新启动服务器后重新启动 svnserve。最好的方法是将 svnserve 作为 windows 服务运行。从 Subversion 1.4 开始，svnserve 可以安装为 windows 服务。" -#: source/TortoiseSVN_en.xml:12332(para) -msgid "When you take out a lock on a versioned item, you mark it in the repository as uncommittable, except from the working copy where the lock was taken out." -msgstr "当一个版本控制条目的被你锁定，就是将它在版本库里标示为不可提交，只有作出锁定的工作副本可以提交。" +#: source/TortoiseSVN_en.xml:2703(para) +msgid "" +"To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" +"sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" +" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip start= auto\n" +" If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" +"sc create svnserve binpath= \"\\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" +" --service --root c:\\repos\" displayname= \"Subversion\" depend= tcpip start= auto\n" +" You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" +"sc description svnserve \"Subversion server (svnserve)\"\n" +"" +msgstr "" -#: source/TortoiseSVN_en.xml:12340(glossterm) -msgid "Log" -msgstr "日志" +#: source/TortoiseSVN_en.xml:2723(para) +msgid "Note the rather unusual command line format used by sc. In the key= value pairs there must be no space between the key and the = but there must be a space before the value." +msgstr "" -#: source/TortoiseSVN_en.xml:12342(para) -msgid "Show the revision history of a file or folder. Also known as History." -msgstr "显示一个文件或是文件夹的版本历史。也就是历史。" +#: source/TortoiseSVN_en.xml:2730(para) +msgid "" +"Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" +"obj= \"NT AUTHORITY\\LocalService\"\n" +" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The builtin group for this is called \"LOCAL SERVICE\"." +msgstr "" +"Microsoft 现在建议服务作为本地服务或网络服务帐户运行，参考The Services and Service Accounts Security Planning Guide。以本地服务帐户创建服务，需要在上面的例子里追加下面几行。\n" +"obj= \"NT AUTHORITY\\LocalService\"\n" +"请注意需要给本地服务帐户一些目录的适当权限，包括的Subversion和你的版本库，还有所有钩子脚本使用的应用。此帐号的内置组名是\"LOCAL SERVICE\"。" -#: source/TortoiseSVN_en.xml:12349(glossterm) -msgid "History" -msgstr "历史" +#: source/TortoiseSVN_en.xml:2747(para) +msgid "Once you have installed the service, you need to go to the services manager to start it (this time only; it will start automatically when the server reboots)." +msgstr "服务安装完毕后，你需要在服务管理器中启动它(仅此一次；当服务器重启后它会自动启动)。" -#: source/TortoiseSVN_en.xml:12351(para) -msgid "Show the revision history of a file or folder. Also known as Log." -msgstr "显示文件或目录的历史修订，也被称为Log。" +#: source/TortoiseSVN_en.xml:2752(para) +msgid "For more detailed information, refer to Windows Service Support for Svnserve." +msgstr "为了得到更详细的信息，可参考 Windows Service Support for Svnserve。" -#: source/TortoiseSVN_en.xml:12360(para) -msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict." -msgstr "这个过程会查看版本库添加到工作副本的的修改，而不会破坏你在本地的修改，有时候这些修改可能不会自动的结合，也就是冲突了。" +#: source/TortoiseSVN_en.xml:2758(para) +msgid "" +"If you installed an earlier version of svnserve using the SvnService wrapper, and you now want to use the native support instead, you will need to unregister the wrapper as a service (remember to stop the service first!). Simply use the command \n" +"svnservice -remove\n" +" to remove the service registry entry." +msgstr "" -#: source/TortoiseSVN_en.xml:12366(para) -msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseSVN's Merge command." -msgstr "在你更新工作副本时会自动合并，你也可以使用TortoiseSVN的合并命令从另一条分支进行合并。" +#: source/TortoiseSVN_en.xml:2772(title) +msgid "Authentication with svnserve" +msgstr "svnserve 的认证" -#: source/TortoiseSVN_en.xml:12374(glossterm) -msgid "Patch" -msgstr "补丁" +#: source/TortoiseSVN_en.xml:2773(para) +msgid "The default svnserve setup provides anonymous read-only access. This means that you can use an svn:// Url to checkout and update, or use the repo-browser in TortoiseSVN to view the repository, but you won't be able to commit any changes." +msgstr "缺省的svnserve设置提供了匿名的只读访问，这意味着你可以使用svn://的URL进行检出和更新，或者使用TortoiseSVN的版本库浏览器查看版本库，但是不能提交任何修改。" -#: source/TortoiseSVN_en.xml:12376(para) -msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." -msgstr "如果工作副本只有文本文件有修改，也可以使用Subversion的Diff命令生成标准区别格式的单文件的修改摘要。这种文件通常被叫做补丁，可以邮寄给任何人，使之可以应用到另一个工作副本。一些没有提交访问的人可以通过提交补丁文件给有授权的人来应用补丁，或者是在不确定修改时提交补丁给别人进行评审。" +#: source/TortoiseSVN_en.xml:2779(para) +msgid "To enable write access to a repository, you need to edit the conf/svnserve.conf file in your repository directory. This file controls the configuration of the svnserve daemon, and also contains useful documentation." +msgstr "为了打开对版本库的写访问，你可以编辑版本库目录的conf/svnserve.conf文件，这个文件控制了svnserve守护进程的配置，也提供了有用的文档。" -#: source/TortoiseSVN_en.xml:1238(para) -msgid "Each time the repository accepts a commit, this creates a new state of the filesystem tree, called a revision. Each revision is assigned a unique natural number, one greater than the number of the previous revision. The initial revision of a freshly created repository is numbered zero, and consists of nothing but an empty root directory." -msgstr "每当版本库接受了一个提交，文件系统进入了一个新的状态，叫做版本，每个版本被赋予一个独一无二的自然数，一个比一个大，初始修订号是 0，只创建了一个空目录，没有任何内容。" +#: source/TortoiseSVN_en.xml:2785(para) +msgid "" +"You can enable anonymous write access by simply setting: \n" +"[general]\n" +"anon-access = write\n" +" However, you will not know who has made changes to a repository, as the svn:author property will be empty. You will also be unable to control who makes changes to a repository. This is a somewhat risky setup!" +msgstr "" +"为了打开匿名的写访问，只需要简单得设置: \n" +"[general]\n" +"anon-access = write\n" +"然而，你不会知道谁修改了版本库，因为svn:author属性是空的，你也不能控制谁来修改版本库，这是一个很危险的设置。" -#: source/TortoiseSVN_en.xml:12389(glossterm) -msgid "Property" -msgstr "属性" +#: source/TortoiseSVN_en.xml:2796(para) +msgid "" +"One way to overcome this is to create a password database: \n" +"[general]\n" +"anon-access = none\n" +"auth-access = write\n" +"password-db = userfile\n" +" Where userfile is a file which exists in the same directory as svnserve.conf. This file can live elsewhere in your filesytem (useful for when you have multiple repositories which require the same access rights) and may be referenced using an absolute path, or a path relative to the conf directory. If you include a path, it must be written /the/unix/way. Using \\ or drive letters will not work. The userfile should have a structure of: \n" +"[users]\n" +"username = password\n" +"...\n" +" This example would deny all access for unauthenticated (anonymous) users, and give read-write access to users listed in userfile." +msgstr "" +"解决这个问题的一个方法是创建密码数据库: \n" +"[general]\n" +"anon-access = none\n" +"auth-access = write\n" +"password-db = userfile\n" +"这里userfile与svnserve.conf文件在同一个目录，这个文件也可以存在于文件系统的其他地方(当多个版本库使用相同的访问权限时尤其有用)，并使用绝对路径引用，或者是conf的相对目录，使用\\或盘符不能工作。userfile的结构如下: \n" +"[users]\n" +"username = password\n" +"...\n" +"这个例子拒绝所有的未认证用户(匿名)访问，给userfile中的用户读写权限。" -#: source/TortoiseSVN_en.xml:12391(para) -msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseSVN has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." -msgstr "除了版本控制文件和目录，Subversion允许你添加版本控制的元数据 - 被称作每个文件和目录的属性 。每个属性都有一个名称和一个值，非常类似于注册表键。Subversion有一些内置的特别属性，例如svn:eol-style。TortoiseSVN也有一些类似的，例如tsvn:logminsize，你可以选择名称和值添加你自己的属性。" +#: source/TortoiseSVN_en.xml:2824(para) +msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseSVN can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" +msgstr "如果维护多个版本库使用相同的密码数据库，使用一个认证域将让用户的工作更加简单，因为TortoiseSVN可以缓存你的凭证，所以你只需要输入一次，更多的信息可以看《使用 Subversion 进行版本管理》，对应的章节为创建用户文件和域和客户端凭证缓存" -#: source/TortoiseSVN_en.xml:12406(para) -msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to relocate your working copy so that its repository URLs point to the new location." -msgstr "如果你的版本库移动了，或许是因为移动到了一个新的目录，或者是域名改变，你需要relocate你的工作副本，这样你的版本库URL指向新的地址。" +#: source/TortoiseSVN_en.xml:2842(title) +msgid "Authentication with svn+ssh" +msgstr "使用 svn+ssh 认证" -#: source/TortoiseSVN_en.xml:12412(para) -msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the Switch command instead." -msgstr "注意: 工作副本必须是指向同一个版本库的同一个位置，是版本库本身移动了。在其他几种情况下，你很有可能是需要Switch命令。" +#: source/TortoiseSVN_en.xml:2843(para) +msgid "Another way to authenticate users with a svnserve based server is to use a secure shell (SSH) to tunnel requests through." +msgstr "另一种svnserve认证的方法是使用SSH来建立请求通道。" -#: source/TortoiseSVN_en.xml:12421(glossterm) -#: source/TortoiseSVN_en.xml:3465(primary) -msgid "Repository" -msgstr "版本库" +#: source/TortoiseSVN_en.xml:2848(para) +msgid "With this approach, svnserve is not run as a daemon process, rather, the secure shell starts svnserve for you, running it as the SSH authenticated user. To enable this, you need a secure shell daemon on your server." +msgstr "通过此方法，svnserve不会作为守护进程启动，而是SSH为你启动svnserve，以SSH授权用户运行，为此，你需要在你的服务器上有SSH守护进程。" -#: source/TortoiseSVN_en.xml:12423(para) -msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network." -msgstr "版本库是进行数据存储和维护的中心。版本库既可以由分布在网络上的若干数据库或者文件组成，也可以存放在用户不需要通过网络就可以直接访问的某个位置。" +#: source/TortoiseSVN_en.xml:2854(para) +msgid "It is beyond the scope of this documentation to detail the installation and setup of a secure shell, however you can find further information in the TortoiseSVN FAQ. Search for SSH." +msgstr "详细描述安装和设置SSH已经超过了本文的范围，然而你可以在TortoiseSVN FAQ里查找SSH。" -#: source/TortoiseSVN_en.xml:12432(glossterm) -msgid "Resolve" -msgstr "解决" +#: source/TortoiseSVN_en.xml:2863(para) +msgid "Further information about svnserve can be found in the Version Control with Subversion." +msgstr "更多的关于svnserve的信息可以看《使用 Subversion 进行版本管理》。" -#: source/TortoiseSVN_en.xml:12434(para) -msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as Resolving Conflicts. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed." -msgstr "当合并之后版本库的文件进入了冲突状态，必须有人用编辑器解决冲突(或者是TortoiseMerge)，这个过程称作解决冲突，当此过程结束，你可以将冲突文件标示为解决，将会运行提交这个文件。" +#: source/TortoiseSVN_en.xml:2871(title) +msgid "Path-based Authorization with svnserve" +msgstr "svnserve 以路径为基础的授权" -#: source/TortoiseSVN_en.xml:12446(para) -msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." -msgstr "Subversion会为每个更新到工作副本的文件保留一份原始副本。如果你做出了修改，并希望取消修改，你可以使用revert回到原始状态。" +#: source/TortoiseSVN_en.xml:2872(para) +msgid "" +"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" +"[general]\n" +"authz-db = authz\n" +" Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." +msgstr "" +"从Subversion1.3开始，svnserve支持与mod_authz_svn相同的路径为基础的授权模式，你需要编辑版本库路径下的conf/svnserve.conf引用的授权文件。\n" +"[general]\n" +"authz-db = authz\n" +"在这里，authz是你创建用来定义访问权限的文件，你可以为每一个版本库使用单独的文件，或者为所有的版本库使用相同的文件，关于此文件的格式可以查看。" -#: source/TortoiseSVN_en.xml:12455(glossterm) -msgid "Revision" -msgstr "版本" +#: source/TortoiseSVN_en.xml:2894(para) +msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseSVN." +msgstr "无论你用什么协议访问你的版本库，都至少需要创建一个版本库，这可以使用Subversion命令行客户端或TortoiseSVN完成。" -#: source/TortoiseSVN_en.xml:12457(para) -msgid "Every time you commit a set of changes, you create one new revision in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N." -msgstr "每当你提交一组修改，你会在版本库创建一个修订版本，每个修订代表了版本库树在历史上某一点的状态，如果你希望回到历史，你可以回到以前的修订版本N。" +#: source/TortoiseSVN_en.xml:2899(para) +msgid "If you haven't created a Subversion repository yet, it's time to do that now." +msgstr "如果你还没有创建Subversion版本库，是时间开始了。" -#: source/TortoiseSVN_en.xml:12464(para) -msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created." -msgstr "另一种情况下，你可以把修订看作修订版本建立的修改集。" +#: source/TortoiseSVN_en.xml:2907(title) +msgid "Repository Creation" +msgstr "创建版本库" -#: source/TortoiseSVN_en.xml:1247(para) -msgid "A nice way to visualize the repository is as a series of trees. Imagine an array of revision numbers, starting at 0, stretching from left to right. Each revision number has a filesystem tree hanging below it, and each tree is a snapshot of the way the repository looked after each commit." -msgstr "可以形象的把版本库看作一系列树，想象有一组版本号，从 0 开始，从左到右，每一个修订号有一个目录树挂在它下面，每一个树好像是一次提交后的版本库“快照”。" +#: source/TortoiseSVN_en.xml:2908(para) +msgid "You can create a repository with the FSFS backend or with the old but stable Berkeley Database (BDB) format. The FSFS format is faster and it now works on network shares and Windows 98 without problems. The BDB format is more stable because it has been tested longer. Read Repository Data Stores in the Subversion book for more information." +msgstr "你可以使用FSFS或较老但更稳定的Berkeley Database(BDB)作为版本库的后端，FSFS格式更快一点，而且可以正常运行在Windows 98，BDB格式更加的稳定，因为其经过了更长时间的验证。《使用 Subversion 进行版本管理》中的版本库数据存储有更多细节。" -#: source/TortoiseSVN_en.xml:12471(glossterm) -msgid "Revision Property (revprop)" -msgstr "版本属性(revprop)" +#: source/TortoiseSVN_en.xml:2920(title) +msgid "Creating a Repository with the Command Line Client" +msgstr "使用命令行工具创建版本库" -#: source/TortoiseSVN_en.xml:12473(para) -msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: svn:date svn:author svn:log which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone." -msgstr "就像文件，版本库的每个修订也可以有属性。一些特殊的修订属性会在修订版本创建时自动生成，例如: svn:date svn:author svn:log代表了提交的时间，提交者和日志信息。这些属性可以编辑，但是这些属性都不是版本控制的，所以任何修改都是永久的，不可回退的。" - -#: source/TortoiseSVN_en.xml:12485(glossterm) -msgid "SVN" -msgstr "SVN" +#: source/TortoiseSVN_en.xml:2922(primary) +#: source/TortoiseSVN_en.xml:2963(primary) +msgid "Create" +msgstr "创建" -#: source/TortoiseSVN_en.xml:12487(para) -msgid "A frequently-used abbreviation for Subversion." -msgstr "Subversion的常见缩写形式。" +#: source/TortoiseSVN_en.xml:2923(secondary) +msgid "Command Line Client" +msgstr "命令行工具" -#: source/TortoiseSVN_en.xml:12490(para) -msgid "The name of the Subversion custom protocol used by the svnserve repository server." -msgstr "Subversion的svnserve版本库服务器使用的自定义协议名称。" +#: source/TortoiseSVN_en.xml:2927(para) +msgid "Create an empty folder with the name SVN (e.g. D:\\SVN\\), which is used as root for all your repositories." +msgstr "创建一个名为SVN(例如D:\\SVN\\)的空文件夹，作为你的所有版本库的根。" -#: source/TortoiseSVN_en.xml:12499(para) -msgid "Just as Update-to-revision changes the time window of a working copy to look at a different point in history, so Switch changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred." -msgstr "就像Update-to-revision从历史上改变了工作副本的视点，Switch改变了工作副本空间上的视点。当主干和分支只有微小差别时，这个命令非常有用，你可以在目录之间跳转，而只会有很小区别需要传输。" +#: source/TortoiseSVN_en.xml:2934(para) +msgid "Create another folder MyNewRepository inside D:\\SVN\\." +msgstr "在D:\\SVN\\里创建另一个目录MyNewRepository。" -#: source/TortoiseSVN_en.xml:125(para) -msgid "The How Do I... section answers some common questions about performing tasks which are not explicitly covered elsewhere." -msgstr "我该怎么做 …这一节回答了一些操作方面的常见问题。这些常见问题在其他章节没有被明确的提到过。" +#: source/TortoiseSVN_en.xml:2941(para) +msgid "" +"Open the command prompt (or DOS-Box), change into D:\\SVN\\ and type \n" +"svnadmin create --fs-type bdb MyNewRepository\n" +" or \n" +"svnadmin create --fs-type fsfs MyNewRepository\n" +"" +msgstr "" +"打开命令行窗口(或DOS窗口)，进入D:\\SVN\\目录，输入\n" +"svnadmin create --fs-type bdb MyNewRepository\n" +"或\n" +"svnadmin create --fs-type fsfs MyNewRepository\n" +"" -#: source/TortoiseSVN_en.xml:12513(para) -msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." -msgstr "这个命令将最新的修改从版本库下载到工作副本，合并其他人的修改和工作副本的本地修改。" +#: source/TortoiseSVN_en.xml:2954(para) +msgid "Now you've got a new repository located at D:\\SVN\\MyNewRepository." +msgstr "现在你在D:\\SVN\\MyNewRepository创建了一个新的版本库。" -#: source/TortoiseSVN_en.xml:12521(glossterm) -msgid "Working Copy" -msgstr "工作副本" +#: source/TortoiseSVN_en.xml:2961(title) +msgid "Creating The Repository With TortoiseSVN" +msgstr "使用 TortoiseSVN 创建版本库" -#: source/TortoiseSVN_en.xml:12523(para) -msgid "This is your local sandbox, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a Checkout from a repository, and you feed your changes back into the repository using Commit." -msgstr "这是你的本地沙盒，这个区域是你工作在版本控制文件的地方，它一般存在于你的本地磁盘，你可以使用Checkout从版本库创建一个工作副本，然后使用Commit将修改传递回版本库。" +#: source/TortoiseSVN_en.xml:2968(title) +msgid "The TortoiseSVN menu for unversioned folders" +msgstr "未版本控制文件夹的 TortoiseSVN 菜单" -#: source/TortoiseSVN_en.xml:1256(title) source/TortoiseSVN_en.xml:2892(title) -#: source/TortoiseSVN_en.xml:750(title) -msgid "The Repository" -msgstr "版本库" +#: source/TortoiseSVN_en.xml:2973(para) +msgid "Open the windows explorer" +msgstr "打开资源管理器" -#: source/TortoiseSVN_en.xml:1260(title) -msgid "Global Revision Numbers" -msgstr "全局版本号" +#: source/TortoiseSVN_en.xml:2978(para) +msgid "Create a new folder and name it e.g. SVNRepository" +msgstr "创建一个新的文件夹，命名为SVNRepository" -#: source/TortoiseSVN_en.xml:1261(para) -msgid "Unlike those of many other version control systems, Subversion's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Subversion user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" -msgstr "不像其它版本控制系统，Subversion 的版本号是针对整个目录树的，而不是单个文件。每一个版本号代表了一次提交后版本库整个目录树的特定状态，另一种理解是版本 N 代表版本库已经经过了 N 次提交。当 Subversion 用户讨论“foo.c的版本 5”时，他们的实际意思是“在版本 5 时的foo.c”。需要注意的是，一个文件的版本 N 和 M 并不表示它必定不同。" +#: source/TortoiseSVN_en.xml:2984(para) +msgid "Right-click on the newly created folder and select TortoiseSVNCreate Repository here...." +msgstr "右键点击新创建的目录，选择TortoiseSVN在此创建版本库...。" -#: source/TortoiseSVN_en.xml:1276(para) -msgid "It's important to note that working copies do not always correspond to any single revision in the repository; they may contain files from several different revisions. For example, suppose you check out a working copy from a repository whose most recent revision is 4:" -msgstr "需要特别注意的是，工作副本并不一定对应版本库中的单一版本，他们可能包含多个版本的文件。举个例子，你从版本库检出一个工作副本，最新的版本是 4: " +#: source/TortoiseSVN_en.xml:2992(para) +msgid "A repository is then created inside the new folder. Don't edit those files yourself!!!. If you get any errors make sure that the folder is empty and not write protected." +msgstr "然后就会在新文件夹创建一个版本库，不要手工编辑这些文件！！！如果你得到什么警告，一定要先确定目录非空并且没有写保护。" -#: source/TortoiseSVN_en.xml:1283(screen) -#, no-wrap -msgid "" -"\n" -"calc/Makefile:4\n" -" integer.c:4\n" -" button.c:4\n" +#: source/TortoiseSVN_en.xml:3001(para) +msgid "TortoiseSVN no longer offers the option to create BDB repositories, although you can still use the command line client to create them. FSFS repositories are generally easier for you to maintain, and also makes it easier for us to maintain TortoiseSVN due to compatibility issues between the different BDB versions." msgstr "" -"\n" -"calc/Makefile:4\n" -" integer.c:4\n" -" button.c:4\n" - -#: source/TortoiseSVN_en.xml:1288(para) -msgid "At the moment, this working directory corresponds exactly to revision 4 in the repository. However, suppose you make a change to button.c, and commit that change. Assuming no other commits have taken place, your commit will create revision 5 of the repository, and your working copy will now look like this:" -msgstr "此刻，工作目录与版本库的版本 4 完全对应，然而，你修改了 button.c 并且提交之后，假设没有别的提交出现，你的提交会在版本库建立版本 5，你的工作副本会是这个样子的: " - -#: source/TortoiseSVN_en.xml:129(para) -msgid "The section on Automating TortoiseSVN shows how the TortoiseSVN GUI dialogs can be called from the command line. This is useful for scripting where you still need user interaction." -msgstr "自动化 TortoiseSVN 这一小节展示了如何使用命令行调用 TortoiseSVN 的 GUI 对话框，当你在使用脚本时仍希望用户交互时非常有用。" -#: source/TortoiseSVN_en.xml:1296(screen) -#, no-wrap -msgid "" -"\n" -"calc/Makefile:4\n" -" integer.c:4\n" -" button.c:5\n" +#: source/TortoiseSVN_en.xml:3008(para) +msgid "Future versions of TortoiseSVN will not support file:/// access to BDB repositories due to these compatibility issues, although it will of course always support this repository format when accessed via a server through the svn://, http:// or https:// protocols. For this reason, we strongly recommend that any new repository which must be accessed using file:/// protocol is created as FSFS." msgstr "" -"\n" -"calc/Makefile:4\n" -" integer.c:4\n" -" button.c:5\n" - -#: source/TortoiseSVN_en.xml:1301(para) -msgid "Suppose that, at this point, Sally commits a change to integer.c, creating revision 6. If you use svn update to bring your working copy up to date, then it will look like this:" -msgstr "假设此刻，Sally 提交了对 integer.c 的修改，建立修订版本 6，如果你使用 svn update 来更新你的工作副本，你会看到: " -#: source/TortoiseSVN_en.xml:1307(screen) -#, no-wrap -msgid "" -"\n" -"calc/Makefile:6\n" -" integer.c:6\n" -" button.c:6\n" +#: source/TortoiseSVN_en.xml:3020(para) +msgid "Of course we also recommend that you don't use file:/// access at all, apart from local testing purposes. Using a server is more secure and more reliable for all but single-developer use." msgstr "" -"\n" -"calc/Makefile:6\n" -" integer.c:6\n" -" button.c:6\n" - -#: source/TortoiseSVN_en.xml:1312(para) -msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Subversion will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." -msgstr "Sally 对 integer.c 的改变会出现在你的工作副本，你对 button.c 的改变还在，在这个例子里，Makefile 在 4、5、6 版本都是一样的，但是 Subversion 会把 Makefile 的版本设为 6 来表明它是最新的，所以你在工作副本顶级目录作一次干净的更新，会使所有内容对应版本库的同一修订版本。" - -#: source/TortoiseSVN_en.xml:1325(title) -msgid "How Working Copies Track the Repository" -msgstr "工作副本怎样跟踪版本库" -#: source/TortoiseSVN_en.xml:1326(para) -msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" -msgstr "对于工作副本的每一个文件，Subversion 在管理目录 .svn/ 记录两项关键的信息: " - -#: source/TortoiseSVN_en.xml:1332(para) -msgid "what revision your working file is based on (this is called the file's working revision), and" -msgstr "工作文件的基准版本(叫做文件的工作版本)和" +#: source/TortoiseSVN_en.xml:3029(title) +msgid "Local Access to the Repository" +msgstr "本地访问版本库" -#: source/TortoiseSVN_en.xml:1339(para) -msgid "a timestamp recording when the local copy was last updated by the repository." -msgstr "一个本地副本最后更新的时间戳。" +#: source/TortoiseSVN_en.xml:3031(primary) +msgid "Access" +msgstr "访问" -#: source/TortoiseSVN_en.xml:134(para) -msgid "The Command Line Cross Reference give a correlation between TortoiseSVN commands and their equivalents in the Subversion command line client svn.exe." -msgstr "命令行交叉索引给出了 TortoiseSVN 命令与其对应的 Subversion 命令行工具 svn.exe 命令之间的关系。" +#: source/TortoiseSVN_en.xml:3034(primary) +msgid "UNC paths" +msgstr "UNC路径" -#: source/TortoiseSVN_en.xml:1345(para) -msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" -msgstr "给定这些信息，通过与版本库通讯，Subversion 可以告诉我们工作文件是处与如下四种状态的那一种: " +#: source/TortoiseSVN_en.xml:3036(para) +msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." +msgstr "为了访问本地版本库，你需要这个文件夹的路径，只要记住Subversion期望所有的版本库路径使用的形式为file:///C:/SVNRepository/，请注意全部使用的是斜杠。" -#: source/TortoiseSVN_en.xml:1352(term) -msgid "Unchanged, and current" -msgstr "未修改且是当前的" +#: source/TortoiseSVN_en.xml:3042(para) +msgid "To access a repository located on a network share you can either use drive mapping, or you can use the UNC path. For UNC paths, the form is file://ServerName/path/to/repos/. Note that there are only 2 leading slashes here." +msgstr "为了访问网络共享中的版本库，你可以使用驱动器影射或使用UNC路径，对于UNC路径，形式为file://ServerName/path/to/repos/，请注意这里前面只有两个斜杠。" -#: source/TortoiseSVN_en.xml:1354(para) -msgid "The file is unchanged in the working directory, and no changes to that file have been committed to the repository since its working revision. A commit of the file will do nothing, and an update of the file will do nothing." -msgstr "文件在工作目录里没有修改，在工作版本之后没有修改提交到版本库。svn commit 操作不做任何事情，svn update 不做任何事情。" +#: source/TortoiseSVN_en.xml:3049(para) +msgid "Prior to SVN 1.2, UNC paths had to be given in the more obscure form file:///\\ServerName/path/to/repos. This form is still supported, but not recommended." +msgstr "在SVN 1.2之前，UNC路径曾经是一种非常晦涩的格式file:///\\ServerName/path/to/repos，这种格式依然支持，但不推荐。" -#: source/TortoiseSVN_en.xml:1365(term) -msgid "Locally changed, and current" -msgstr "本地已修改且是当前的" +#: source/TortoiseSVN_en.xml:3067(para) +msgid "If you really need to access a repository through a network share, create the repository with fsfs format. If you need to provide server access as well, you will need Subversion Server 1.1 or higher." +msgstr "如果你需要访问网络共享中的版本库，请使用fsfs格式创建版本库，如果也希望提供服务器访问，你需要1.1或更高版本的Subversion服务器。" -#: source/TortoiseSVN_en.xml:1367(para) -msgid "The file has been changed in the working directory, and no changes to that file have been committed to the repository since its base revision. There are local changes that have not been committed to the repository, thus an commit of the file will succeed in publishing your changes, and an update of the file will do nothing." -msgstr "工作副本已经修改，从基准版本之后没有修改提交到版本库。本地修改没有提交，因此 svn commit 会成功的提交，svn update 不做任何事情。" +#: source/TortoiseSVN_en.xml:3075(title) +msgid "Repository Backup" +msgstr "版本库备份" -#: source/TortoiseSVN_en.xml:1379(term) -msgid "Unchanged, and out-of-date" -msgstr "本地未修改且过时" +#: source/TortoiseSVN_en.xml:3077(primary) +msgid "backup" +msgstr "备份" -#: source/TortoiseSVN_en.xml:1381(para) -msgid "The file has not been changed in the working directory, but it has been changed in the repository. The file should eventually be updated, to make it current with the public revision. An commit of the file will do nothing, and an update of the file will fold the latest changes into your working copy." -msgstr "这个文件在工作副本没有修改，但在版本库中已经修改了。这个文件应当更新到最新公共版本。svn commit 不做任何事情，svn update 将会更新工作副本到最新的版本。" +#: source/TortoiseSVN_en.xml:3079(para) +msgid "Whichever type of repository you use, it is vitally important that you maintain regular backups, and that you verify the backup. If the server fails, you may be able to access a recent version of your files, but without the repository all your history is lost forever." +msgstr "无论你使用何种版本库，定期维护和验证版本库备份非常重要，或许你可以访问最近版本的文件，但是如果没有版本库，所有的历史将会丢失。" -#: source/TortoiseSVN_en.xml:1393(term) -msgid "Locally changed, and out-of-date" -msgstr "本地已修改且过时" +#: source/TortoiseSVN_en.xml:3086(para) +msgid "The simplest (but not recommended) way is just to copy the repository folder onto the backup medium. However, you have to be absolutely sure that no process is accessing the data. In this context, access means any access at all. A BDB repository is written to even when the operation only appears to require reading, such as getting status. If your repository is accessed at all during the copy, (web browser left open, WebSVN, etc.) the backup will be worthless." +msgstr "最简单(但不推荐)的方法是复制整个版本库目录到备份介质，然而你必须绝对确定没有访问数据的进程，在这里“访问”的意思是任何访问，一个BDB版本库即使在访问看起来只需要读时也会有写操作，如果在复制时版本库被访问了(web浏览器，WebSVN等等)，备份将毫无价值。" -#: source/TortoiseSVN_en.xml:1395(para) -msgid "The file has been changed both in the working directory, and in the repository. An commit of the file will fail with an \"out-of-date\" error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." -msgstr "这个文件在工作副本和版本库都被修改。svn commit 将会失败，这个文件必须首先更新，svn update 命令会合并公共和本地修改，如果 Subversion 不能自动完成，将会让用户解决冲突。" +#: source/TortoiseSVN_en.xml:3096(para) +msgid "" +"The recommended method is to run \n" +"svnadmin hotcopy path/to/repository path/to/backup --clean-logs\n" +" to create a copy of your repository in a safe manner. Then backup the copy. The --clean-logs option is not required, but removes any redundant log files when you backup a BDB repository, which may save some space." +msgstr "" +"推荐的方法是运行\n" +"svnadmin hotcopy path/to/repository path/to/backup --clean-logs\n" +"，用一种安全的方式创建版本库的备份，备份是一个副本，--clean-logs选项并不必须，但是通过删除BDB版本库中多余的日志文件可以节省一些空间。" -#: source/TortoiseSVN_en.xml:1412(title) -msgid "Summary" -msgstr "摘要" +#: source/TortoiseSVN_en.xml:3106(para) +msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." +msgstr "svnadmin在安装Subversion命令行客户端时会自动安装，如果你在Windows PC上安装这个命令行工具，最好的方式是下载Windows安装版本，它比.zip版本的压缩效率更好，所以更小，并且小心的为你设定路径。你可以从http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91下载最新版本的命令行客户端。" -#: source/TortoiseSVN_en.xml:1413(para) -msgid "We've covered a number of fundamental Subversion concepts in this chapter:" -msgstr "我们在这一章里学习了许多 Subversion 基本概念: " +#: source/TortoiseSVN_en.xml:3121(title) +msgid "Hook Scripts" +msgstr "钩子脚本" -#: source/TortoiseSVN_en.xml:1419(para) -msgid "We've introduced the notions of the central repository, the client working copy, and the array of repository revision trees." -msgstr "我们介绍了中央版本库、客户工作副本和版本库中版本树队列的概念。" +#: source/TortoiseSVN_en.xml:3123(primary) +msgid "hooks" +msgstr "钩子" -#: source/TortoiseSVN_en.xml:1425(para) -msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." -msgstr "我们介绍了两个协作者如何使用使用复制-修改-合并模型，用 Subversion 发布和获得对方的修改。" +#: source/TortoiseSVN_en.xml:3125(para) +msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." +msgstr "钩子脚本是被版本库事件触发的程序，例如新修订版本的创建或未版本控制属性的修改。每一种钩子都会被告知事件的足够信息，操作的目标，触发事件的用户名。依赖于钩子的输出或返回状态，钩子程序可以继续执行，停止或以某种方式挂起。请参阅《使用 Subversion 进行版本管理》的钩子脚本部分来查看关于钩子实现的细节。" -#: source/TortoiseSVN_en.xml:1432(para) -msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." -msgstr "我们讨论了一些 Subversion 跟踪和管理工作副本信息的方式。" +#: source/TortoiseSVN_en.xml:3140(para) +msgid "These hook scripts are executed by the server that hosts the repository. TortoiseSVN also allows you to configure client side hook scripts that are executed locally upon certain events. See for more information." +msgstr "" -#: source/TortoiseSVN_en.xml:144(title) -msgid "TortoiseSVN is free!" -msgstr "TortoiseSVN 是完全免费的！" +#: source/TortoiseSVN_en.xml:3146(para) +msgid "" +"Sample hook scripts can be found in the hooks directory of the repository. These sample scripts are suitable for Unix/Linux servers but need to be modified if your server is Windows based. The hook can be a batch file or an executable. The sample below shows a batch file which might be used to implement a pre-revprop-change hook. \n" +"rem Only allow log messages to be changed.\n" +"if \"%4\" == \"svn:log\" exit 0\n" +"echo Property '%4' cannot be changed >&2\n" +"exit 1\n" +" Note that anything sent to stdout is discarded. if you want a message to appear in the Commit Reject dialog you must send it to stderr. In a batch file this is achieved using >&2" +msgstr "" +"版本库的hooks目录中有一些钩子的例子脚本，这些例子脚本适合于Unix/Linux服务器，在Windows下需要修改。钩子可以是批处理文件或可执行文件，下面是用来实现pre-revprop-change钩子的例子。\n" +"rem Only allow log messages to be changed.\n" +"if \"%4\" == \"svn:log\" exit 0\n" +"echo Property '%4' cannot be changed >&2\n" +"exit 1\n" +"请注意所有发送到标准输出的东西都会被忽略，如果你希望信息出现在拒绝提交对话框中，你需要将这些信息发送到标准错误，在一个批处理文件中使用>&2实现。" -#: source/TortoiseSVN_en.xml:1445(title) -msgid "Setting Up A Server" -msgstr "配置服务器" +#: source/TortoiseSVN_en.xml:3166(title) +msgid "Checkout Links" +msgstr "检出链接" -#: source/TortoiseSVN_en.xml:1447(para) -msgid "To use TortoiseSVN (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." -msgstr "为了使用TortoiseSVN(或任何其他Subversion客户端)，你需要放置你的版本库，你可以将版本库存于本地并使用file://协议访问，也可以放置于服务器，使用http://或svn://访问，这两种服务器协议也可以被加密，使用https://或svn+ssh://。本章介绍了在Windows主机上设置一个服务器的步骤。" +#: source/TortoiseSVN_en.xml:3168(primary) +msgid "checkout link" +msgstr "检出链接" -#: source/TortoiseSVN_en.xml:145(para) -msgid "TortoiseSVN is free. You don't have to pay to use it, and you can use it any way you want. It is developed under the GNU General Public License (GPL)." -msgstr "TortoiseSVN 是免费的，你不需要为使用它而付费，可以用任何你希望的方式使用它，它开发的许可证是 GNU General Public License (GPL)。" +#: source/TortoiseSVN_en.xml:3170(para) +msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TSVN users." +msgstr "如果你希望你的Subversion版本库对于别人可用，你可以在你的站点包含一个链接。为了让这些更加容易访问，你可以为其他TSVN用户包含一个检出链接。" -#: source/TortoiseSVN_en.xml:1458(para) -msgid "If you don't have a server and/or if you only work alone then local repositories are probably your best choice. You can skip this chapter and go directly to ." -msgstr "如果你没有一个服务器，或者你独自工作，本地版本库会是你的最佳选择，你可以跳过本章，直接到。" +#: source/TortoiseSVN_en.xml:3176(para) +msgid "When you install TortoiseSVN, it registers a new tsvn: protocol. When a TSVN user clicks on such a link, the checkout dialog will open automatically with the repository URL already filled in." +msgstr "当你安装了TortoiseSVN，它会注册一个tsvn:协议，当TSVN用户点击这样一个链接，检出窗口会自动弹出，且版本库URL已经填入。" -#: source/TortoiseSVN_en.xml:1467(title) -msgid "Apache Based Server" -msgstr "基于 Apache 的服务器" +#: source/TortoiseSVN_en.xml:3182(para) +msgid "" +"To include such a link in your own html page, you need to add code which looks something like this: \n" +"<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\"></a>\n" +"" +msgstr "" +"为了在你自己的网页上包含这样一个链接，你需要添加类似下面的代码: \n" +"<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\"></a>\n" +"" -#: source/TortoiseSVN_en.xml:1469(title) source/TortoiseSVN_en.xml:2560(title) -#: source/TortoiseSVN_en.xml:311(title) -msgid "Introduction" -msgstr "简介" +#: source/TortoiseSVN_en.xml:3189(para) +msgid "" +"Of course it would look even better if you included a suitable picture. You can use the TortoiseSVN logo or you can provide your own image. \n" +"<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\">\n" +"<img src=TortoiseCheckout.png></a>\n" +"" +msgstr "" +"当然，如果你提供一个合适的图片会更好，你可以使用TortoiseSVN logo，也可以使用自己的图片。\n" +"<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\">\n" +"<img src=TortoiseCheckout.png></a>\n" +"" -#: source/TortoiseSVN_en.xml:1471(primary) -msgid "Apache" -msgstr "Apache" +#: source/TortoiseSVN_en.xml:3204(title) +msgid "Daily Use Guide" +msgstr "日常使用指南" -#: source/TortoiseSVN_en.xml:1473(para) -msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" -msgstr "所有可能的服务器当中，Apache为基础的服务器是最灵活的，尽管配置有一点复杂，但是提供了其他服务器没有的便利: " +#: source/TortoiseSVN_en.xml:3208(para) +msgid "This document describes day to day usage of the TortoiseSVN client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." +msgstr "本文目的在与描述TortoiseSVN客户端的日常使用。不是一个版本控制系统指南，也不是Subversion (SVN)的指南。本文档的价值在于，当你知道大概要做什么，却又记不起应该怎么做的时候，可以有个参考的地方。" -#: source/TortoiseSVN_en.xml:1479(primary) -#: source/TortoiseSVN_en.xml:1483(term) -msgid "WebDAV" -msgstr "WebDAV" +#: source/TortoiseSVN_en.xml:3216(para) +msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." +msgstr "如果你需要了解使用Subversion进行版本控制的指南，我们建立你阅读以下这本梦幻之书: 《使用 Subversion 进行版本管理》." -#: source/TortoiseSVN_en.xml:1485(para) -msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a \"Webfolder\" in the Windows explorer and then access it like any other folder in the filesystem" -msgstr "Apache为基础的Subversion服务器使用WebDAV协议，许多其他程序支持这个协议，你可以在Windows资源管理器中将这样的版本库装载为一个“网络文件夹”，就像访问文件系统的其他目录一样访问它。" +#: source/TortoiseSVN_en.xml:3223(para) +msgid "This document is also a work in progress, just as TortoiseSVN and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseSVN in our free time." +msgstr "本文档与TortoiseSVN和Subversion一样，也是处于“正在开发”的状态。如果你找到了错误之处，请向邮件列表报告，这样我们就可以更新它。日常使用指南(DUG)中的一些屏幕截图也许不符合当前软件中的情况。请您原谅我们。毕竟我们只是用业余的时间在制作TortoiseSVN 。" -#: source/TortoiseSVN_en.xml:149(para) -msgid "TortoiseSVN is an Open Source project. That means you have full access to the source code of this program. You can browse it on this link http://tortoisesvn.tigris.org/svn/tortoisesvn/. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under /trunk/ the released versions are located under /tags/." -msgstr "TortoiseSVN 是一个开源项目，那意味着你可以访问程序所有的源代码，你可以在 http://tortoisesvn.tigris.org/svn/tortoisesvn/ 浏览代码(用户名: guest，密码为空)。最新的版本(我们正在为之工作的版本)位于/trunk/，发布的版本位于/tags/。" +#: source/TortoiseSVN_en.xml:3235(para) +msgid "You should have installed TortoiseSVN already." +msgstr "你应该已经安装了TortoiseSVN。" -#: source/TortoiseSVN_en.xml:1496(term) -msgid "Browsing The Repository" -msgstr "浏览版本库" +#: source/TortoiseSVN_en.xml:3240(para) +msgid "You should be familiar with version control systems." +msgstr "你应该熟悉版本控制系统。" -#: source/TortoiseSVN_en.xml:1498(para) -msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." -msgstr "你可以将浏览器指向版本库的URL，无需安装Subversion客户端就可以浏览内容，这样可以扩大访问你数据的用户圈。" +#: source/TortoiseSVN_en.xml:3245(para) +msgid "You should know the basics of Subversion." +msgstr "你应该知道Subversion的基础。" -#: source/TortoiseSVN_en.xml:15(firstname) -msgid "Lübbe" -msgstr "Lübbe" +#: source/TortoiseSVN_en.xml:3250(para) +msgid "You should have set up a server and/or have access to a Subversion repository." +msgstr "你应该已经建立了一个服务器并且可以访问Subversion库。" -#: source/TortoiseSVN_en.xml:1508(term) source/TortoiseSVN_en.xml:3383(title) -msgid "Authentication" -msgstr "认证" +#: source/TortoiseSVN_en.xml:3231(para) +msgid "In order to get the most out of the Daily Use Guide: " +msgstr "为了获得比每日用户指南更多的信息: " -#: source/TortoiseSVN_en.xml:1510(para) -msgid "You can use any authentication mechanism Apache supports, including SSPI and LDAP." -msgstr "你可以使用所有Apache支持的认证机制，包括SSPI和LDAP。" +#: source/TortoiseSVN_en.xml:3261(title) +msgid "Getting Started" +msgstr "开始" -#: source/TortoiseSVN_en.xml:1517(term) -msgid "Security" -msgstr "安全" +#: source/TortoiseSVN_en.xml:3263(title) source/TortoiseSVN_en.xml:4590(title) +msgid "Icon Overlays" +msgstr "图标重载" -#: source/TortoiseSVN_en.xml:1519(para) -msgid "Since Apache is very stable and secure, you automatically get the same security for your repository. This includes SSL encryption." -msgstr "因为Apache非常稳定和安全，你的版本库可以自动获得同样的安全性，包括SSL加密。" +#: source/TortoiseSVN_en.xml:3266(title) source/TortoiseSVN_en.xml:4599(title) +msgid "Explorer showing icon overlays" +msgstr "显示重载图标的资源管理器" -#: source/TortoiseSVN_en.xml:1529(title) -msgid "Installing Apache" -msgstr "安装 Apache" +#: source/TortoiseSVN_en.xml:3264(para) +msgid " One of the most visible features of TortoiseSVN is the icon overlays which appear on files in your working copy. These show you at a glance which of your files have been modified. Refer to to find out what the different overlays represent." +msgstr " TortoiseSVN 最明显的特性之一就是图标重载，重载的图标显示在你的工作副本文件上。你一眼就可以看到文件被修改过了。参考 查阅不同的重载图标含义。" -#: source/TortoiseSVN_en.xml:1530(para) -msgid "The first thing you need before installing Apache is a computer with either Windows2000 / WinXP+SP1 or Windows2003. " -msgstr "无论是Windows2000、WinXP+SP1还是Windows2003，在安装Apache之前需要做的第一件事。" +#: source/TortoiseSVN_en.xml:3277(title) +msgid "Context Menus" +msgstr "右键菜单" -#: source/TortoiseSVN_en.xml:1534(para) -msgid "Please note that Windows XP without the servicepack 1 will lead to bogus network data and could therefore corrupt your repository!" -msgstr "请注意，Windows XP如果没有安装SP1将会导致不正常的网络传输，从而搞坏你的版本库！" +#: source/TortoiseSVN_en.xml:3279(primary) +msgid "context menu" +msgstr "右键菜单" -#: source/TortoiseSVN_en.xml:1542(para) -msgid "Download the latest version of the Apache webserver from http://httpd.apache.org/download.cgi. Make sure that you download the version > 2.0.54 - the version 1.3.xx won't work! Also, versions lower than 2.0.54 won't work with Subversion 1.2 because of a bug in how Apache < 2.0.54 was built for Windows." -msgstr "从Apache网站http://httpd.apache.org/download.cgi下载最新版本的Apache，请确定你下载的版本高于2.0.54－1.3.xx的版本不能工作！同样，低于2.0.54的版本不能与Subversion 1.2一起工作，因为Apache低于2.0.54的Windows版本的编译存在问题。" +#: source/TortoiseSVN_en.xml:3283(title) +msgid "Context menu for a directory under version control" +msgstr "版本控制下一个目录的右键菜单" -#: source/TortoiseSVN_en.xml:1555(para) -msgid "Once you have the Apache2 installer you can doubleclick on it and it will guide you through the installation process. Make sure that you enter the server-URL correctly (if you don't have a dns name for your server just enter the ip-address). I recommend to install apache for All Users, on Port 80, as a Service. Note: if you already have IIS or any other program running which listens on port 80 the installation might fail. If that happens, go to the programs directory, \\Apache Group\\Apache2\\conf and locate the file httpd.conf. Edit that file so that Listen 80 is changed to a free port, e.g. Listen 81. Then restart the installation - this time it should finish without problems." -msgstr "一旦你有了Apache2安装程序，你可以双击它，然后它会指导你的安装过程，请确认你输入的server的URL正确(如果你的服务器没有dns名称，请直接输入IP地址)。我建议安装Apache为所有用户，在80端口，作为一个服务。注意: 如果你已经有了IIS或其他监听80段口的程序，安装会失败，如果发生这种情况，直接到程序的安装目录\\Apache Group\\Apache2\\conf，打开httpd.conf。编辑文件的Listen 80为其他可用的端口，例如Listen 81，然后重新启动－这样就不会那个问题了。" +#: source/TortoiseSVN_en.xml:3281(para) +msgid " All TortoiseSVN commands are invoked from the context menu of the windows explorer. Most are directly visible, when you right click on a file or folder. The commands that are available depend on whether the file or folder or its parent folder is under version control or not. You can also see the TortoiseSVN menu as part of the Explorer file menu." +msgstr " 所有的TortoiseSVN命令都是通过windows资源管理器的右键菜单执行。右键点击一个文件或者文件夹，大多数菜单项都能够直接显示。一个命令是否显示取决于这个文件或文件夹或者它们的父文件夹是否受版本控制，你也可以将TortoiseSVN的菜单作为资源管理器菜单的一部分。" -#: source/TortoiseSVN_en.xml:1577(para) -msgid "Now test if the Apache-webserver is running correctly by pointing your webbrowser to http://localhost/ - a preconfigured Website should show up." -msgstr "现在可以测试Apache服务器了，将浏览器指向http://localhost/－将会看到一个预先配置的网站。" +#: source/TortoiseSVN_en.xml:3295(title) +msgid "Explorer file menu for a shortcut in a versioned folder" +msgstr "在一个版本控制的文件夹下资源管理器文件菜单中的快捷方式。" -#: source/TortoiseSVN_en.xml:1586(para) -msgid "If you decide to install Apache as a service, be warned that by default it will run as the local system account. It would be a more secure practice for you to create a separate account for Apache to run as." -msgstr "如果你决定将Apache安装为服务，缺省情况以本地系统帐户运行会发出警告，更安全的方法是为Apache创建一个单独的运行帐户。" +#: source/TortoiseSVN_en.xml:3292(para) +msgid "In some cases you may see several TortoiseSVN entries. This is not a bug! This example is for an unversioned shortcut within a versioned folder, and in the Explorer file menu there are three entries for TortoiseSVN. One is for the folder, one for the shortcut itself, and the third for the object the shortcut is pointing to. To help you distinguish between them, the icons have an indicator in the lower right corner to show whether the menu entry is for a file, a folder, a shortcut or for multiple selected items." +msgstr "在某些情况下，你可能看到多个TortoiseSVN条目。这不是BUG！本示例是在一个受控文件夹下的某个未受控的快捷方式， 在资源管理器的文件菜单下有三个TortoiseSVN条目。一个是受控文件夹本身的，一个是快捷方式本身的，第三个是快捷方式所指向的对象。为了帮助你区分它们，菜单条目的图标的右下角有标志，表明是文件、快捷方式、文件夹或是选中了多项。" -#: source/TortoiseSVN_en.xml:1592(para) -msgid "Make sure that the account on the server that Apache is running as has an explicit entry in the repository directory's access control list (right-click directory | properties | security), with full control. Otherwise, users will not be able to commit their changes." -msgstr "请确认Apache运行的帐户是版本库目录的访问控制列表(右键目录|属性|安全)中一个明确的条目，对目录有完全的控制能力，否则，用户不能提交他们的修改。" +#: source/TortoiseSVN_en.xml:3308(title) source/TortoiseSVN_en.xml:4085(title) +msgid "Drag and Drop" +msgstr "拖放" -#: source/TortoiseSVN_en.xml:1598(para) -msgid "Even if Apache runs as local system, you still need such an entry (which will be the SYSTEM account in this case)." -msgstr "即使Apache运行于本地系统，你仍然需要这个条目(这种情况下将是SYSTEM帐户)。" +#: source/TortoiseSVN_en.xml:3310(primary) +msgid "drag handler" +msgstr "拖拽句柄" -#: source/TortoiseSVN_en.xml:16(surname) -msgid "Onken" -msgstr "Onken" +#: source/TortoiseSVN_en.xml:3313(primary) +msgid "drag-n-drop" +msgstr "拖放" -#: source/TortoiseSVN_en.xml:1602(para) -msgid "If Apache does not have this permission set up, your users will get \"Access denied\" error messages, which show up in the Apache error log as error 500." -msgstr "如果没有设置Apache的访问权限，你的用户会得到“拒绝访问(Access denied)”的错误信息，在Apache的错误日志中为错误500。" +#: source/TortoiseSVN_en.xml:3316(primary) +msgid "right drag" +msgstr "右键拖动" -#: source/TortoiseSVN_en.xml:1611(title) -msgid "Installing Subversion" -msgstr "安装 Subversion" +#: source/TortoiseSVN_en.xml:3319(primary) +#: source/TortoiseSVN_en.xml:6839(primary) +#: source/TortoiseSVN_en.xml:7970(primary) +msgid "copy" +msgstr "复制" -#: source/TortoiseSVN_en.xml:1615(para) -msgid "Download the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "从http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91下载最新版本的Subversion。" +#: source/TortoiseSVN_en.xml:3323(title) +msgid "Right drag menu for a directory under version control" +msgstr "版本控制下的一个目录的右键拖拽菜单" -#: source/TortoiseSVN_en.xml:1623(para) -msgid "Run the Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." -msgstr "运行Subversion安装程序，并根据指导安装，如果Subversion认识到你安装了Apache，你就几乎完成了工作，如果它没有找到Apache服务器，你还有额外的步骤。" +#: source/TortoiseSVN_en.xml:3321(para) +msgid " Other commands are available as drag handlers, when you right drag files or folders to a new location inside working copies or when you right drag a non-versioned file or folder into a directory which is under version control." +msgstr " 在工作副本里右键拖拽文件或目录到新的位置，或者右键拖拽一个非版本控制的文件或文件夹到一个版本控制目录下的时候，右键菜单还能够出现其他的命令。" -#: source/TortoiseSVN_en.xml:1633(primary) -#: source/TortoiseSVN_en.xml:2044(primary) -msgid "mod_authz_svn" -msgstr "mod_authz_svn" +#: source/TortoiseSVN_en.xml:3333(title) +msgid "Common Shortcuts" +msgstr "常用快捷方式" -#: source/TortoiseSVN_en.xml:1635(para) -msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." -msgstr "使用Windwos资源管理器，来到Subversion的安装目录(通常是c:\\program files\\Subversion)，找到文件/httpd/mod_dav_svn.so和mod_authz_svn.so，复制这些文件到Apache的模块目录(通常是c:\\program files\\apache group\\apache2\\modules )。" +#: source/TortoiseSVN_en.xml:3340(term) +msgid "F1" +msgstr "F1" -#: source/TortoiseSVN_en.xml:1648(para) -msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." -msgstr "从 Subversion 安装目录将 /bin/libdb*.dll 和 /bin/intl3_svn.dll 复制到 Apache 的 bin 目录。" +#: source/TortoiseSVN_en.xml:3342(para) +msgid "Help, of course." +msgstr "当然是帮助。" -#: source/TortoiseSVN_en.xml:1656(para) -msgid "Edit Apache's configuration file (usually C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf) with a text editor such as Notepad and make the following changes:" -msgstr "使用记事本之类的文本编辑器修改Apache的配置文件(通常是 C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf)，做出如下修改: " +#: source/TortoiseSVN_en.xml:3348(term) +msgid "F5" +msgstr "F5" -#: source/TortoiseSVN_en.xml:1662(para) -msgid "" -"Uncomment (remove the '#' mark) the following lines: \n" -"#LoadModule dav_fs_module modules/mod_dav_fs.so\n" -"#LoadModule dav_module modules/mod_dav.so\n" -" Add the following two lines to the end of the LoadModule section. \n" -"LoadModule dav_svn_module modules/mod_dav_svn.so\n" -"LoadModule authz_svn_module modules/mod_authz_svn.so\n" -"" -msgstr "" -"去掉以下几行的注释(删除 '#'标记): \n" -"#LoadModule dav_fs_module modules/mod_dav_fs.so\n" -"#LoadModule dav_module modules/mod_dav.so\n" -" 将以下两行到 LoadModule 节的末尾。\n" -"LoadModule dav_svn_module modules/mod_dav_svn.so\n" -"LoadModule authz_svn_module modules/mod_authz_svn.so\n" -"" - -#: source/TortoiseSVN_en.xml:168(title) -msgid "Community" -msgstr "社区" - -#: source/TortoiseSVN_en.xml:1681(title) source/TortoiseSVN_en.xml:9963(term) -msgid "Configuration" -msgstr "配置" - -#: source/TortoiseSVN_en.xml:1682(para) -msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseSVN yet. To get Apache to know which URL shall be used for Subversion repositories you have to edit the Apache config file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " -msgstr "现在你已经设置了Apache和Subversion，但是Apache不知道如何处理Subversion客户端，例如TortoiseSVN。为了让Apache知道哪个目录是用来作为Subversion版本库，你需要使用编辑器(例如记事本)编辑Apache的配置文件(通常是c:\\program files\\apache group\\apache2\\conf\\httpd.conf): " - -#: source/TortoiseSVN_en.xml:169(para) -msgid "Both TortoiseSVN and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." -msgstr "TortoiseSVN 和 Subversion 由工作在这些项目的社区成员开发。他们来自全世界不同的国家，联合起来创造美妙的程序。" +#: source/TortoiseSVN_en.xml:3350(para) +msgid "Refresh the current view. This is perhaps the single most useful one-key command. For example ... In Explorer this will refresh the icon overlays on your working copy. In the commit dialog it will re-scan the working copy to see what may need to be committed. In the Revision Log dialog it will contact the repository again to check for more recent changes." +msgstr "刷新当前视图。这也许是单键命令中唯一一个最常用的了。比如... 在资源浏览器中，这个键可以刷新工作副本中的图标重载。在提交对话框中，它可以重新扫描查找哪些是需要提交的。在版本日志对话框中，可以重新联系版本库以检查更多的最近修改情况。" -#: source/TortoiseSVN_en.xml:1692(para) -msgid "" -"At the end of the Config file add the following lines: \n" -"<Location /svn>\n" -"DAV svn\n" -"SVNListParentPath on\n" -"SVNParentPath D:\\SVN\n" -"#SVNIndexXSLT \"/svnindex.xsl\"\n" -"AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" -"AuthUserFile passwd\n" -"#AuthzSVNAccessFile svnaccessfile\n" -"Require valid-user\n" -"</Location>\n" -" This configures Apache so that all your Subversion repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." -msgstr "" -"在配置文件最后添加如下几行: \n" -"<Location /svn>\n" -"DAV svn\n" -"SVNListParentPath on\n" -"SVNParentPath D:\\SVN\n" -"#SVNIndexXSLT \"/svnindex.xsl\"\n" -"AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" -"AuthUserFile passwd\n" -"#AuthzSVNAccessFile svnaccessfile\n" -"Require valid-user\n" -"</Location>\n" -"这个配置告诉 Apache 你的所有 Subversion 版本库位于D:\\SVN，版本库对外的URL是: http://MyServer/svn/ 。访问被文件passwd中的用户/密码限制。" +#: source/TortoiseSVN_en.xml:3362(term) +msgid "Ctrl-A" +msgstr "Ctrl-A" -#: source/TortoiseSVN_en.xml:1719(para) -msgid "" -"To create the passwd file, open the command prompt (DOS-Box) again, change to the apache2 folder (usually c:\\program files\\apache group\\apache2) and create the file by entering \n" -"bin\\htpasswd -c passwd <username>\n" -" This will create a file with the name passwd which is used for authentication. Additional users can be added with \n" -"bin\\htpasswd passwd <username>\n" -"" -msgstr "" -"为了创建passwd文件，再次打开命令行提示符(DOS)，来到apache2目录(通常是c:\\program files\\apache group\\apache2)通过输入下面的命令创建文件\n" -"bin\\htpasswd -c passwd <username>\n" -" This will create a file with the name passwd which is used for authentication. Additional users can be added with \n" -"bin\\htpasswd passwd <username>\n" -"" +#: source/TortoiseSVN_en.xml:3364(para) +msgid "Select all. This can be used if you get an error message and want to copy and paste into an email. Use Ctrl-A to select the error message and then ..." +msgstr "全选。可用于在得到一个错误消息并想要复制粘贴到电子邮件时。使用Ctrl-A to选择错误错误，然后..." -#: source/TortoiseSVN_en.xml:1738(para) -msgid "Restart the Apache service again." -msgstr "再次重启Apache服务。" +#: source/TortoiseSVN_en.xml:3372(term) +msgid "Ctrl-C" +msgstr "Ctrl-C" -#: source/TortoiseSVN_en.xml:1743(para) -msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." -msgstr "将浏览器指向http://MyServer/svn/MyNewRepository(MyNewRepository是你此前创建的版本库名)，如果一切正常，你会被提示输入用户名和密码，然后你会看到版本库的内容。" +#: source/TortoiseSVN_en.xml:3374(para) +msgid "... Copy the selected text." +msgstr "... 复制选中的文本。" -#: source/TortoiseSVN_en.xml:1756(primary) -msgid "SVNPath" -msgstr "SVNPath" +#: source/TortoiseSVN_en.xml:3334(para) +msgid "Some common operations have well-know Windows shortcuts, but do not appear on buttons or in menus. If you can't work out how to do something obvious, like refreshing a view, check here. " +msgstr "一些常见的操作与Windows的快捷键是一样的，但没有出现在按钮或是菜单中。如果你找不到一些显而易见的操作，比如刷新视图，请参考以下内容。 " -#: source/TortoiseSVN_en.xml:1759(primary) -#: source/TortoiseSVN_en.xml:1929(primary) -msgid "SVNParentPath" -msgstr "SVNParentPath" +#: source/TortoiseSVN_en.xml:3385(primary) +msgid "authentication" +msgstr "认证" -#: source/TortoiseSVN_en.xml:1761(para) -msgid "A short explanation of what you just entered: But that's just an example. There are many, many more possibilities of what you can do with the Apache webserver. " -msgstr "你刚才输入的解释是: 但是那只是一个例子，对于Apache你有很多的选择。" +#: source/TortoiseSVN_en.xml:3391(title) +msgid "Authentication Dialog" +msgstr "认证对话框" -#: source/TortoiseSVN_en.xml:1764(title) -msgid "Apache httpd.conf Settings" -msgstr "设置 Apache 的 httpd.conf" +#: source/TortoiseSVN_en.xml:3399(para) +msgid "svn.simple contains credentials for basic authentication (username/password)." +msgstr "svn.simple文件里包含了基本认证方式所需要的认证信息(用户名/口令)。" -#: source/TortoiseSVN_en.xml:1770(entry) -msgid "Setting" -msgstr "设置" +#: source/TortoiseSVN_en.xml:3405(para) +msgid "svn.ssl.server contains SSL server certificates." +msgstr "svn.ssl.server文件里包含了SSL服务器证书。" -#: source/TortoiseSVN_en.xml:1771(entry) -msgid "Explanation" -msgstr "解释" +#: source/TortoiseSVN_en.xml:3411(para) +msgid "svn.username contains credentials for username-only authentication (no password needed)." +msgstr "svn.username文件里包含了用户名认证的认证信息(不需要提供密码)。" -#: source/TortoiseSVN_en.xml:1776(entry) -msgid "<Location /svn>" -msgstr "<Location /svn>" +#: source/TortoiseSVN_en.xml:3387(para) +msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseSVN store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: There is one file for each server that you access, formatted as plain text, so you can use a text editor to check which server it applies to. In order to make Subversion and TortoiseSVN (and any other Subversion client) forget your credentials for a particular server, simply delete the corresponding file." +msgstr "如果连接的版本库需要口令，就会显示认证对话框。 输入你的用户名和口令。其检查框能让 TortoiseSVN 在 Subversion的 缺省目录：%APPDATA%\\Subversion\\auth 的三个子目录内保存认证信息： 每个文件对应一个服务器，文件是纯文本格式，因此可以用文本编辑器查看文件是对应哪个服务器。如果希望 Subversion 和 TortoiseSVN(或者其它 Subversion 客户端) 忘记某个服务器的凭证信息，只需删除这个服务器的对应文件即可。" -#: source/TortoiseSVN_en.xml:1777(entry) -msgid "means that the Subversion repositories are available from the URL " -msgstr "意思是Subversion版本库的URL是" +#: source/TortoiseSVN_en.xml:3423(para) +msgid "If you want to clear the authentication cache for all servers, you can do so from the General page of TortoiseSVN's settings dialog. That button will clear all cached auth data from the Subversion auth directories, as well as any auth data stored in the registry by earlier versions of TortoiseSVN. Refer to ." +msgstr "如果想要清除所有服务器的认证缓存，可以通过TortoiseSVN的设置对话框的常规设置页来实现。那个按钮能够清除Subversion的auth目录下缓存的所有认证数据，以及老版本的TortoiseSVN存储在注册表里的认证数据。请参考 。" -#: source/TortoiseSVN_en.xml:1779(systemitem) -msgid "http://MyServer/svn/" -msgstr "http://MyServer/svn/" +#: source/TortoiseSVN_en.xml:3431(para) +msgid "For more information on how to set up your server for authentication and access control, refer to " +msgstr "关于如何设置服务器的认证和权限的更多信息，请参考" -#: source/TortoiseSVN_en.xml:1783(entry) -msgid "DAV svn" -msgstr "DAV svn" +#: source/TortoiseSVN_en.xml:3437(para) +msgid "If you have to authenticate against a Windows NT domain, enter your username including the domain name, like: MYDOMAIN\\johnd." +msgstr "如果使用 Windows NT 域认证，输入用户名的时候要包括域名，如: MYDOMAIN\\johnd。" -#: source/TortoiseSVN_en.xml:1784(entry) -msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." -msgstr "告诉Apache是哪个模块响应那个URL的请求－此刻是Subversion模块。" +#: source/TortoiseSVN_en.xml:3445(title) +msgid "Maximising Windows" +msgstr "最大化窗口" -#: source/TortoiseSVN_en.xml:1790(entry) -msgid "SVNListParentPath on" -msgstr "SVNListParentPath on" +#: source/TortoiseSVN_en.xml:3447(primary) +msgid "maximise" +msgstr "最大化" -#: source/TortoiseSVN_en.xml:1791(entry) -msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under SVNParentPath." -msgstr "对于Subversion1.3或者更高版本，这个指示表示显示所有SVNParentPath下的版本库。" +#: source/TortoiseSVN_en.xml:3449(para) +msgid "Many of TortoiseSVN's dialogs have a lot of information to display, but it is often useful to maximise only the height, or only the width, rather than maximising to fill the screen. As a convenience, there are shortcuts for this on the Maximise button. Use the middle mouse button to maximise vertically, and right mouse to maximise horizontally." +msgstr "" -#: source/TortoiseSVN_en.xml:1797(entry) -msgid "SVNParentPath D:\\SVN" -msgstr "SVNParentPath D:\\SVN" +#: source/TortoiseSVN_en.xml:3460(title) +msgid "Importing Data Into A Repository" +msgstr "导入数据到版本库" -#: source/TortoiseSVN_en.xml:1798(entry) -msgid "tells Subversion to look for repositories below " -msgstr "告诉Subversion需要查看的版本库位于之下" +#: source/TortoiseSVN_en.xml:3462(primary) +msgid "import" +msgstr "导入" -#: source/TortoiseSVN_en.xml:180(title) -msgid "Acknowledgments" -msgstr "致谢" +#: source/TortoiseSVN_en.xml:3465(primary) +#: source/TortoiseSVN_en.xml:12421(glossterm) +msgid "Repository" +msgstr "版本库" -#: source/TortoiseSVN_en.xml:1800(filename) -msgid "D:\\SVN" -msgstr "D:\\SVN" +#: source/TortoiseSVN_en.xml:3469(title) +msgid "Repository Layout" +msgstr "版本库布局" -#: source/TortoiseSVN_en.xml:1804(entry) -msgid "SVNIndexXSLT \"/svnindex.xsl\"" -msgstr "SVNIndexXSLT \"/svnindex.xsl\"" +#: source/TortoiseSVN_en.xml:3470(para) +msgid "Before you import your data into the repository you should first think about how you want to organize your data. If you use one of the recommended layouts you will later have it much easier." +msgstr "在将你的数据导入到版本库之前，首先你得考虑如何组织你的数据。如果你使用一种推荐的布局，你在后面的操作将会更容易许多。" -#: source/TortoiseSVN_en.xml:1805(entry) -msgid "Used to make the browsing with a webbrowser more pretty." -msgstr "使用它可以在用浏览器浏览时更好看。" +#: source/TortoiseSVN_en.xml:3476(para) +msgid "There are some standard, recommended ways to organize a repository. Most people create a trunk directory to hold the \"main line\" of development, a branches directory to contain branch copies, and a tags directory to contain tag copies. If a repository holds only one project, then often people create these top-level directories:" +msgstr "有一些标准的、推荐的方式来组织一个版本库。大多数人建一个trunk目录来存放开发的“主线”、一个branches目录来容纳分支副本、以及一个tags目录来容纳标签复制。如果一个版本库只存放一个项目，人们通常创建三个这样的顶层目录: " -#: source/TortoiseSVN_en.xml:1811(entry) -msgid "AuthType Basic" -msgstr "AuthType Basic" +#: source/TortoiseSVN_en.xml:3485(screen) +#, no-wrap +msgid "" +"\n" +"/trunk\n" +"/branches\n" +"/tags\n" +msgstr "" +"\n" +"/trunk\n" +"/branches\n" +"/tags\n" -#: source/TortoiseSVN_en.xml:1812(entry) -msgid "is to activate basic authentication, i.e. Username/password" -msgstr "激活基本认证，就是用户名/密码" +#: source/TortoiseSVN_en.xml:3490(para) +msgid "If a repository contains multiple projects, people often index their layout by branch:" +msgstr "如果一个版本库包含多个项目，人们通常按分支来安排布局: " -#: source/TortoiseSVN_en.xml:1818(entry) -msgid "AuthName \"Subversion repositories\"" -msgstr "AuthName \"Subversion repositories\"" +#: source/TortoiseSVN_en.xml:3494(screen) +#, no-wrap +msgid "" +"\n" +"/trunk/paint\n" +"/trunk/calc\n" +"/branches/paint\n" +"/branches/calc\n" +"/tags/paint\n" +"/tags/calc\n" +msgstr "" +"\n" +"/trunk/paint\n" +"/trunk/calc\n" +"/branches/paint\n" +"/branches/calc\n" +"/tags/paint\n" +"/tags/calc\n" -#: source/TortoiseSVN_en.xml:1819(entry) -msgid "is used as an information whenever an authentication dialog pops up to tell the user what the authentication is for" -msgstr "用来说明何时弹出要求用户输入认证信息的认证对话框" +#: source/TortoiseSVN_en.xml:3502(para) +msgid "...or by project:" +msgstr "……或者按项目: " -#: source/TortoiseSVN_en.xml:1825(entry) -msgid "AuthUserFile passwd" -msgstr "AuthUserFile passwd" +#: source/TortoiseSVN_en.xml:3505(screen) +#, no-wrap +msgid "" +"\n" +"/paint/trunk\n" +"/paint/branches\n" +"/paint/tags\n" +"/calc/trunk\n" +"/calc/branches\n" +"/calc/tags\n" +msgstr "" +"\n" +"/paint/trunk\n" +"/paint/branches\n" +"/paint/tags\n" +"/calc/trunk\n" +"/calc/branches\n" +"/calc/tags\n" -#: source/TortoiseSVN_en.xml:1826(entry) -msgid "specifies which password file to use for authentication" -msgstr "指定使用的认证密码文件" +#: source/TortoiseSVN_en.xml:3513(para) +msgid "Indexing by project makes sense if the projects are not closely related and each one is checked out individually. For related projects where you may want to check out all projects in one go, or where the projects are all tied together in a single distribution package, it is often better to index by branch. This way you have only one trunk to checkout, and the relationships between the sub-projects is more easily visible." +msgstr "如果项目不是密切相关，而且每一个是单独被检出，那么按项目布局是合理的。对于那些你想一次检出所有项目，或需要将它们打成一个分发包的相关项目，按分支来布局通常比较好。这种方式你只要检出一个分支，而且子项目之间的关系也比较清楚。" -#: source/TortoiseSVN_en.xml:183(term) -msgid "Tim Kemp" -msgstr "Tim Kemp" +#: source/TortoiseSVN_en.xml:3521(para) +msgid "If you adopt a top level /trunk /tags /branches approach, there is nothing to say that you have to copy the entire trunk for every branch and tag, and in some ways this structure offers the most flexibility." +msgstr "如果你采用顶层/trunk /tags /branches这种方式，并不意味着你必须复制整个主线为分支或标签，而且某些情况下这种结构更具灵活性。" -#: source/TortoiseSVN_en.xml:1831(entry) -msgid "AuthzSVNAccessFile" -msgstr "AuthzSVNAccessFile" +#: source/TortoiseSVN_en.xml:3527(para) +msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseSVN projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." +msgstr "对于不相关的项目，你可能更愿意使用不同的版本库。当你提交时，改变的是整个版本库的修订号，而不是项目的。让两个不相关的项目共用一个版本库，会导致修订号出现较大的跳跃。Subversion和TortoiseSVN项目看起来是在同一个主机地址，但是它们是在完全独立的版本库中开发着，并且版本号也不相干。" -#: source/TortoiseSVN_en.xml:1832(entry) -msgid "Location of the Access file for paths inside a Subversion repository" -msgstr "位置Subversion版本库的访问控制文件的路径" +#: source/TortoiseSVN_en.xml:3537(para) +msgid "Of course, you're free to ignore these common layouts. You can create any sort of variation, whatever works best for you or your team. Remember that whatever you choose, it's not a permanent commitment. You can reorganize your repository at any time. Because branches and tags are ordinary directories, TortoiseSVN can move or rename them however you wish." +msgstr "当然，你完全可以不理会上面提及的通用布局。你可以自由改变，来满足你和你团队的需要。请记住，不管你选择哪种布局，它都不是永久的。你可以在随时重新组织你的版本库。因为分支和标签是普通的目录，只要你愿意，TortoiseSVN可以将它们移动或重命名。" -#: source/TortoiseSVN_en.xml:1838(entry) -msgid "Require valid-user" -msgstr "Require valid-user" +#: source/TortoiseSVN_en.xml:3545(para) +msgid "Switching from one layout to another is just a matter of issuing a series of server-side moves; If you don't like the way things are organized in the repository, just juggle the directories around." +msgstr "从一种布局转换到另一种布局仅仅是在服务器端移动一些文件或目录；如果你不喜欢版本库的组织形式，仅管大胆地修改那些目录。" -#: source/TortoiseSVN_en.xml:1839(entry) -msgid "specifies that only users who entered a correct username/password are allowed to access the URL" -msgstr "指定只有输入了正确的用户/密码的用户可以访问URL" +#: source/TortoiseSVN_en.xml:3556(para) +msgid "create a new empty folder on your hard drive" +msgstr "在你的硬盘上创建一个空的文件夹" -#: source/TortoiseSVN_en.xml:185(para) -msgid "for founding the TortoiseSVN project" -msgstr "TortoiseSVN 项目的发起者" +#: source/TortoiseSVN_en.xml:3561(para) +msgid "create your desired top-level folder structure inside that folder - don't put any files in it yet!" +msgstr "在那个文件夹下创建你想要的顶级目录－－千万不要放任何文件进去！" -#: source/TortoiseSVN_en.xml:1851(para) +#: source/TortoiseSVN_en.xml:3567(para) +msgid "import this structure into the repository via a right click on the folder and selecting TortoiseSVNImport... This will import your temp folder into the repository root to create the basic repository layout." +msgstr "通过在那个文件夹右键，选择TortoiseSVN导入... 将这个结构导入到版本库中。这将导入临时文件夹到版本库的根目录形成一个基本的版本库布局。" + +#: source/TortoiseSVN_en.xml:3551(para) +msgid "So if you haven't already created a basic folder structure inside your repository you should do that now: " +msgstr "所以，如果你还没创建一个基本的文件夹结构到你的版本库中，你现在可以这样做: " + +#: source/TortoiseSVN_en.xml:3582(para) msgid "" -"If you want your repository to have read access for everyone but write access only for specific users you can change the line \n" -"Require valid-user\n" -" to \n" -"<LimitExcept GET PROPFIND OPTIONS REPORT>\n" -"Require valid-user\n" -"</LimitExcept>\n" +"Note that the name of the folder you are importing does not appear in the repository, only its contents. For example, create the following folder structure: \n" +"C:\\Temp\\New\\trunk\n" +"C:\\Temp\\New\\branches\n" +"C:\\Temp\\New\\tags\n" +" Import C:\\Temp\\New into the repository root, which will then look like this: \n" +"/trunk\n" +"/branches\n" +"/tags\n" "" msgstr "" -"如果你希望所有人可以读你的版本库，但是只有特定用户可以写，你可以修改下面几行\n" -"Require valid-user\n" -" to \n" -"<LimitExcept GET PROPFIND OPTIONS REPORT>\n" -"Require valid-user\n" -"</LimitExcept>\n" +"注意，你所导入的那个文件夹的名字并不存在于版本库中，仅仅是它所包含的内容。比如，创建如下结构的文件夹\n" +"C:\\Temp\\New\\trunk\n" +"C:\\Temp\\New\\branches\n" +"C:\\Temp\\New\\tags\n" +"导入C:\\Temp\\New到版本库的根目录，版本库中将会是这样: \n" +"/trunk\n" +"/branches\n" +"/tags\n" "" -#: source/TortoiseSVN_en.xml:1866(para) -msgid "" -"Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" -"#AuthzSVNAccessFile svnaccessfile\n" -" and create a Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " -msgstr "" -"使用passwd可以整体的控制对版本库的访问，但是如果你希望精确的控制版本库目录访问，你可以修改需要下面几行\n" -"#AuthzSVNAccessFile svnaccessfile\n" -"，并且创建Subversion的访问控制文件。Apache将会确保只有有效的用户可以访问你的/svn目录，然后将用户名传递给Subversion的AuthzSVNAccessFile模块，这样就可以根据Subversion访问控制文件实现更细粒度的访问控制。请注意路径可以是repos:path或简单的path，如果你不指定特定的版本库，访问控制规则会应用到SVNParentPath下所有的版本库，使用的授权策略文件的格式将在描述。" +#: source/TortoiseSVN_en.xml:3599(para) +msgid "You can also use the repository browser to create new folders directly in the repository." +msgstr "你还可以使用版本库浏览器直接在版本库中创建文件夹。" -#: source/TortoiseSVN_en.xml:1893(para) -msgid "" -"To make browsing the repository with a web browser more 'pretty', uncomment the line \n" -"#SVNIndexXSLT \"/svnindex.xsl\"\n" -" and put the files svnindex.xsl, svnindex.css and menucheckout.ico in your document root directory (usually C:/Program Files/Apache Group/Apache2/htdocs). The directory is set with the DocumentRoot directive in your Apache config file." -msgstr "" -"如果要使浏览器浏览仓库时更“漂亮”，请将下行去掉注释 \n" -"#SVNIndexXSLT \"/svnindex.xsl\"\n" -"，将文件 svnindex.xsl, svnindex.css 和 menucheckout.ico 放到你的文档根目录中(通常是 C:/Program Files/Apache Group/Apache2/htdocs)。 这个目录在 Apache 配置文件中用 DocumentRoot 指示。" +#: source/TortoiseSVN_en.xml:3605(title) +#: source/TortoiseSVN_en.xml:12082(title) +#: source/TortoiseSVN_en.xml:12321(glossterm) +msgid "Import" +msgstr "导入" -#: source/TortoiseSVN_en.xml:19(firstname) -msgid "Simon" -msgstr "Simon" +#: source/TortoiseSVN_en.xml:3607(primary) +msgid "temporary files" +msgstr "临时文件" -#: source/TortoiseSVN_en.xml:1906(para) -msgid "You can get those three files directly from our source repository at http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/svnindex. If you're asked for authentication for this link, enter guest as username and leave the password empty." -msgstr "你可以直接在我们的代码库http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/svnindex中拿到这三个文件。如果访问这个链接需要认证，输入用户名称 guest，无需密码。" +#: source/TortoiseSVN_en.xml:3613(para) +msgid "Remove all files which are not needed to build the project (temporary files, files which are generated by a compiler e.g. *.obj, compiled binaries, ...)" +msgstr "删除所有构建工程不需要的文件(临时文件，编译器产生的文件，例如 *.obj，生成的二进制文件，...)" -#: source/TortoiseSVN_en.xml:191(term) -msgid "Stefan Küng" -msgstr "Stefan Küng" +#: source/TortoiseSVN_en.xml:3621(para) +msgid "Organize the files in folders and subfolders. Although it is possible to rename/move files later it is highly recommended to get your project's structure straight before importing!" +msgstr "组织目录和子目录内的文件。尽管以后可能会改名/删除文件，我们还是建议你在导入之前使你的项目结构组织良好！" -#: source/TortoiseSVN_en.xml:1915(para) -msgid "The xsl file from the TortoiseSVN repository has a nice gimmick: if you browse the repository with your webbrowser, then every folder in your repository has an icon on the right shown. If you click on that icon, the TortoiseSVN checkout dialog is started for this URL." -msgstr "TortoiseSVN 版本库中的 xsl 文件有个特性：如果你用浏览器浏览版本库，那么每个版本库中的目录右边会有个图标。如果你点击此图标，那么 TortoiseSVN 会为此 URL 启动检出对话框。" +#: source/TortoiseSVN_en.xml:3609(para) +msgid "Before you import your project into a repository you should: " +msgstr "在将你的项目导入到版本库之前，你应该: " -#: source/TortoiseSVN_en.xml:1927(title) -msgid "Multiple Repositories" -msgstr "多版本库" +#: source/TortoiseSVN_en.xml:3641(title) +msgid "The Import dialog" +msgstr "导入对话框" -#: source/TortoiseSVN_en.xml:193(para) -msgid "for the hard work to get TortoiseSVN to what it is now" -msgstr "TortoiseSVN 的主要开发者" +#: source/TortoiseSVN_en.xml:3630(para) +msgid "Now select the top-level folder of your project directory structure in the windows explorer and right click to open the context menu. Select the command TortoiseSVNImport... which brings up a dialog box: " +msgstr "现在进入资源管理器，选择你的项目的顶层目录，右击打开上下文菜单。选择命令TortoiseSVN导入 ...，它会弹出一个对话框: " -#: source/TortoiseSVN_en.xml:1932(primary) -msgid "Index of projects" -msgstr "项目索引" +#: source/TortoiseSVN_en.xml:3645(para) +msgid "In this dialog you have to enter the URL of the repository into which you want to import your project." +msgstr "在这个对话框中，输入你的项目导入到版本库的URL。" -#: source/TortoiseSVN_en.xml:1934(para) -msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file everytime you add a new Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseSVN command TortoiseSVNCreate repository here... and a new project has a home..." -msgstr "如果你使用SVNParentPath指示，你就不必在每次添加新Subversion版本库时修改Apache的配置文件，只需要在第一个版本库所在的位置建立新的版本库就可以了。在我的公司，我可以使用SMB(普通的windows文件访问)直接访问服务器的文件夹，所以我直接在那里创建一个目录，运行TortoiseSVN命令TortoiseSVN在此创建版本库...，然后一个新的项目..." +#: source/TortoiseSVN_en.xml:3649(para) +msgid "The import message is used as a log message." +msgstr "这个输入信息将用作提交日志。" -#: source/TortoiseSVN_en.xml:1948(para) -msgid "If you are using Subversion 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." -msgstr "如果你使用Subversion 1.3或更高版本，可以使用SVNListParentPath on指示，这样当你使用浏览器访问父路径而不是具体某个版本库时就会显示所有版本库列表。" +#: source/TortoiseSVN_en.xml:3652(para) +msgid "By default, files and folders which match the global-ignore patterns are not imported. To override this behaviour you can use the Include ignored files checkbox. Refer to for more information on setting a global ignore pattern." +msgstr "默认情况下，匹配全局忽略模式的文件和文件夹不会被导入。你可以使用包含忽略文件检验栏来禁止此行为。参考以获得关于全局忽略模式的更多信息。" -#: source/TortoiseSVN_en.xml:1954(para) -msgid "If your Subversion server is earlier than 1.3 you will just get a nasty error page showing. To get a nice looking listing of all available projects instead, you can use the following PHP script which generates the index for you automatically. (You will need to install PHP on your server in order to use the script shown below)." -msgstr "如果你的Subversion是早于1.3的版本，你会得到错误页，为了得到一个更好看的项目列表，你可以使用下面PHP脚本为你自动生成索引。(为了使用下面的PHP，你需要安装PHP)。" +#: source/TortoiseSVN_en.xml:3659(para) +msgid "As soon as you press OK TortoiseSVN imports the complete directory tree including all files into the repository. As before, the name of the folder you import does not appear in the repository, only the folder contents. The project is now stored in the repository under version control. Please note that the folder you imported is NOT under version control! To get a version-controlled working copy you need to do a Checkout of the version you just imported. Or read on to find out how to import a folder in place." +msgstr "当你点击确认时，TortoiseSVN 会导入包含所有文件的完整目录树到版本库。如前所述，你导入的文件夹名称不会在版本库中出现，只有这个文件夹的内容会在版本库中出现。现在这个工程就存贮在版本库，被版本控制。请注意，你导入的文件夹没有被版本控制！你需要检出刚才导入的版本，以便获得受版本控制的工作目录。或者继续阅读，找到如何导入文件夹到合适的位置。" -#: source/TortoiseSVN_en.xml:1963(programlisting) -#, no-wrap -msgid "" -"\n" -"<html>\n" -"<head>\n" -"<title>Subversion Repositories</title>\n" -"</head>\n" -"<body>\n" -"\n" -"<h2>Subversion Repositories</h2>\n" -"<p>\n" -"<?php\n" -" $svnparentpath = \"C:/svn\";\n" -" $svnparenturl = \"/svn\";\n" -"\n" -" $dh = opendir( $svnparentpath );\n" -" if( $dh ) {\n" -" while( $dir = readdir( $dh ) ) {\n" -" $svndir = $svnparentpath . \"/\" . $dir;\n" -" $svndbdir = $svndir . \"/db\";\n" -" $svnfstypefile = $svndbdir . \"/fs-type\";\n" -" if( is_dir( $svndir ) && is_dir( $svndbdir ) ) {\n" -" echo \"<a href=\\\"\" . $svnparenturl . \"/\" .\n" -" $dir . \"\\\">\" . $dir . \"</a>\\n\";\n" -" if( file_exists( $svnfstypefile ) ) {\n" -" $handle = fopen (\"$svnfstypefile\", \"r\");\n" -" $buffer = fgets($handle, 4096);\n" -" fclose( $handle );\n" -" $buffer = chop( $buffer );\n" -" if( strcmp( $buffer, \"fsfs\" )==0 ) {\n" -" echo \" (FSFS) <br />\\n\";\n" -" } else {\n" -" echo \" (BDB) <br />\\n\";\n" -" }\n" -" } else {\n" -" echo \" (BDB) <br />\\n\";\n" -" }\n" -" }\n" -" }\n" -" closedir( $dh );\n" -" }\n" -"?>\n" -"</p>\n" -"\n" -"</body>\n" -"</html>\n" -msgstr "" -"\n" -"<html>\n" -"<head>\n" -"<title>Subversion Repositories</title>\n" -"</head>\n" -"<body>\n" -"\n" -"<h2>Subversion Repositories</h2>\n" -"<p>\n" -"<?php\n" -" $svnparentpath = \"C:/svn\";\n" -" $svnparenturl = \"/svn\";\n" -"\n" -" $dh = opendir( $svnparentpath );\n" -" if( $dh ) {\n" -" while( $dir = readdir( $dh ) ) {\n" -" $svndir = $svnparentpath . \"/\" . $dir;\n" -" $svndbdir = $svndir . \"/db\";\n" -" $svnfstypefile = $svndbdir . \"/fs-type\";\n" -" if( is_dir( $svndir ) && is_dir( $svndbdir ) ) {\n" -" echo \"<a href=\\\"\" . $svnparenturl . \"/\" .\n" -" $dir . \"\\\">\" . $dir . \"</a>\\n\";\n" -" if( file_exists( $svnfstypefile ) ) {\n" -" $handle = fopen (\"$svnfstypefile\", \"r\");\n" -" $buffer = fgets($handle, 4096);\n" -" fclose( $handle );\n" -" $buffer = chop( $buffer );\n" -" if( strcmp( $buffer, \"fsfs\" )==0 ) {\n" -" echo \" (FSFS) <br />\\n\";\n" -" } else {\n" -" echo \" (BDB) <br />\\n\";\n" -" }\n" -" } else {\n" -" echo \" (BDB) <br />\\n\";\n" -" }\n" -" }\n" -" }\n" -" closedir( $dh );\n" -" }\n" -"?>\n" -"</p>\n" -"\n" -"</body>\n" -"</html>\n" +#: source/TortoiseSVN_en.xml:3673(title) +msgid "Import in Place" +msgstr "导入适当的位置" -#: source/TortoiseSVN_en.xml:199(term) -msgid "Lübbe Onken" -msgstr "Lübbe Onken" +#: source/TortoiseSVN_en.xml:3675(primary) +msgid "import in place" +msgstr "导入适当的位置" -#: source/TortoiseSVN_en.xml:20(surname) -msgid "Large" -msgstr "Large" +#: source/TortoiseSVN_en.xml:3677(para) +msgid "The Subversion import command has limited functionality - you cannot easily pick items for import. Also, the folder you are importing does not become a Subversion working copy - you have to do a separate checkout. But don't worry, there is another way of working which overcomes both these shortcomings :-)" +msgstr "Subversion 导入命令功能有限 - 你不能容易的选择导入的项目。而且，你导入的文件夹不会成为 Subversion 工作副本 - 你不得不单独做检出。但是不要担心，有其它方法克服这些缺陷 :-)" -#: source/TortoiseSVN_en.xml:2008(para) -msgid "Save the lines above to a file svn_index.php and store that file in your web root folder. Next you have to tell Apache to show that page instead of the error: " -msgstr "将上面的内容存为svn_index.php，放在你的web根目录，然后你要告诉Apache显示此页而不是错误: " +#: source/TortoiseSVN_en.xml:3689(para) +msgid "Use the repository browser to create a new project folder directly in the repository." +msgstr "使用版本库浏览器直接在版本库中创建项目文件夹。" -#: source/TortoiseSVN_en.xml:201(para) -msgid "for the beautiful icons, logo, bughunting and taking care of the documentation" -msgstr "制作了漂亮的图标、Logo，错误跟踪及文档维护" +#: source/TortoiseSVN_en.xml:3695(para) +msgid "Checkout the new folder over the top of the folder you want to import. You will get a warning that the local folder is not empty. Now you have a versioned top level folder with unversioned content." +msgstr "在你要导入的文件夹检出新目录。你会得到一个本地目录为空的警告。现在你有一个版本控制的顶级目录，含有未版本控制的内容。" -#: source/TortoiseSVN_en.xml:2014(para) -msgid "" -"Uncomment (remove the '#' char) from the following line in your Apache config file: \n" -"#LoadModule rewrite_module modules/mod_rewrite.so\n" -"" -msgstr "" -"去掉Apache配置文件中下面这一行的注释(去掉字符'#'): \n" -"#LoadModule rewrite_module modules/mod_rewrite.so\n" -"" +#: source/TortoiseSVN_en.xml:3702(para) +msgid "Use TortoiseSVNAdd... on this versioned folder to add some or all of the content. You can add and remove files, set svn:ignore properties on folders and make any other changes you need to." +msgstr "在此受版本控制的文件夹上使用TortoiseSVN增加...增加部分或全部内容。你可以增加或删除文件，在文件夹上设置svn:ignore属性，或者你需要的其它修改。" -#: source/TortoiseSVN_en.xml:2023(para) +#: source/TortoiseSVN_en.xml:3714(para) +msgid "Commit the top level folder, and you have a new versioned tree, and a local working copy, created from your existing folder." +msgstr "提交顶级目录，你有一个新的版本树，一份从你已有目录创建的本地工作副本。" + +#: source/TortoiseSVN_en.xml:3684(para) +msgid "Assuming you already have a repository, and you want to add a new folder structure to it, just follow these steps: " +msgstr "假定你已经有个版本库，你想给它增加一个新目录结构，只需以下步骤: " + +#: source/TortoiseSVN_en.xml:3723(title) +msgid "Special Files" +msgstr "专用文件" + +#: source/TortoiseSVN_en.xml:3725(primary) +msgid "special files" +msgstr "专用文件" + +#: source/TortoiseSVN_en.xml:3727(para) +msgid "Sometimes you need to have a file under version control which contains user specific data. That means you have a file which every developer/user needs to modify to suit his/her local setup. But versioning such a file is difficult because every user would commit his/her changes every time to the repository." +msgstr "有时候你需要版本控制一个包含用户专用的数据。它意味着你有一个文件，每个开发者/用户都需要修改，一边满足他/她的本地配置。但是版本控制这样的文件是困难的，因为每个用户可能都要提交他/她的修改。" + +#: source/TortoiseSVN_en.xml:3734(para) +msgid "In such cases we suggest to use template files. You create a file which contains all the data your developers will need, add that file to version control and let the developers check this file out. Then, each developer has to make a copy of that file and rename that copy. After that, modifying the copy is not a problem anymore." +msgstr "在这种情况下，我们建议使用模版文件。创建你个包含所有开发者需要的数据的文件，增加到版本库中，让开发者检出。然后，每个开发者创建一个副本，改名此文件。于是，修改这个文件不再是问题。 " + +#: source/TortoiseSVN_en.xml:3742(para) +msgid "As an example, you can have a look at TortoiseSVN's build script. It calls a file named TortoiseVars.bat which doesn't exist in the repository. Only the file TortoiseVars.tmpl. TortoiseVars.tmpl is the template file which every developer has to create a copy from and rename that file to TortoiseVars.bat. Inside that file, we added comments so that the users will see which lines they have to edit and change according to their local setup to get it working." +msgstr "作为例子，你可以看看TortoiseSVN的构建脚本。它调用一个TortoiseVars.bat文件，它并不在版本库中。 只有TortoiseVars.tmpl在版本库中。TortoiseVars.tmpl是一个模版文件，每个开发者都需要创建一个副本，改名为TortoiseVars.bat。在这个文件中，我们增加了注释，所以用户知道他们需要编辑那些行，以便适应他们的本地配置，使其能工作。" + +#: source/TortoiseSVN_en.xml:3753(para) +msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." +msgstr "于是为了不干扰用户，我们也将TortoiseVars.bat增加到它的父目录的忽略列表，也就是，我们设置了Subversion属性svn:ignore包含这个文件名称。这样，每次提交时它都不会作为没有版本控制的文件出现。" + +#: source/TortoiseSVN_en.xml:3762(title) +msgid "Referenced Projects" +msgstr "引用的工程" + +#: source/TortoiseSVN_en.xml:3764(primary) +msgid "external repositories" +msgstr "外部版本库" + +#: source/TortoiseSVN_en.xml:3767(primary) +msgid "externals" +msgstr "外部" + +#: source/TortoiseSVN_en.xml:3769(para) +msgid "Sometimes it is useful to construct a working copy that is made out of a number of different checkouts. For example, you may want different subdirectories to come from different locations in a repository, or perhaps from different repositories altogether. If you want every user to have the same layout, you can define the svn:externals properties." +msgstr "有时候，构建一个需要不同检出的工作目录是很有用的。举例来说，你需要不同的子目录来自版本库的不同位置。，或者可能完全来自不同的版本库。如果你需要每个用户具有相同的目录结构，你可以定义svn:externals属性。" + +#: source/TortoiseSVN_en.xml:3777(para) msgid "" -"Add the following lines just below your <Location> block where you define your Subversion stuff: \n" -" RewriteEngine on\n" -" RewriteRule ^/svn$ /svn_index.php [PT]\n" -" RewriteRule ^/svn/$ /svn_index.php [PT]\n" -" RewriteRule ^/svn/index.html$ /svn_index.php [PT] \n" -"" +"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository url in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work properly. For example you must replace each space with %20. Note that it is not possible to use foldernames with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" +"sounds http://sounds.red-bean.com/repos\n" +"quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" +"skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" +" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a subfolder D:\\dev\\project1\\sounds and checkout the sounds project, another subfolder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested subfolder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" -"在你的<Location>里定义Subversion功能的下面增加如下几行: \n" -" RewriteEngine on\n" -" RewriteRule ^/svn$ /svn_index.php [PT]\n" -" RewriteRule ^/svn/$ /svn_index.php [PT]\n" -" RewriteRule ^/svn/index.html$ /svn_index.php [PT] \n" -"" +"比如说，你检出了/project1到 D:\\dev\\project1。选择目录D:\\dev\\project1，右击，选择Windows 菜单属性。出现属性对话框。在Subversion页，你可以设置属性。点击增加...。从组合框选择svn:externals属性，在编辑框按照名称 URL格式输入版本库URL，或者你需要一个指定的版本，那么使用名称 -r版本 URL。你可以增加多个外部工程，每行一个。注意，URL必须使用逃逸字符编码，不然可能无法正常工作。举例说明，你必须将每个空格替换为%20。注意使用包含空格的目录名称是不可能的。假设你为D:\\dev\\project1设置了这些属性: \n" +"sounds http://sounds.red-bean.com/repos\n" +"quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" +"skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" +" 现在点击 设置，提交你的修改。当你(或其他用户)更新工作副本时， Subversion 将会创建子目录D:\\dev\\project1\\sounds，并且检出sounds工程，另一个子目录D:\\dev\\project1\\quick_graphs包含graphics工程，最后一个嵌套的子目录D:\\dev\\project1\\skins\\toolkit包含的skin-maker工程的版本21。" -#: source/TortoiseSVN_en.xml:2039(title) -msgid "Path-Based Authorization" -msgstr "路径为基础的授权" +#: source/TortoiseSVN_en.xml:3816(para) source/TortoiseSVN_en.xml:10907(para) +msgid "If the external project is in the same repository, any changes you make there there will be included in the commit list when you commit your main project." +msgstr "如果一个外部工程位于同一版本库中，当你向主项目提交你的修改时，你对外部工程做的修改也会包含在提交列表中。" -#: source/TortoiseSVN_en.xml:2041(primary) -msgid "Authorization" -msgstr "授权" +#: source/TortoiseSVN_en.xml:3821(para) source/TortoiseSVN_en.xml:10912(para) +msgid "If the external project is in a different repository, any changes you make to the external project will be notified when you commit the main project, but you have to commit those external changes separately." +msgstr "如果外部工程位于不同的版本库，当你向主项目提交你的修改时，你对外部工程做的修改会被通报，但是你必须单独的提交这些外部项目的修改。" -#: source/TortoiseSVN_en.xml:2046(para) -msgid "The mod_authz_svn module permits fine-grained control of access permissions based on usernames and repository paths. This is available with the Apache server, and as of Subversion 1.3 it is available with svnserve as well." -msgstr "mod_authz_svn模块可以根据用户名和路径实现细粒度的权限控制，对所有的Apache服务器有效，在Subversion 1.3以上版本的svnserve上也实现了路径为基础的授权。" +#: source/TortoiseSVN_en.xml:3827(para) +msgid "Note that if you change the URL in an svn:externals property, then next time you update your working copy Subversion will delete the old external folder and make a fresh checkout, so you will see files being Added, rather than being Updated as you might have expected. This situation might occur if you reference a tag from another project. When a new version of that project is released, you change your external reference to point to the new tag." +msgstr "注意如果你修改了svn:externals属性中的URL，下次更新工作目录时，Subversion将会删除老的外部目录，重新检出副本，于是你将看到文件被增加而不是你期望的被更新。当你引用一个其它项目的标记时，这种情况就可能发生。即当那个项目发布新版本时，你将外部引用改为新的标记。" -#: source/TortoiseSVN_en.xml:2052(para) -msgid "" -"An example file would look like this: \n" -"[groups]\n" -"admin = john, kate\n" -"devteam1 = john, rachel, sally\n" -"devteam2 = kate, peter, mark\n" -"docs = bob, jane, mike\n" -"training = zak\n" -"# Default access rule for ALL repositories\n" -"# Everyone can read, admins can write, Dan German is excluded.\n" -"[/]\n" -"* = r\n" -"@admin = rw\n" -"dangerman =\n" -"# Allow developers complete access to their project repos\n" -"[proj1:/]\n" -"@devteam1 = rw\n" -"[proj2:/]\n" -"@devteam2 = rw\n" -"[bigproj:/]\n" -"@devteam1 = rw\n" -"@devteam2 = rw\n" -"trevor = rw\n" -"# Give the doc people write access to all the docs folders\n" -"[/trunk/doc]\n" -"@docs = rw\n" -"# Give trainees write access in the training repository only\n" -"[TrainingRepos:/]\n" -"@training = rw\n" -"" +#: source/TortoiseSVN_en.xml:3838(para) +msgid "You should strongly consider using explicit revision numbers in all of your externals definitions. Doing so means that you get to decide when to pull down a different snapshot of external information, and exactly which snapshot to pull. Besides the common sense aspect of not being surprised by changes to third-party repositories that you might not have any control over, using explicit revision numbers also means that as you backdate your working copy to a previous revision, your externals definitions will also revert to the way they looked in that previous revision, which in turn means that the external working copies will be updated to match they way they looked back when your repository was at that previous revision. For software projects, this could be the difference between a successful and a failed build of an older snapshot of your complex codebase." +msgstr "你应当认真考虑在所有外部定义中使用确定的版本号。这样做意味着你决定下载一个快照，并且精确的指明了是哪个快照。与使用通常的分支相比，你不会为第三方版本库的修改感到惊讶，这些版本库你可能没有任何控制，使用精确的版本号能使你回溯工作目录到以前的版本，你的外部定义也遵循此规则，看起来是以前的版本，即外部工作副本的更新匹配他们的老版本。对于软件工程，它是你的复杂代码构建成功或失败的重要区别。" + +#: source/TortoiseSVN_en.xml:3856(para) +msgid "URLs in svn:externals definitions are absolute. You cannot use relative URLs. If you relocate your working copy, or if the external repository is relocated, these URLs will not be updated automatically. Also, if you branch a project which has external references within the same repository, the URLs in the branched copy will be unchanged; you may then want to change trunk references to branch references instead." +msgstr "外部定义svn:externals中的URL是绝对路径。如果你重新定位工作副本，或者外部版本库重新定位了，这些URL不会自动更新。而且，如果你分支了一个工程，它的外部定义位于同一版本库中，分支中的这些URL也不会更新；你可能需要用对分支的引用替换对最新版本的引用。" + +#: source/TortoiseSVN_en.xml:3865(para) +msgid "If you need more information how TortoiseSVN handles Properties read ." +msgstr "如果你需要TortoiseSVN如何处理属性的更多信息，请阅读。" + +#: source/TortoiseSVN_en.xml:3869(para) +msgid "To find out about different methods of accessing common sub-projects read ." +msgstr "如果你需要知道存取公共子个我我你工程的不同方法，请阅读." + +#: source/TortoiseSVN_en.xml:3876(title) +msgid "Checking Out A Working Copy" +msgstr "检出工作副本" + +#: source/TortoiseSVN_en.xml:3878(primary) +msgid "checkout" +msgstr "检出" + +#: source/TortoiseSVN_en.xml:3881(para) +msgid "To obtain a working copy you need to do a checkout from a repository." +msgstr "为了得到一个工作副本，需要进行从版本库检出的操作。" + +#: source/TortoiseSVN_en.xml:3895(title) +msgid "The Checkout dialog" +msgstr "检出对话框" + +#: source/TortoiseSVN_en.xml:3885(para) +msgid "Select a directory in windows explorer where you want to place your working copy. Right click to pop up the context menu and select the command TortoiseSVNCheckout..., which brings up the following dialog box: If you enter a folder name that does not yet exist, then a directory with that name is created." +msgstr "在Windows资源管理器里选择一个存放工作副本的目录。右键点击弹出右键菜单，选择TortoiseSVN检出…命令。然后就会看到下面的对话框: 如果输入一个并不存在的目录名，那么这个名字的目录就会被创建出来。" + +#: source/TortoiseSVN_en.xml:3902(para) +msgid "You should only check out into an empty directory. If you want to check out your source tree into the same directory that you imported from, Subversion will throw an error message because it will not overwrite the existing unversioned files with versioned ones. You will have to check out into a different directory or delete the existing sourcetree first." +msgstr "你应该只检出到一个空的目录。如果你要将你的源代码树检出到与你导入它们时相同的目录，Subversion会给出一个错误信息它不会用已受控的文件覆盖已经存在的但未受控的文件。你必须检出到一个不同的目录或是先将已经存在的源代码树删除。" + +#: source/TortoiseSVN_en.xml:3911(para) +msgid "If you want to check out the top level folder only and omit all sub-folders, use the Only check out the top folder checkbox." +msgstr "如果你只希望检出最顶层的文件夹而忽略子文件夹，请选中只检出顶层文件夹复选框。" + +#: source/TortoiseSVN_en.xml:3915(para) +msgid "If the project contains references to external projects which you do not want checked out at the same time, use the Omit externals checkbox." +msgstr "如果项目含有外部项目的引用，而这个引用你不希望同时检出，请选中忽略外部的复选框。" + +#: source/TortoiseSVN_en.xml:3921(para) +msgid "If either of these options are checked, you will have to perform updates to your working copy using TortoiseSVNUpdate to Revision... instead of TortoiseSVNUpdate. The standard update will include all sub-folders and all externals." +msgstr "如果这两个选项的任何一个选中了，你应该使用TortoiseSVN更新至版本...来更新你的工作副本而不是使用TortoiseSVN更新。标准的更新将会包含所有的子文件夹和外部引用。" + +#: source/TortoiseSVN_en.xml:3936(para) +msgid "It is recommended that you check out only the trunk part of the directory tree. If you specify the parent path of the directory tree in the URL then you might end up with a full hard disk since you will get a copy of the entire repository tree including every branch and tag of your project!" +msgstr "强烈建议你只检出trunk的那部分目录树。如果你在URL中指定了目录树的父路径，你的硬盘有可能被塞满，因为你将会得到整个版本库树的副本，包括项目所有的分支和标签(tag)！" + +#: source/TortoiseSVN_en.xml:3944(title) +msgid "Exporting" +msgstr "关于导出" + +#: source/TortoiseSVN_en.xml:3945(para) +msgid "Sometimes you may want to create a local copy without any of those .svn directories, e.g. to create a zipped tarball of your source. Read to find out how to do that." +msgstr "有时你可能想要建立一个没有.svn目录的本地的副本，比如建立一个源代码压缩包。要达到这个目的，请参考。" + +#: source/TortoiseSVN_en.xml:3954(title) +msgid "Committing Your Changes To The Repository" +msgstr "将你的修改提交到版本库" + +#: source/TortoiseSVN_en.xml:3956(primary) +msgid "commit" +msgstr "提交" + +#: source/TortoiseSVN_en.xml:3959(para) +msgid "Sending the changes you made to your working copy is known as committing the changes. But before you commit you have to make sure that your working copy is up to date. You can either use TortoiseSVNUpdate directly. Or you can use TortoiseSVNCheck for Modifications first, to see which files have changed locally or on the server." +msgstr "将你对工作副本的修改发送给版本库，称为提交修改。但在你提交之前要确保你的工作副本是最新的。你可以直接使用TortoiseSVN更新，或者，你可以先使用TortoiseSVN检查修改看看哪些文件在本地或是服务器上已经有了改动。" + +#: source/TortoiseSVN_en.xml:3976(title) +msgid "The Commit Dialog" +msgstr "提交对话框" + +#: source/TortoiseSVN_en.xml:3986(title) +msgid "The Commit dialog" +msgstr "提交对话框" + +#: source/TortoiseSVN_en.xml:3977(para) +msgid "If your working copy is up to date and there are no conflicts, you are ready to commit your changes. Select any file and/or folders you want to commit, then TortoiseSVNCommit.... " +msgstr "如果你的工作副本是最新的，并且没有冲突，你就已经为提交做好准备了，选择你要提交的文件和/或文件夹，然后TortoiseSVN提交.... " + +#: source/TortoiseSVN_en.xml:3990(para) +msgid "The commit dialog will show you every changed file, including added, deleted and unversioned files. If you don't want a changed file to be committed, just uncheck that file. If you want to include an unversioned file, just check that file to add it to the commit." +msgstr "提交对话框将显示每个被改动过的文件，包括新增的、删除的和未受控的文件。如果你不想改动被提交，只要将该文件的复选框的勾去掉就可以了。如果你要加入未受控的文件，只要勾选该文件把它加入提交列表就可以了。" + +#: source/TortoiseSVN_en.xml:3997(para) source/TortoiseSVN_en.xml:4837(para) +msgid "Items which have been switched to a different repository path are also indicated using an (s) marker. You may have switched something while working on a branch and forgotten to switch back to trunk. This is your warning sign!" +msgstr "那些被切换(switched)到不同版本库路径的项也用(s)标记来表示。当工作在分支上的时候你可能切换到某处，然后忘记切换回主干。这是你的警告信号！" + +#: source/TortoiseSVN_en.xml:4004(title) +msgid "Commit files or folders?" +msgstr "提交文件还是文件夹？" + +#: source/TortoiseSVN_en.xml:4005(para) +msgid "When you commit files, the commit dialog shows only the files you have selected. When you commit a folder the commit dialog will select the changed files automatically. If you forget about a new file you created, committing the folder will find it anyway. Committing a folder does not mean that every file gets marked as changed; It just makes your life easier by doing more work for you." +msgstr "当你提交文件时，提交对话框只显示你所提中的文件。当你提交文件夹中，提交对话框将自动选择有改动的文件。如果你忘记了你建立的一个新文件，提交文件夹将使你可以找到它。提交一个文件夹并不意味着每个文件都被标识为修改过的，它仅仅是通过帮你多做些事从而让你的生活更滋润一点。" + +#: source/TortoiseSVN_en.xml:4015(para) +msgid "If you have modified files which have been included from a different repository using svn:externals, those changes cannot be included in the same atomic commit. A warning symbol below the file list tells you if this has happened, and the tooltip explains that those external files have to be committed separately." +msgstr "如果你修改的文件是使用了svn:externals从别的版本库中包含进来的，那么这些改动不会被自动提交。在文件列表下方的警告符号会告诉你是否出现了这种状况，工具提示(tooltip)提示了外部文件必须要分开提交。" + +#: source/TortoiseSVN_en.xml:4023(title) +msgid "Many unversioned files in the commit dialog" +msgstr "在提交对话框中有很多未受控的文件" + +#: source/TortoiseSVN_en.xml:4030(para) +msgid "add the file (or a wildcard extension) to the list of files to exclude on the settings page. This will affect every working copy you have." +msgstr "将文件(或是通配符扩展)加入到设置页的排除列表中。这对每个工作副本都起作用。" + +#: source/TortoiseSVN_en.xml:4037(para) +msgid "add the file to the svn:ignore list using TortoiseSVNAdd to ignore list This will only affect the directory on which you set the svn:ignore property. Using the SVN Property Dialog, you can alter the svn:ignore property for a directory." +msgstr "使用TortoiseSVN加入忽略列表，将文件加入svn:ignore列表。 这只对你设置了svn:ignore属性的路径有效。使用SVN属性对话框，你可以改变一个目录的svn:ignore属性。" + +#: source/TortoiseSVN_en.xml:4024(para) +msgid "If you think that the TSVN commit dialog shows you too many unversioned (e.g. compiler generated or editor backup) files, there are several ways to handle this. You can: Read for more information." +msgstr "如果你认为TSVN提交对话框显示了太多的未受控文件(如编译器产生的文件或是编辑器的备份文件)，有几种方法可以处理这种情况。你可以: 参考 获得更多的信息。" + +#: source/TortoiseSVN_en.xml:4054(para) +msgid "Doubleclicking on any modified file in the commit dialog will launch the external diff tool to show your changes. The context menu will give you more options, as shown in the screenshot. You can also drag files from here into another application such as a text editor or an IDE." +msgstr "在提交对话框中双击任何修改过的文件，将运行外部diff工具显示你作的改动。上下文菜单(右键菜单)将给你更多的选项，请看屏幕截图。你可以从这里将文件拖动到另一个应用程序中，如文本编辑器或是IDE。" + +#: source/TortoiseSVN_en.xml:4061(para) +msgid "You can select or deselect items by clicking on the checkbox to the left of the item. For directories you can use SHIFT-Select to make the action recursive." msgstr "" -"一个可能的例子: \n" -"[groups]\n" -"admin = john, kate\n" -"devteam1 = john, rachel, sally\n" -"devteam2 = kate, peter, mark\n" -"docs = bob, jane, mike\n" -"training = zak\n" -"# Default access rule for ALL repositories\n" -"# Everyone can read, admins can write, Dan German is excluded.\n" -"[/]\n" -"* = r\n" -"@admin = rw\n" -"dangerman =\n" -"# Allow developers complete access to their project repos\n" -"[proj1:/]\n" -"@devteam1 = rw\n" -"[proj2:/]\n" -"@devteam2 = rw\n" -"[bigproj:/]\n" -"@devteam1 = rw\n" -"@devteam2 = rw\n" -"trevor = rw\n" -"# Give the doc people write access to all the docs folders\n" -"[/trunk/doc]\n" -"@docs = rw\n" -"# Give trainees write access in the training repository only\n" -"[TrainingRepos:/]\n" -"@training = rw\n" -"" -#: source/TortoiseSVN_en.xml:208(term) -msgid "The Subversion Book" -msgstr "Subversion 手册" +#: source/TortoiseSVN_en.xml:4066(para) +msgid "The columns displayed in the bottom pane are customizable. If you right click on any column header you will see a context menu allowing you to select which columns are displayed. You can also change column width by using the drag handle which appears when you move the mouse over a column boundary. These customizations are preserved, so you will see the same headings next time." +msgstr "在底部面板中显示的列是可定制的。如果你右击任何一列的头部，你就会看到一个上下文菜单，允许你选择哪一列要显示。还可以在鼠标移动到列边界时通过拖动手把来改变列的宽度。这些定制的内容都会被保留下来，下一次你会见到相同的列。" -#: source/TortoiseSVN_en.xml:2084(para) -msgid "Note that checking every path can be an expensive operation, particularly in the case of the revision log. The server checks every changed path in each revision and checks it for readability, which can be time-consuming on revisions which affect large numbers of files." -msgstr "请注意，检查每一条路径是一件消耗极大的操作，特别是修订版本日志，服务器会检查在每一个修订版本的每一条路径是否可读，对于影响很多文件的修订将会花费很多时间。" +#: source/TortoiseSVN_en.xml:4075(para) +msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion config file." +msgstr "" -#: source/TortoiseSVN_en.xml:2091(para) -msgid "Authentication and authorizarion are separate processes. If a user wants to gain access to a repository path, she has to meet both, the usual authentication requirements and the authorization requirements of the access file." -msgstr "认证和授权是不同的过程，如果用户希望获得对版本库的访问，他需要同时实现这两个步骤，对于要访问文件的普通认证请求和授权请求。" +#: source/TortoiseSVN_en.xml:4086(para) +msgid "You can drag files into the commit dialog from elsewhere, so long as the working copies are checked out from the same repository. For example, you may have a huge working copy with several explorer windows open to look at distant folders of the hierarchy. If you want to avoid committing from the top level folder (with a lengthy folder crawl to check for changes) you can open the commit dialog for one folder and drag in items from the other windows to include within the same atomic commit." +msgstr "你可以将文件从别的地方拖动到提交对话框，只要工作副本是由同一版本库中检出就可以了。比如，你有一个很大的工作副本，要开好几个资源管理器窗口来查看层次中不同的文件夹。如果你要避免从顶级文件夹提交(冗长而缓慢的文件夹改动检查)，你可以打开一个文件夹的提交对话框，然后将别的窗口中的项拖进去，可样就可以一次提交它们了。" + +#: source/TortoiseSVN_en.xml:4096(para) +msgid "You can drag unversioned files which reside within a working copy into the commit dialog, and they will be SVN added automatically." +msgstr "你可以将未版本控制的文件拖到工作副本提交对话框中，它们就会被自动增加。" + +#: source/TortoiseSVN_en.xml:4102(title) source/TortoiseSVN_en.xml:4909(title) +msgid "Repairing External Renames" +msgstr "修复外部改名" + +#: source/TortoiseSVN_en.xml:4103(para) source/TortoiseSVN_en.xml:4910(para) +msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "有时候文件不是用Subversion改名，于是它们在文件列表中作为丢失和未版本控制的文件出现。为了避免丢失历史，你需要通知Subversion。简单的选择老名称(丢失)和新名称(未版本控制)，然后使用右键菜单修复移动来指明这两个文件是改名关系。" + +#: source/TortoiseSVN_en.xml:4118(title) +msgid "Change Lists" +msgstr "修改列表" + +#: source/TortoiseSVN_en.xml:4120(primary) +msgid "changelist" +msgstr "修改列表" + +#: source/TortoiseSVN_en.xml:4122(para) +msgid "In an ideal world, you only ever work on one thing at a time, and your working copy contains only one set of logical changes. OK, back to reality. It often happens that you have to work on several unrelated tasks at once, and when you look in the commit dialog, all the changes are mixed in together. The changelist feature helps you group files together, making it easier to see what you are doing. Of course this can only work if the changes do not overlap. If two different tasks affect the same file, there is no way to separate the changes." +msgstr "理想情况下，你任何时候都只做一件事，你的工作副本只包含一个逻辑修改集合。很好，回到现实。你经常会同时做几件不相关的事，当你察看提交对话框时，所有修改混到一起。修改列表特性帮助你分组，让你容易看到正在做什么。当然它只能在修改不重合的时候工作。如果两个不同的任务影响到同一个文件，没有办法隔离修改。" + +#: source/TortoiseSVN_en.xml:4133(para) +msgid "The changelist feature is only available in Windows XP and later, as it depends on a shell capability which is not present in Windows 2000. Sorry, but Win2K is really quite old now, so please don't complain." +msgstr "修改列表依赖一个不存在于 Windows 2000 的外壳特性，所以它只能用于 Windows XP 或更新的系统。抱歉，但是现在 Windows 2000 真的很古老了，请不要抱怨。" + +#: source/TortoiseSVN_en.xml:4151(title) +msgid "Commit dialog with Changelists" +msgstr "带有修改列表的提交对话框" + +#: source/TortoiseSVN_en.xml:4139(para) +msgid "Use Context MenuMove to changelist to add an item to a changelist. Initially there will be no changelists, so the first time you do this you will create a new changelist. Give it name which describes what you are using it for, and click OK. The commit dialog will now change to show groups of items. " +msgstr "使用右键菜单移到修改列表 可以增加一个项目到修改列表。最初没有修改列表，所以你第一次做的时候，会创建一个新的修改列表。给出一个能描述它的作用的名称，然后点击 OK。提交对话框会改变为显示项目分组。 " + +#: source/TortoiseSVN_en.xml:4155(para) +msgid "Apart from giving an immediate visual indication of groupings, you can also use the group headings to select which files to commit." +msgstr "除了分组可以直接指示之外，你也可以使用组头选择提交哪些文件。" -#: source/TortoiseSVN_en.xml:2099(title) -msgid "Authentication With a Windows Domain" -msgstr "使用 Windows 域认证" +#: source/TortoiseSVN_en.xml:4160(para) +msgid "Changelists are purely a local client feature. Creating and removing changelists will not affect the repository, not any other client." +msgstr "修改列表是纯本地客户端特性。创建和删除修改列表不会影响到版本库，或任何其它客户端。" -#: source/TortoiseSVN_en.xml:210(para) -msgid "for the great introduction to Subversion and its chapter 2 which we copied here" -msgstr "为了对 Subversion 大量介绍，我们复制了其第二章" +#: source/TortoiseSVN_en.xml:4167(title) +msgid "Commit Log Messages" +msgstr "提交日志信息" -#: source/TortoiseSVN_en.xml:2101(primary) -msgid "Windows domain" -msgstr "Windows 域" +#: source/TortoiseSVN_en.xml:4168(para) +msgid "Be sure to enter a log message which describes the changes you are committing. This will help you to see what happened and when, as you browse through the project log messages at a later date. The message can be as long or as brief as you like; many projects have guidelines for what should be included, the language to use, and sometimes even a strict format." +msgstr "确保输入描述你所提交的修改内容的日志信息。这可以帮你回顾做了什么，什么时候做的。信息的内容可长可短，许多项目规定了要包含的内容、使用的语言甚至是严格的格式。" -#: source/TortoiseSVN_en.xml:2104(primary) -msgid "domaincontroller" -msgstr "域控制器" +#: source/TortoiseSVN_en.xml:4176(para) +msgid "You can apply simple formatting to your log messages using a convention similar to that used within emails. To apply styling to text, use *text* for bold, _text_ for underlining, and ^text^ for italics." +msgstr "你可以使用与电子邮件相似的约定，简单格式化日志消息。如果对文本采用这些样式，使用*文本*表示粗体，_文本_表示下划线，^文本^表示斜体。" -#: source/TortoiseSVN_en.xml:2106(para) -msgid "As you might have noticed you need to make a username/password entry in the passwd file for each user separately. And if (for security reasons) you want your users to periodically change their passwords you have to make the change manually." -msgstr "你已经注意到了，你需要为每个用户在passwd文件中创建用户名/密码条目，如果(因为安全原因)他们希望周期性的修改他们的密码，你需要手动的做出修改。" +#: source/TortoiseSVN_en.xml:4186(title) +msgid "The Commit Dialog Spellchecker" +msgstr "提交对话框的拼写检查器" -#: source/TortoiseSVN_en.xml:2113(para) -msgid "But there's a solution for that problem - at least if you're accessing the repository from inside a LAN with a windows domain controller: mod_auth_sspi!" -msgstr "但是对于此问题有另一个解决方案－至少是你在使用域控制器的LAN中访问版本库时: mod_auth_sspi！" +#: source/TortoiseSVN_en.xml:4184(para) +msgid " TortoiseSVN includes a spellchecker to help you get your log messages right. This will highlight any mis-spelled words. Use the context menu to access the suggested corrections. Of course, it doesn't know every technical term that you do, so correctly spelt words will sometimes show up as errors. But don't worry. You can just add them to your personal dictionary using the context menu." +msgstr " TortoiseSVN包含了一个拼写检查器帮助你正确地书写日志信息。对任何错误拼写的词都高亮显示。使用右键菜单可以获得修改建议。当然它不会知道所有的技术术语，所以有时一些拼写正确的词会被当作错误。但不用担心，你可以使用右键菜单将它们加入你的个人字典中。" -#: source/TortoiseSVN_en.xml:2119(primary) -msgid "SSPI" -msgstr "SSPI" +#: source/TortoiseSVN_en.xml:4196(para) +msgid "The log message window also includes a filename and function auto-completion facility. This uses regular expressions to extract class and function names from the (text) files you are committing, as well as the filenames themselves. If a word you are typing matches anything in the list (after you have typed at least 3 characters), a drop-down appears allowing you to select the full name. The regular expressions supplied with TortoiseSVN are held in the TortoiseSVN installation bin folder. You can also define your own regexes and store them in %APPDATA%\\TortoiseSVN\\autolist.txt. Of course your private autolist will not be overwritten when you update your installation of TortoiseSVN. If you are unfamiliar with regular expressions, take a look at the online documentation and tutorial at http://www.regular-expressions.info/." +msgstr "日志信息窗口还包含一个文件名和函数自动完成的功能。这使用了正则表达式来从你提交的(文本)文件中提取类和函数名，当然包括文件名本身。如果你现在敲入的一个词与列表中的任意一个匹配(在你输入至少3个字符后)，就会出现一个下拉列表，允许你选择完整的名字。与TortoiseSVN一起提供的正则表达式位于TortoiseSVN安装路径的bin文件夹中。你可以定义自己的正则式并将其存放在%APPDATA%\\TortoiseSVN\\autolist.txt。当然你自定义的自动列表不会在升级安装的时候被覆盖。如果你不熟悉正则表达式，请参考在线文件和教程: http://www.regular-expressions.info/." -#: source/TortoiseSVN_en.xml:2121(para) -msgid "The original SSPI module was offered by Syneapps including sourcecode. But the development for it has been stopped. But don't despair, the community has picked it up and improved it. It has a new home on SourceForge." -msgstr "最初的SSPI是由Syneapps提供的，包括源代码，但是此开发已经终止，不过不要失望，社区重新拾起代码并进行了改进，它现在的新主页在SourceForge。" +#: source/TortoiseSVN_en.xml:4213(title) +msgid "Special Folder Properties" +msgstr "指定文件夹属性" -#: source/TortoiseSVN_en.xml:2132(para) -msgid "Download the module, copy the file mod_auth_sspi.so into the Apache modules folder." -msgstr "下载这个模块，将文件mod_auth_sspi.so复制到Apache的modules目录。" +#: source/TortoiseSVN_en.xml:4214(para) +msgid "There are several special folder properties which can be used to help give more control over the formatting of commit log messages and the language used by the spellchecker module. Read for further information." +msgstr "有几个特殊的文件夹属性可用于帮助我们得到更多的对提交日志信息的格式以及拼写检查模块的控制。参考以了解详情。" -#: source/TortoiseSVN_en.xml:2139(para) -msgid "" -"Edit the Apache config file: add the line \n" -"LoadModule sspi_auth_module modules/mod_auth_sspi.so\n" -" to the LoadModule's section. Make sure you insert this line before the line \n" -"LoadModule auth_module modules/mod_auth.so\n" -"" -msgstr "" -"编辑Apache的配置文件: 增加行\n" -"LoadModule sspi_auth_module modules/mod_auth_sspi.so\n" -" to the LoadModule's section. Make sure you insert this line before the line \n" -"LoadModule auth_module modules/mod_auth.so\n" -"" +#: source/TortoiseSVN_en.xml:4222(title) +msgid "Integration with Bugtracking Tools" +msgstr "与缺陷跟踪工具整合" -#: source/TortoiseSVN_en.xml:2152(para) -msgid "" -"To make the Subversion location use this type of authentication you have to change the line \n" -"AuthType Basic\n" -" to \n" -"AuthType SSPI\n" -" also you need to add \n" -"SSPIAuth On\n" -"SSPIAuthoritative On\n" -"SSPIDomain <domaincontroller>\n" -"SSPIOmitDomain on\n" -"SSPIUsernameCase lower\n" -"SSPIPerRequestAuth on\n" -"SSPIOfferBasic On\n" -" within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." -msgstr "" -"为了让 Subversion Location 使用此认证类型，你需要将这一行\n" -"AuthType Basic\n" -" 修改为 \n" -"AuthType SSPI\n" -" 并且在 <Location /svn> 中增加 \n" -"SSPIAuth On\n" -"SSPIAuthoritative On\n" -"SSPIDomain <domaincontroller>\n" -"SSPIOmitDomain on\n" -"SSPIUsernameCase lower\n" -"SSPIPerRequestAuth on\n" -"SSPIOfferBasic On\n" -"。 如果你没有域控制器，可以将域控制器的名称置为 <domaincontroller>。" +#: source/TortoiseSVN_en.xml:4223(para) +msgid "If you have activated the bugtracking system, you can set one or more Issues in the Bug-ID / Issue-Nr: text box. Multiple issues should be comma separated. Alternatively, if you are using regex-based bugtracking support, just add your issue references as part of the log message. Learn more ." +msgstr "如果你激活了一个缺陷跟踪系统，你可以在Bug-ID / Issue-Nr:文本框中设置一个或多个问题。多个问题应该用逗号分割。另外，如果你使用基于正则表达式的缺陷跟踪支持，只要将你的问题引用作为日志信息的一部分加入就可以了。详情请见。" -#: source/TortoiseSVN_en.xml:217(term) -msgid "The Tigris Style project" -msgstr "Tigris 的样式项目" +#: source/TortoiseSVN_en.xml:4234(title) +msgid "Commit Progress" +msgstr "提交进程" -#: source/TortoiseSVN_en.xml:2178(para) -msgid "Note that if you are authenticating using SSPI, then you don't need the AuthUserFile line to define a password file any more. Apache authenticates your username and password against your windows domain instead. You will need to update the users list in your svnaccessfile to reference DOMAIN\\username as well." -msgstr "请注意，当你使用SSPI认证时，没有必要使用AuthUserFile定义密码文件，Apache使用Windows域验证用户名和密码，你需要更新svnaccessfile中的用户列表来参考DOMAIN\\username。" +#: source/TortoiseSVN_en.xml:4239(title) +msgid "The Progress dialog showing a commit in progress" +msgstr "显示提交进度的进度对话框" -#: source/TortoiseSVN_en.xml:2188(para) -msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (\"JUser\" is different from \"juser\")." -msgstr "Subversion的AuthzSVNAccessFile文件对用户名大小写敏感(“JUser”与“juser”不同)。" +#: source/TortoiseSVN_en.xml:4235(para) +msgid "After pressing OK, a dialog appears displaying the progress of the commit. " +msgstr "在按下OK之后，会出现一个对话框显示提交的进度。" -#: source/TortoiseSVN_en.xml:219(para) -msgid "for some of the styles which are reused in this documentation" -msgstr "我们在本文重用了一些样式" +#: source/TortoiseSVN_en.xml:4248(term) source/TortoiseSVN_en.xml:4775(term) +msgid "Blue" +msgstr "蓝色" -#: source/TortoiseSVN_en.xml:2192(para) -msgid "In Microsoft's world, Windows domains and usernames are not case sensitive. Even so, some network administrators like to create user accounts in CamelCase (e.g. \"JUser\")." -msgstr "在微软的世界，Windows域和用户名不是大小写敏感，即使如此，一些网络管理员还是喜欢创建首字母大写的用户帐号(例如“JUser”)。" +#: source/TortoiseSVN_en.xml:4250(para) +msgid "Committing a modification." +msgstr "提交一个修改。" -#: source/TortoiseSVN_en.xml:2197(para) -msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." -msgstr "使用SSPI的一个问题是用户名和密码是用户在提示输入时发送到Subversion的，而IE经常会不管你的帐户是如何建立的都会自动发送你的用户名。" +#: source/TortoiseSVN_en.xml:4256(term) source/TortoiseSVN_en.xml:4320(term) +#: source/TortoiseSVN_en.xml:4783(term) +msgid "Purple" +msgstr "紫色" -#: source/TortoiseSVN_en.xml:2205(para) -msgid "The end result is that you may need at least two entries in your AuthzSVNAccessFile for each user -- a lowercase entry and an entry in the same case that Internet Explorer passes to Apache. You will also need to train your users to also type in their credentials using lower case when accessing repositories via TortoiseSVN." -msgstr "结果就是你必须为每一个用户在AuthzSVNAccessFile创建至少两个条目－－一个小写的条目和一个与IE传递给Apache一样的条目，你也需要训练你的用户在通过TortoiseSVN输入访问版本库的凭证时使用小写字母。" +#: source/TortoiseSVN_en.xml:4258(para) +msgid "Committing a new addition." +msgstr "提交一个新增项。" -#: source/TortoiseSVN_en.xml:2213(para) -msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Subversion's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." -msgstr "Apache的错误和访问日志是你最好解密朋友，例如帮助你检测传递给Subversion的AuthzSVNAccessFile模块的用户名，你或许需要试验svnaccessfile中用户串的精确格式(例如DOMAIN\\user还是DOMAIN//user)来使一切工作正常。" +#: source/TortoiseSVN_en.xml:4264(term) source/TortoiseSVN_en.xml:4328(term) +#: source/TortoiseSVN_en.xml:4795(term) +msgid "Dark red" +msgstr "深红" -#: source/TortoiseSVN_en.xml:2225(title) -msgid "SSL and InternetExplorer" -msgstr "SSL 和 IE" +#: source/TortoiseSVN_en.xml:4266(para) +msgid "Committing a deletion or a replacement." +msgstr "提交一个删除或是替换。" -#: source/TortoiseSVN_en.xml:2226(para) -msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseSVN and any other Subversion client are still able to authenticate." -msgstr "如果你使用SSL保护你的服务器，并使用windows域来进行认证，你会发现不能使用IE浏览版本库了，不需要担心－那只是因为IE没有经过认证，其他浏览器没有这个问题，TortoiseSVN和其他Subversion客户端仍然可以得到认证。" +#: source/TortoiseSVN_en.xml:4272(term) source/TortoiseSVN_en.xml:4355(term) +#: source/TortoiseSVN_en.xml:4823(term) +msgid "Black" +msgstr "黑色" -#: source/TortoiseSVN_en.xml:2235(para) -msgid "If you still want to use IE to browse the repository you can either: " -msgstr "如果你一直希望使用IE浏览你的版本库，你可以选择: " +#: source/TortoiseSVN_en.xml:4274(para) +msgid "All other items." +msgstr "所有其他项。" -#: source/TortoiseSVN_en.xml:2240(para) -msgid "define a separate <Location /path> directive in the apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Subversion won't be able to authenticate against that location." -msgstr "在Apache的配置文件定义一个单独的<Location /path>指示，添加SSPIBasicPreferred On，这将使IE重新能够认证，但是其他浏览器和Subversion不能对这个location经过认证。" +#: source/TortoiseSVN_en.xml:4243(para) +msgid "The progress dialog uses colour coding to highlight different commit actions " +msgstr "进度对话框使用颜色代码来高亮显示不同的提交行为。" -#: source/TortoiseSVN_en.xml:225(term) -msgid "Our Contributors" -msgstr "我们的贡献者" +#: source/TortoiseSVN_en.xml:4281(para) source/TortoiseSVN_en.xml:4365(para) +#: source/TortoiseSVN_en.xml:4832(para) +msgid "This is the default colour scheme, but you can customise those colours using the settings dialog. Read for more information." +msgstr "这是默认的配色方案，但你可以通过设置对话框来定制这些颜色。参考获得详情。" -#: source/TortoiseSVN_en.xml:2250(para) -msgid "Offer browsing with unencrypted authentication (without SSL) too. Strangely IE doesn't have any problems with authenticating if the connection is not secured with SSL." -msgstr "也提供未加密(没有SSL)认证的浏览，奇怪的IE在没有使用SSL的认证时没有任何问题。" +#: source/TortoiseSVN_en.xml:4289(title) +msgid "Update Your Working Copy With Changes From Others" +msgstr "用来自别人的修改更新你的工作副本" -#: source/TortoiseSVN_en.xml:2258(para) -msgid "" -"In the ssl \"standard\" setup there's often the following statement in apache's virtual ssl host: \n" -"SetEnvIf User-Agent \".*MSIE.*\" \\\n" -" nokeepalive ssl-unclean-shutdown \\\n" -" downgrade-1.0 force-response-1.0\n" -" There are (were?) good reasons for this configuration, see http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49 But if you want ntlm authentication you have to use keepalive: http://www.microsoft.com/resources/documentation/WindowsServ/2003/standard/proddocs/en-us/qos_enablekeepalives.asp If You uncomment the whole \"SetEnvIf\" You should be able to authenticate IE with windows authentication over SSL against the apache on Win32 with included mod_auth_sspi." -msgstr "" -"在SSL的“标准”设置，通常在apache的虚拟SSL主机有下面的内容: \n" -"SetEnvIf User-Agent \".*MSIE.*\" \\\n" -" nokeepalive ssl-unclean-shutdown \\\n" -" downgrade-1.0 force-response-1.0\n" -"对这种设置有好的原因吗，见http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49，但是如果你希望ntlm认证，你需要使用keepalive: http://www.microsoft.com/resources/documentation/WindowsServ/2003/standard/proddocs/en-us/qos_enablekeepalives.asp，如果你取消整个\"SetEnvIf\"的注释，你就可以使IE经过Win32上配置了mod_auth_sspi和SSL的认证。" +#: source/TortoiseSVN_en.xml:4291(primary) +#: source/TortoiseSVN_en.xml:10652(primary) +msgid "update" +msgstr "更新" -#: source/TortoiseSVN_en.xml:227(para) -msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list." -msgstr "为了那些补丁，问题报告和新创意，以及在邮件列表里通过回答问题帮助别人。" +#: source/TortoiseSVN_en.xml:4295(title) +msgid "Progress dialog showing finished update" +msgstr "已经完成更新的进度对话框" -#: source/TortoiseSVN_en.xml:2285(title) -msgid "Multiple Authentication Sources" -msgstr "多重认证源" +#: source/TortoiseSVN_en.xml:4293(para) +msgid " Periodically, you should ensure that changes done by others get incorporated in your local working copy. The process of getting changes from the server to your local copy is known as updating. Updating may be done on single files, a set of selected files, or recursively on entire directory hierarchies. To update, select the files and/or directories you want, right click and select TortoiseSVNUpdate in the explorer context menu. A window will pop up displaying the progress of the update as it runs. Changes done by others will be merged into your files, keeping any changes you may have done to the same files. The repository is not affected by an update." +msgstr "你应该定期地确保别人作的修改与你的工作副本可以整合。从服务器上获取改动到你本地副本的过程称为更新。更新可以针对一个文件、几个选中的文件或是递归整个目录层次。要进行更新操作，请选择要更新文件和/或路径，右击选择右键菜单中的TortoiseSVN更新。会弹出一个窗口显示更新的进度。别人作的修改将合并到你的文件中，你所做的修改会被保留。版本库受更新操作的影响。" -#: source/TortoiseSVN_en.xml:2287(primary) -msgid "Multiple authentication" -msgstr "多重认证" +#: source/TortoiseSVN_en.xml:4322(para) +msgid "New item added to your WC." +msgstr "新项已经增加到你的工作副本中。" -#: source/TortoiseSVN_en.xml:2289(para) -msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." -msgstr "也可以为Subversion使用不止一个的认证源，为此，你需要将每一种认证设置为non-authoritative，这样Apache会在多个源检查用户名/密码。" +#: source/TortoiseSVN_en.xml:4330(para) +msgid "Redundant item deleted from your WC, or missing item replaced in your WC." +msgstr "你的工作副本中删除了多余项，或是你的工作副本中丢失的项被替换。" -#: source/TortoiseSVN_en.xml:2295(para) -msgid "A common scenario is to use both Windows domain authentication and a passwd file, so that you can provide SVN access to users who don't have a Windows domain login." -msgstr "一个常见的场景就是同时使用Windows域和passwd文件认证，这样你可以为没有Windows域帐户的用户提供访问SVN的权限。" +#: source/TortoiseSVN_en.xml:4337(term) source/TortoiseSVN_en.xml:4803(term) +msgid "Green" +msgstr "绿色" -#: source/TortoiseSVN_en.xml:2302(para) -msgid "" -"To enable both Windows domain and passwd file authentication, add the following entries within the <Location> block of your Apache config file: \n" -"AuthAthoritative Off\n" -"SSPIAuthoritative Off\n" -"" -msgstr "" -"为了开启Windows域和密码文件认证，在Apache配置文件的<Location>中添加下面的条目: \n" -"AuthAthoritative Off\n" -"SSPIAuthoritative Off\n" -"" +#: source/TortoiseSVN_en.xml:4339(para) +msgid "Changes from repository successfully merged with your local changes." +msgstr "版本库中的修改与你的本地修改成功合并。" + +#: source/TortoiseSVN_en.xml:4346(term) source/TortoiseSVN_en.xml:4813(term) +msgid "Bright red" +msgstr "亮红" -#: source/TortoiseSVN_en.xml:2313(para) -msgid "" -"Here is an example of the full Apache configuration for combined Windows domain & passwd file authentication: \n" -"<Location /svn>\n" -"DAV svn\n" -"SVNListParentPath on\n" -"SVNParentPath D:\\SVN\n" -"\n" -"AuthName \"Subversion repositories\"\n" -"AuthzSVNAccessFile svnaccessfile.txt\n" -"\n" -"# NT Domain Logins.\n" -"AuthType SSPI\n" -"SSPIAuth On\n" -"SSPIAuthoritative Off\n" -"SSPIDomain <domaincontroller>\n" -"SSPIOfferBasic On\n" -"\n" -"# Htpasswd Logins.\n" -"AuthType Basic\n" -"AuthAuthoritative Off\n" -"AuthUserFile passwd\n" -"\n" -"Require valid-user\n" -"</Location>\n" -"" -msgstr "" -"下面是组合使用 Windows 域&passwd 文件认证的完整配置: \n" -"<Location /svn>\n" -"DAV svn\n" -"SVNListParentPath on\n" -"SVNParentPath D:\\SVN\n" -"\n" -"AuthName \"Subversion repositories\"\n" -"AuthzSVNAccessFile svnaccessfile.txt\n" -"\n" -"# NT Domain Logins.\n" -"AuthType SSPI\n" -"SSPIAuth On\n" -"SSPIAuthoritative Off\n" -"SSPIDomain <domaincontroller>\n" -"SSPIOfferBasic On\n" -"\n" -"# Htpasswd Logins.\n" -"AuthType Basic\n" -"AuthAuthoritative Off\n" -"AuthUserFile passwd\n" -"\n" -"Require valid-user\n" -"</Location>\n" -"" +#: source/TortoiseSVN_en.xml:4348(para) +msgid "Changes from repository merged with local changes, resulting in conflicts which you need to resolve." +msgstr "来自版本库的修改在与本地修改合并时出现了冲突，需要你解决。" -#: source/TortoiseSVN_en.xml:234(term) -msgid "Our Donators" -msgstr "我们的捐赠者" +#: source/TortoiseSVN_en.xml:4357(para) +msgid "Unchanged item in your WC updated with newer version from the repository." +msgstr "你WC中的没有改动的项被来自版本库中新版本所更新。" -#: source/TortoiseSVN_en.xml:2343(title) -msgid "Securing the server with SSL" -msgstr "用 SSL 使服务器更安全" +#: source/TortoiseSVN_en.xml:4315(para) +msgid "The progress dialog uses colour coding to highlight different update actions " +msgstr "进度对话框使用颜色代码来高亮不同的更新行为" -#: source/TortoiseSVN_en.xml:2345(primary) -msgid "SSL" -msgstr "SSL" +#: source/TortoiseSVN_en.xml:4370(para) +msgid "If you get any conflicts during an update (this can happen if others changed the same lines in the same file as you did and those changes don't match) then the dialog shows those conflicts in red. You can double click on these lines to start the external merge tool to resolve the conflicts." +msgstr "如果你在更新中遇到了冲突(这是由于别人与你修改了同一个文件的同一行代码，并且两者的修改不匹配)，对话框中将冲突显示为红色，你可以双击这些行启动外部合并工具来解决冲突。" -#: source/TortoiseSVN_en.xml:2347(para) -msgid "The apache server doesn't have SSL support installed by default due to US-export restrictions. But you can easily download the required module from somewhere else and install it yourself." -msgstr "Apache服务器缺省并不支持SSL，这是因为美国的出口限制，但是你可以从其他地方下载安装。" +#: source/TortoiseSVN_en.xml:4377(para) +msgid "When the update is complete, the progress dialog shows a summary of the number of items updated, added, removed, conflicted, etc. below the file list. This summary information can be copied to the clipboard using CTRL+C." +msgstr "当更新完成后，进度对话框在文件列表下面显示汇总信息，多少项更新，增加，删除，冲突等。汇总信息可以使用CTRL+C复制到剪贴板。" -#: source/TortoiseSVN_en.xml:2354(para) -msgid "First you need the required files to enable SSL. You can find those in the package available at http://hunter.campbus.com/. Just unzip the package and then copy mod_ssl.so to the modules folder of Apache and the file openssl.exe to the bin folder. Also copy the file conf/ssl.conf to the conf folder of Apache." -msgstr "首先，你需要一些文件来开启SSL，你可以在http://hunter.campbus.com/找到这些包，只需要解压缩这些文件，然后将mod_ssl.so复制到Apache的modules目录，将文件openssl.exe复制到bin目录，将文件conf/ssl.conf复制到Apache的conf目录。" +#: source/TortoiseSVN_en.xml:4384(para) +msgid "The standard Update command has no options and just updates your working copy to the HEAD revision of the repository, which is the most common use case. If you want more control over the update process, you should use TortoiseSVNUpdate to Revision... instead. This allows you to update your working copy to a specific revision, not only to the most recent one. Suppose your working copy is at revision 100, but you want it to reflect the state which it had in revision 50 - then simply update to revision 50. In the same dialog you can also choose to update the current folder non-recursively (without all the subfolders) and you can choose whether to ignore any external projects in the update (i.e. projects referenced using svn:externals)." +msgstr "标准的更新命令没有选项，仅仅是把你的工作副本更新到版本库中的最新版本，这也是最常用的情况。如果你要对更新过程进行更多的控制，就要使用TortoiseSVN更新到版本...。这个操作允许你更新工作副本到一个指定的版本，不仅仅是最新的。假设你的工作副本是在版本100，但你要回顾一下版本50是什么样的——那你只要简单地更新到版本50就可以了。在同一个对话框中你还可以选择不递归更新当前文件夹(就是不更新所有的子文件夹)并且可以选择是否在更新中忽略外部的项目(比如具有属性 svn:externals的被引用的项目)." -#: source/TortoiseSVN_en.xml:236(para) -msgid "for many hours of joy with the music they sent us" -msgstr "他们发送给我们的那些音乐带来了快乐" +#: source/TortoiseSVN_en.xml:4404(para) +msgid "If you update a file or folder to a specific revision, you should not make changes to those files. You will get out of date error messages when you try to commit them! If you want to undo changes to a file and start afresh from an earlier revision, you can rollback to a previous revision from the revision log dialog. Take a look at for further instructions, and alternative methods." +msgstr "如果你把一个文件或是文件夹更新到某个特定的版本，你不应该对这些文件做修改。你在提交的时候会得到一个已经过期的错误消息!如果你要取消修改，从一个早前的版本重新开始，你可以通过版本日志对话框回滚到之前的版本。请看以获得详情和其他方法。" -#: source/TortoiseSVN_en.xml:2370(para) -msgid "Open the file ssl.conf in the Apache conf folder with a text editor." -msgstr "使用文本编辑器打开Apache的conf目录的ssl.conf。" +#: source/TortoiseSVN_en.xml:4414(para) +msgid "Update to Revision can occasionally be useful to see what your project looked like at some earlier point in its history. But in general, updating individual files to an earlier revision is not a good idea as it leaves your working copy in an inconsistent state. If the file you are updating has changed name, you may even find that the file just disappears from your working copy because no file of that name existed in the earlier revision. If you simply want a local copy of an old version of a file it is better to use the Context MenuSave revision to... command from the log dialog for that file." +msgstr "更新到版本在你偶尔要看看你的项目在早前某时刻是什么样子的时候很有用。但通常，更新单个文件到之前的版本不是一个好主意，因为这会使你的工作副本处于不一致的状态。如果你要更新的文件已经改了名，你可能甚至发现该文件从你的工作副本中消失了，因为早期的版本中不存在这个名字的文件。如果你只是简单地想要一个旧版本文件的本地副本，最好是在该文件的日志对话框中使用右键菜单另存版本为...命令。" -#: source/TortoiseSVN_en.xml:2377(para) -msgid "" -"Place a comment char (#) in front of the following lines: \n" -"DocumentRoot \"c:/apache/htdocs\"\n" -"ServerName www.example.com:443\n" -"ServerAdmin you@example.com\n" -"ErrorLog logs/error_log\n" -"TransferLog logs/access_log\n" -"" -msgstr "" -"注释掉(使用#)下面几行: \n" -"DocumentRoot \"c:/apache/htdocs\"\n" -"ServerName www.example.com:443\n" -"ServerAdmin you@example.com\n" -"ErrorLog logs/error_log\n" -"TransferLog logs/access_log\n" -"" +#: source/TortoiseSVN_en.xml:4433(title) +msgid "Multiple Files/Folders" +msgstr "多文件/文件夹" -#: source/TortoiseSVN_en.xml:2390(para) -msgid "" -"change the line \n" -"SSLCertificateFile conf/ssl.crt/server.crt\n" -" to \n" -"SSLCertificateFile conf/ssl/my-server.cert\n" -" the line \n" -"SSLCertificateKeyFile conf/ssl.key/server.key\n" -" to \n" -"SSLCertificateKeyFile conf/ssl/my-server.key\n" -" and the line \n" -"SSLMutex file:logs/ssl_mutex\n" -" to \n" -"SSLMutex default\n" -"" -msgstr "" -"此行\n" -"SSLCertificateFile conf/ssl.crt/server.crt\n" -"改为\n" -"SSLCertificateFile conf/ssl/my-server.cert\n" -"此行\n" -"SSLCertificateKeyFile conf/ssl.key/server.key\n" -"改为\n" -"SSLCertificateKeyFile conf/ssl/my-server.key\n" -"此行\n" -"SSLMutex file:logs/ssl_mutex\n" -"改为\n" -"SSLMutex default\n" -"" +#: source/TortoiseSVN_en.xml:4434(para) +msgid "If you select multiple files and folders in the explorer and then select Update, all of those files/folders are updated one by one. TortoiseSVN makes sure that all files/folders which are from the same repository are updated to the exact same revision! Even if between those updates another commit occurred." +msgstr "如果你在资源管理器中选择了多文件和文件夹，然后选择更新，这些文件/文件夹一个接一个的被更新。TortoiseSVN确保所有的来自同一版本库的文件/文件夹被更新到同一个版本!即使在更新过程中发生了另一个提交。" -#: source/TortoiseSVN_en.xml:2418(para) -msgid "" -"Delete the lines \n" -"<IfDefine SSL>\n" -" and \n" -"</IfDefine>\n" -"" -msgstr "" -"删除此行\n" -"<IfDefine SSL>\n" -" and \n" -"</IfDefine>\n" -"" +#: source/TortoiseSVN_en.xml:4446(title) +msgid "Local File Already Exists" +msgstr "本地文件已经存在" -#: source/TortoiseSVN_en.xml:2430(para) -msgid "If you want that all the apache modules are aware of the SSL ability, change the registry key HKEY_LOCAL_MACHINE\\SYSTEM\\ControlSet001\\Services\\Apache2\\ImagePath from \"C:\\Program Files\\Apache Group\\Apache2\\bin\\Apache.exe\" -k runservice to \"C:\\Program Files\\Apache Group\\Apache2\\bin\\Apache.exe\" -D SSL -k runservice." -msgstr "如果你想所有apache模块知道SSL能力，就将注册表键HKEY_LOCAL_MACHINE\\SYSTEM\\ControlSet001\\Services\\Apache2\\ImagePath的值从\"C:\\Program Files\\Apache Group\\Apache2\\bin\\Apache.exe\" -k runservice修改为 \"C:\\Program Files\\Apache Group\\Apache2\\bin\\Apache.exe\" -D SSL -k runservice。" +#: source/TortoiseSVN_en.xml:4447(para) +msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." +msgstr "有时在你试图更新的时候，更新失败，提示信息说已经有一个同名的本地文件。通常发生在Subversion试图检出一个新增的受控文件时，发现一个未受控的同名文件已经在工作路径中存在。Subversion绝不会覆盖一个未受控的文件——因为它有可能有你需要的东西，却碰巧与另一个开发者新提交的文件重名了。" -#: source/TortoiseSVN_en.xml:2437(para) -msgid "This will set an internal flag which apache modules can read the next time you start the apache service." -msgstr "这会设置一个内部标记，当下次启动apache服务时，apache模块会读取它。" +#: source/TortoiseSVN_en.xml:4456(para) +msgid "If you get this error message, the solution is simply to rename the local unversioned file. After completing the update, you can check whether the renamed file is still needed." +msgstr "如果你得到这个错误信息，解决的方法就是把本地的未受控文件重命名。在完成更新之后，你再检查被重命名的文件是不是还需要。" -#: source/TortoiseSVN_en.xml:2443(para) -msgid "" -"Open the Apache config file (httpd.conf) and uncomment the line \n" -"#LoadModule ssl_module modules/mod_ssl.so\n" -"" -msgstr "" -"打开Apache配置文件(httpd.conf)，并且去掉此行的注释\n" -"#LoadModule ssl_module modules/mod_ssl.so\n" -"" +#: source/TortoiseSVN_en.xml:4461(para) +msgid "If you keep getting error messages, use TortoiseSVNCheck for Modifications instead to list all the problem files. That way you can deal with them all at once." +msgstr "如果你一直得到错误，使用TortoiseSVN检查修改来列出所有有问题的文件。这样你可以一次性解决它们。" -#: source/TortoiseSVN_en.xml:2452(para) -msgid "Openssl needs a config file. You can download a working one from http://tud.at/programm/openssl.cnf. Save the file to bin/openssl.cnf. Please note: the file has the type *.cnf. Windows treats such files in a special way but it really is just a text file!" -msgstr "Openssl需要一个配置文件，你可以从http://tud.at/programm/openssl.cnf下载一个正在使用的，请注意: *.cnf类型的文件尽管是普通的文本文件，Windows对这种文件会特别处理！" +#: source/TortoiseSVN_en.xml:4474(title) +msgid "Resolving Conflicts" +msgstr "解决冲突" -#: source/TortoiseSVN_en.xml:2466(para) -msgid "" -"Next you need to create an SSL certificate. To do that open a command prompt (DOS-Box) and change to the apache folder (e.g. C:\\program files\\apache group\\apache2) and type the following command: \n" -"bin\\openssl req -config bin\\openssl.cnf -new -out my-server.csr\n" -" You will be asked for a passphrase. Please don't use simple words but whole sentences, e.g. a part of a poem. The longer the phrase the better. Also you have to enter the URL of your server. All other questions are optional but we recommend you fill those in too." -msgstr "" -"然后你需要创建一个SSL证书，为此打开一个命令行窗口，进入apache目录(例如C:\\program files\\apache group\\apache2)，然后输入下面的命令: \n" -"bin\\openssl req -config bin\\openssl.cnf -new -out my-server.csr\n" -"你会被讯问密语，请不要使用简单的单词，而是使用整段话，例如一段诗，越长越好。你也需要输入server的URL，其他所有问题都是可选的，但是我们建议你最好输入这些信息。" +#: source/TortoiseSVN_en.xml:4499(term) +msgid "filename.ext.mine" +msgstr "filename.ext.mine" -#: source/TortoiseSVN_en.xml:247(title) -msgid "Terminology used in this document" -msgstr "本文使用的术语" +#: source/TortoiseSVN_en.xml:4501(para) +msgid "This is your file as it existed in your working copy before you updated your working copy - that is, without conflict markers. This file has your latest changes in it and nothing else." +msgstr "这是你的文件，在你更新你的工作副本之前存在于你的的工作副本中——也就是说，没有冲突标志。这个文件除了你的最新修改外没有别的东西。" -#: source/TortoiseSVN_en.xml:248(para) -msgid "To make reading the docs easier, the names of all the screens and Menus from TortoiseSVN are marked up in a different font. The Log Dialog for instance." -msgstr "为了使文档更加易读，所有 TortoiseSVN 的窗口名和菜单名使用不同的字体，例如日志对话框。" +#: source/TortoiseSVN_en.xml:4510(term) +msgid "filename.ext.rOLDREV" +msgstr "filename.ext.rOLDREV" -#: source/TortoiseSVN_en.xml:2481(para) +#: source/TortoiseSVN_en.xml:4512(para) +msgid "This is the file that was the BASE revision before you updated your working copy. That is, it the file that you checked out before you made your latest edits." +msgstr "这是在你更新你的工作副本之前的基础版本(BASE revision)文件。也就是说，它是在你做最后修改之前所检出的文件。" + +#: source/TortoiseSVN_en.xml:4521(term) +msgid "filename.ext.rNEWREV" +msgstr "filename.ext.rNEWREV" + +#: source/TortoiseSVN_en.xml:4523(para) +msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." +msgstr "这个文件是当你更新你的工作副本时，你的Subversion客户端从服务器接收到的。这个文件对应与版本库中的最新版本。" + +#: source/TortoiseSVN_en.xml:4478(para) msgid "" -"Normally the privkey.pem file is created automatically, but if it isn't you need to type this command to generate it: \n" -"bin\\openssl genrsa -out privkey.pem 2048\n" -"" +"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" +"<<<<<<< filename\n" +" your changes\n" +"=======\n" +" code merged from repository\n" +">>>>>>> revision\n" +" Also, for every conflicted file Subversion places three additional files in your directory: " msgstr "" -"通常会自动产生privkey.pem文件，但是如果没有，请输入下面的命令生成它: \n" -"bin\\openssl genrsa -out privkey.pem 2048\n" -"" +"有时当你从版本库中更新你的文件时，会有冲突。冲突出现的原因是两个开发人员修改了文件中相同的几行。由于Subversion不知道你的项目的具体情况，它把解决冲突的工作留给了开发人员。一旦出现冲突，你就应该打开有问题的文件，查找以字符串<<<<<<<开头的行。有冲突的区域用如下的方式标记: \n" +"<<<<<<< filename\n" +" 你的修改\n" +"=======\n" +" 来自版本库中的代码\n" +">>>>>>> revision\n" +" 对于每个冲突的文件Subversion在你的目录下放置了三个文件: " + +#: source/TortoiseSVN_en.xml:4533(para) +msgid "You can either launch an external merge tool / conflict editor with TortoiseSVNEdit Conflicts or you can use any other editor to manually resolve the conflict. You should decide what the code should look like, do the necessary changes and save the file." +msgstr "你可以通过TortoiseSVN编辑冲突运行外部合并工具/冲突编辑器，或者你可以使用任何别的编辑器手动解决冲突。你需要冲定哪些代码是需要的，做一些必要的修改然后保存。" -#: source/TortoiseSVN_en.xml:2489(para) -msgid "" -"Next type the commands \n" -"bin\\openssl rsa -in privkey.pem -out my-server.key\n" -" and (on one line) \n" -"bin\\openssl x509 -in my-server.csr -out my-server.cert\n" -" -req -signkey my-server.key -days 4000\n" -" This will create a certificate which will expire in 4000 days. And finally enter: \n" -"bin\\openssl x509 -in my-server.cert -out my-server.der.crt -outform DER\n" -" These commands created some files in the Apache folder (my-server.der.crt, my-server.csr, my-server.key, .rnd, privkey.pem, my-server.cert). Copy the files to the folder conf/ssl (e.g. C:\\program files\\apache group\\apache2\\conf\\ssl) - if this folder does not exist you have to create it first." -msgstr "" -"然后输入这个命令\n" -"bin\\openssl rsa -in privkey.pem -out my-server.key\n" -"并且输入(在同一行)\n" -"bin\\openssl x509 -in my-server.csr -out my-server.cert\n" -" -req -signkey my-server.key -days 4000\n" -"这样会创建一个在4000天里过期的证书，最后输入: \n" -"bin\\openssl x509 -in my-server.cert -out my-server.der.crt -outform DER\n" -"这些命令在Apache目录(my-server.der.crt、my-server.csr、my-server.key、.rnd、privkey.pem、my-server.cert)里创建了一些文件，复制这些文件到目录conf/ssl(例如C:\\program files\\apache group\\apache2\\conf\\ssl)－如果这个目录不存在，你需要首先创建一个。" +#: source/TortoiseSVN_en.xml:4544(para) +msgid "Afterwards execute the command TortoiseSVNResolved and commit your modifications to the repository. Please note that the Resolve command does not really resolve the conflict. It just removes the filename.ext.mine and filename.ext.r* files, to allow you to commit your changes." +msgstr "然后，执行命令TortoiseSVN已解决并提交人的修改到版本库。需要注意的是已解决命令并不是真正的解决了冲突，它只是删除了filename.ext.mine和filename.ext.r*两个文件，允许你提交修改。" -#: source/TortoiseSVN_en.xml:2518(para) -msgid "Restart the apache service." -msgstr "重启apache服务" +#: source/TortoiseSVN_en.xml:4557(para) +msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." +msgstr "如果你的二进制文件有冲突，Subversion不会试图合并文件。本地文件保持不变(完全是你最后修改时的样子)，但你会看到filename.ext.r*文件。如果你要撤消你的修改，保留版本库中的版本，请使用还原(Revert)命令。如果你要保持你的版本覆盖版本库中的版本，使用已解决命令，然后提交你的版本。" -#: source/TortoiseSVN_en.xml:2523(para) -msgid "Point your browser to https://servername/svn/project ..." -msgstr "将你的浏览器指向https://servername/svn/project ..." +#: source/TortoiseSVN_en.xml:4567(para) +msgid "You can use the Resolved command for multiple files if you right click on the parent folder and select TortoiseSVNResolved... This will bring up a dialog listing all conflicted files in that folder, and you can select which ones to mark as resolved." +msgstr "你可以右击父文件夹，选择TortoiseSVN已解决...，使用“已解决”命令来解决多个文件。这个操作会出现一个对话框，列出文件夹下所有有冲突的文件，你可以选择将哪些标记成已解决。" -#: source/TortoiseSVN_en.xml:253(para) -msgid "A menu choice is indicated with an arrow. TortoiseSVNShow Log means: select Show Log from the TortoiseSVN context menu." -msgstr "菜单选择使用箭头显示。TortoiseSVN显示日志的含义是: 从TortoiseSVN右键菜单选择显示日志。" +#: source/TortoiseSVN_en.xml:4580(title) +msgid "Getting Status Information" +msgstr "获得状态信息" -#: source/TortoiseSVN_en.xml:2531(title) -msgid "Forcing SSL access" -msgstr "强制 SSL 访问" +#: source/TortoiseSVN_en.xml:4582(primary) +#: source/TortoiseSVN_en.xml:4741(primary) +msgid "status" +msgstr "状态" -#: source/TortoiseSVN_en.xml:2532(para) -msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-ssl (http) and only allow https access. To do this, you have to add another directive to the Subversion <Location> block: SSLRequireSSL." -msgstr "当你设置了SSL让你的版本库更安全，你一定希望关闭普通的非ssl访问，为此，你需要在Subversion的<Location> 增加指示: SSLRequireSSL。" +#: source/TortoiseSVN_en.xml:4584(para) +msgid "While you are working on your working copy you often need to know which files you have changed/added/removed or renamed, or even which files got changed and committed by others." +msgstr "当你在你的工作副本上工作时，你时常需要知道哪些文件你已经修改/增加/删除或改名了，或者甚至是哪个文件已经被其他人修改并提交了。" -#: source/TortoiseSVN_en.xml:2539(para) -msgid "" -"An example <Location> block would look like this: \n" -"<Location /svn>\n" -"DAV svn\n" -"SVNParentPath D:\\SVN\n" -"SSLRequireSSL\n" -"AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" -"AuthUserFile passwd\n" -"#AuthzSVNAccessFile svnaccessfile\n" -"Require valid-user\n" -"</Location>\n" -"" -msgstr "" -"一个<Location>实例就像这个样子: \n" -"<Location /svn>\n" -"DAV svn\n" -"SVNParentPath D:\\SVN\n" -"SSLRequireSSL\n" -"AuthType Basic\n" -"AuthName \"Subversion repositories\"\n" -"AuthUserFile passwd\n" -"#AuthzSVNAccessFile svnaccessfile\n" -"Require valid-user\n" -"</Location>\n" -"" +#: source/TortoiseSVN_en.xml:4592(primary) +msgid "overlays" +msgstr "重载" -#: source/TortoiseSVN_en.xml:2558(title) -msgid "Svnserve Based Server" -msgstr "基于 svnserve 的服务器" +#: source/TortoiseSVN_en.xml:4595(primary) +msgid "icons" +msgstr "图标" -#: source/TortoiseSVN_en.xml:2564(para) -msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." -msgstr "有一些情况下，不能使用Apache作为你的服务器，Subversion包括Svnserve－一个轻型的独立服务器，使用普通TCP/IP连接之上的自定义协议。" +#: source/TortoiseSVN_en.xml:4603(para) +msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseSVN is so popular. TortoiseSVN adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." +msgstr "现在你已经从Subversion版本库中检出了一份工作副本，你可以在资源管理器中看一下这些文件的图标有什么变化。这也正是TortoiseSVN这么流行的原因之一。TortoiseSVN加入了被称为重载图标的功能重载了原始的文件图标。根据文件的Subversion状态的不同，重载的图标也不同。" -#: source/TortoiseSVN_en.xml:2570(para) -msgid "In most cases svnserve is easier to setup and runs faster than the Apache based server." -msgstr "大多数情况下svnserve的设置更加简单，也比Apache的服务器更加快。" +#: source/TortoiseSVN_en.xml:4611(para) +msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." +msgstr " 一个新检出的工作副本使用绿色的对勾做重载。表示Subversion状态正常." -#: source/TortoiseSVN_en.xml:2576(title) -msgid "Installing svnserve" -msgstr "安装 svnserve" +#: source/TortoiseSVN_en.xml:4616(para) +msgid " As soon as you start editing a file, the status changes to modified and the icon overlay then changes to a red exclamation mark. That way you can easily see which files were changed since you last updated your working copy and need to be committed." +msgstr "在你开始编辑一个文件后，状态就变成了已修改，而图标重载变成了红色感叹号。通过这种方式，你可以很容易地看出哪些文件从你上次更新工作副本后被修改过，需要被提交。" -#: source/TortoiseSVN_en.xml:2580(para) -msgid "Get the latest version of Subversion from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "从http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91得到最新版本的Subversion。" +#: source/TortoiseSVN_en.xml:4624(para) +msgid " If during an update a conflict occurs then the icon changes to a yellow exclamation mark." +msgstr "如果在提交的过程中出现了冲突图标变成黄色感叹号。" -#: source/TortoiseSVN_en.xml:2588(para) -msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." -msgstr "如果你已经安装了Subversion，svnserve已经运行，你需要在继续之前把它停下来。" +#: source/TortoiseSVN_en.xml:4629(para) +msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Read-only files have this overlay to indicate that you have to get a lock first before you can edit that file." +msgstr "如果你给一个文件设置了svn:needs-lock属性，Subversion会让此文件只读，直到你获得文件锁。只读文件具有这个重载图标来表示你必须在编辑之前先得到一个锁。" -#: source/TortoiseSVN_en.xml:2594(para) -msgid "Run the Subversion installer. If you run the installer on your server you can skip step 4." -msgstr "运行Subversion安装程序，如果你在你的服务器上运行，可以跳过第4步。" +#: source/TortoiseSVN_en.xml:4636(para) +msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." +msgstr "如果你拥有了一个文件的锁，并且Subversion状态是正常，这个重载图标就提醒你如果不使用该文件的话应该释放锁，允许别人提交对该文件的修改。" -#: source/TortoiseSVN_en.xml:2600(para) -msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" -msgstr "打开资源管理器，进入Subversion的安装目录(通常是C:\\Program Files\\Subversion)的bin目录，找到文件svnserve.exe，intl3_svn.dll，libapr.dll，libapriconv.dll，libapriutil.dll，libdb*.dll，libeay32.dll和ssleay32.dll，复制这些文件，或所有bin目录内的文件到你的服务器目录，例如c:\\svnserve。" +#: source/TortoiseSVN_en.xml:4643(para) +msgid " This icon shows you that some files or folders inside the current folder have been scheduled to be deleted from version control or a file under version control is missing in a folder." +msgstr "这个图标表示当前文件夹下的某些文件或文件夹已经被计划从版本控制中删除，或是该文件夹下某个受控的文件丢失了。" -#: source/TortoiseSVN_en.xml:262(para) -msgid "Where a local context menu appears within one of the TortoiseSVN dialogs, it is shown like this: Context MenuSave As ..." -msgstr "在 TortoiseSVN 对话框中出现的右键菜单，可能是这个样子: 右键菜单另存为 ..." +#: source/TortoiseSVN_en.xml:4649(para) +msgid " The plus sign tells you that a file or folder has been scheduled to be added to version control." +msgstr "加号告诉你有一个文件或是目录已经被计划加入版本控制。" -#: source/TortoiseSVN_en.xml:2622(title) -msgid "Running svnserve" -msgstr "运行 svnserve" +#: source/TortoiseSVN_en.xml:4654(para) +msgid "Unlike TortoiseCVS (the CVS shell integration) no overlay icon for unversioned files is shown. We do this because the number of icon overlays are limited system wide and should be used economically." +msgstr "与TortoiseCVS (一个集成的CVS shell)不同，对于未受控的文件没有图标重载。这么做是因为图标重载的数量受到系统的限制，应该要节约使用。" -#: source/TortoiseSVN_en.xml:2623(para) -msgid "" -"Now that svnserve is installed, you need it running on your server. The simplest approach is to run the following from a DOS shell or create a windows shortcut: \n" -"svnserve.exe --daemon\n" -" svnserve will now start waiting for incoming requests on port 3690. The --daemon switch tells svnserve to run as a daemon process, so it will always exist until it is manually terminated." -msgstr "" -"现在svnserve已经安装了，你需要在你的server运行它，最简单的方法是在DOS窗口或者windows快捷方式输入: \n" -"svnserve.exe --daemon\n" -"svnserve将会在端口3690等待请求，--daemon选项告诉svnserve以守护进程方式运行，这样在手动终止之前不会退出。" +#: source/TortoiseSVN_en.xml:4660(para) +msgid "In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is limited to 15. Windows uses 4 of those, and the remaining 11 can be used by other applications. If you are also using TortoiseCVS, then there are not enough overlay slots available, so TortoiseSVN tries to be a Good Citizen (TM) and limits its use of overlays to give other apps a chance." +msgstr "事实上，你会发现并不是所有的图标被使用在你的系统上。这是由于Windows限制图标重载不能超过15个。Windows自己用了4个，剩下11个可被别的应用程序使用。如果你同时使用了TortoiseCVS，就没有足够的空位了，所以TortoiseSVN希望成为一个良好市民(TM)，限制自身的使用，为别的应用留下机会。" -#: source/TortoiseSVN_en.xml:2634(para) -msgid "If you have not yet created a repository, follow the instructions given with the Apache server setup ." -msgstr "如果你没有创建一个版本库，根据下面的Apache服务器设置指令。" +#: source/TortoiseSVN_en.xml:4670(para) +msgid "Normal, Modified and Conflicted are always loaded and visible." +msgstr "正常, 已修改和冲突总是被载入，并可见。" -#: source/TortoiseSVN_en.xml:2639(para) -msgid "To test that svnserve is working, use TortoiseSVNRepo-Browser to view a repository." -msgstr "为了验证svnserve正常工作，使用TortoiseSVN版本库浏览器来查看版本库。" +#: source/TortoiseSVN_en.xml:4678(para) +msgid "Deleted is loaded if possible, but falls back to Modified if there are not enough slots." +msgstr "已删除只要有可能的就载入，但如果没有足够的空位，就使用已修改来代替。" -#: source/TortoiseSVN_en.xml:2647(para) -msgid "" -"Assuming your repository is located in c:\\repos\\TestRepo, and your server is called localhost, enter: \n" -"svn://localhost/repos/TestRepo\n" -" when prompted by the repo browser." -msgstr "" -"假定你的版本库位于c:\\repos\\TestRepo，你的服务器叫做localhost，输入: \n" -"svn://localhost/repos/TestRepo\n" -"当被版本库浏览器提示输入。" +#: source/TortoiseSVN_en.xml:4685(para) +msgid "ReadOnly is loaded if possible, but falls back to Normal if there are not enough slots." +msgstr "只读只要有可能就载入，但如果没有足够的空位就使用正常来代替。" -#: source/TortoiseSVN_en.xml:2656(para) -msgid "" -"You can also increase security and save time entering Url's with svnserve by using the --root switch to set the root location and restrict access to a specified directory on the server: \n" -"svnserve.exe --daemon --root drive:\\path\\to\\repository\\root\n" -" Using the previous test as a guide, svnserve would now run as: \n" -"svnserve.exe --daemon --root c:\\repos\n" -" And in TortoiseSVN our repo-browser Url is now shortened to: \n" -"svn://localhost/TestRepo\n" -" Note that the --root switch is also needed if your repository is located on a different partition or drive than the location of svnserve on your server." -msgstr "" -"你也可以使用--root选项设置根位置来限制访问服务器的目录，从而增加安全性和节约输入svnserve URL的时间: \n" -"svnserve.exe --daemon --root drive:\\path\\to\\repository\n" -"以前面的测试为例，svnserve运行命令为: \n" -"svnserve.exe --daemon --root c:\\repos\n" -"然后在TortoiseSVN中我们的版本库浏览器URL缩短为: \n" -"svn://localhost/TestRepo\n" -"注意，当svnserve和版本库位于不同分区或盘符时也需要--root选项。" +#: source/TortoiseSVN_en.xml:4692(para) +msgid "Locked is only loaded if there are fewer than 13 overlays already loaded. It falls back to Normal if there are not enough slots." +msgstr "已锁定只在少于13个重载已经载入的情况下才加载，如果不满足这个条件就使用正常来代替。" -#: source/TortoiseSVN_en.xml:2675(para) -msgid "Svnserve will service any number of repositories. Just locate them somewhere below the root folder you just defined, and access them using a URL relative to that root." -msgstr "Svnserve 可以提供任意数量的版本库服务。只要将这些版本库放到你刚才定义的根目录下即可，然后使用相对于根的URL访问它们。" +#: source/TortoiseSVN_en.xml:4700(para) +msgid "Added is only loaded if there are fewer than 14 overlays already loaded. It falls back to Modified if there are not enough slots." +msgstr "已增加只在少于14个重载已经载入的情况下才加载，如果不满足这个条件就使用已修改来代替" -#: source/TortoiseSVN_en.xml:2692(title) -msgid "Run svnserve as a Service" -msgstr "以服务形式运行 svnserve" +#: source/TortoiseSVN_en.xml:4710(title) +msgid "TortoiseSVN Columns In Windows Explorer" +msgstr "在 Windows 资源管理器中的 TortoiseSVN 列" -#: source/TortoiseSVN_en.xml:2694(primary) -msgid "svnservice" -msgstr "svnservice" +#: source/TortoiseSVN_en.xml:4712(primary) +msgid "Explorer Columns" +msgstr "资源管理器的列" -#: source/TortoiseSVN_en.xml:2696(para) -msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Subversion 1.4, svnserve can be installed as a native windows service." -msgstr "使用普通用户直接运行 svnserve 通常不是最好的方法。它意味着你的服务器必须有一个用户登录，还要记着重新启动服务器后重新启动 svnserve。最好的方法是将 svnserve 作为 windows 服务运行。从 Subversion 1.4 开始，svnserve 可以安装为 windows 服务。" +#: source/TortoiseSVN_en.xml:4714(para) +msgid "The same information which is available from the icon overlays (and much more) can be displayed as additional columns in Windows Explorer's Details View." +msgstr "在Windows资源管理器的详细信息视图中，附加列中可以显示与图标重载所表达相同的信息(还可以显示更多其他信息)。" -#: source/TortoiseSVN_en.xml:27(title) -msgid "Preface" -msgstr "前言" +#: source/TortoiseSVN_en.xml:4719(para) +msgid "Simply right click on one of the headings of a column, choose More... from the context menu displayed. A dialog will appear where you can specify the columns and their order, which is displayed in the \"Detailed View\". Scroll down until the entries starting with SVN come into view. Check the ones you would like to have displayed and close the dialog by pressing OK. The columns will be appended to the right of those currently displayed. You can reorder them by drag and drop, or resize them, so that they fit your needs." +msgstr "右键点击列头，从出现的右键菜单中选择其他...。出现一个对话框，你可以指定在“详细信息视图”中要显示的列及其顺序。滚动对话框中的条目直到SVN开头的条目出现。在你要显示的条目上打勾，然后点击OK按扭关闭对话框。你选择的列就会出现在当前显示的列的右边。你可以通过拖放它们来达到重新排序或是修改列宽度的目的。" -#: source/TortoiseSVN_en.xml:270(para) -msgid "User Interface Buttons are indicated like this: Press OK to continue." -msgstr "用户界面按钮的显示形式: 点击OK以继续。" +#: source/TortoiseSVN_en.xml:4731(para) +msgid "If you want the current layout to be displayed in all your working copies, you may want to make this the default view." +msgstr "如果你想要当前的布局对你所有的工作副本都有效，你可以考虑把它设成默认视图。" -#: source/TortoiseSVN_en.xml:2703(para) -msgid "" -"To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" -"sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" -" --root c:\\repos\" displayname= \"Subversion\" depend= tcpip start= auto\n" -" If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" -"sc create svnserve binpath= \"\\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" -" --service --root c:\\repos\" displayname= \"Subversion\" depend= tcpip start= auto\n" -" You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" -"sc description svnserve \"Subversion server (svnserve)\"\n" -"" -msgstr "" +#: source/TortoiseSVN_en.xml:4739(title) +msgid "Local and Remote Status" +msgstr "本地与远程状态" + +#: source/TortoiseSVN_en.xml:4744(primary) +msgid "modifications" +msgstr "修改" + +#: source/TortoiseSVN_en.xml:4748(title) +#: source/TortoiseSVN_en.xml:11846(title) +msgid "Check for Modifications" +msgstr "检查所作的修改" -#: source/TortoiseSVN_en.xml:2723(para) -msgid "Note the rather unusual command line format used by sc. In the key= value pairs there must be no space between the key and the = but there must be a space before the value." -msgstr "" +#: source/TortoiseSVN_en.xml:4746(para) +msgid " It's often very useful to know which files you have changed and also which files got changed and committed by others. That's where the command TortoiseSVNCheck For Modifications... comes in handy. This dialog will show you every file that has changed in any way in your working copy, as well as any unversioned files you may have." +msgstr " 通常知道你修改了哪些文件以及哪些文件已经由另人修改并提交了是很有用的。这就是命令TortoiseSVNCheck For Modifications... 的用武之地了。这个对话框显示了所有你的工作副本中进行了任何形式的修改的的文件，也包括了当前存在的未受控的文件。" -#: source/TortoiseSVN_en.xml:2730(para) -msgid "" -"Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" -"obj= \"NT AUTHORITY\\LocalService\"\n" -" Note that you would have to give the Local Service account appropriate rights to both Subversion and your repositories, as well as any applications which are used by hook scripts. The builtin group for this is called \"LOCAL SERVICE\"." -msgstr "" -"Microsoft 现在建议服务作为本地服务或网络服务帐户运行，参考The Services and Service Accounts Security Planning Guide。以本地服务帐户创建服务，需要在上面的例子里追加下面几行。\n" -"obj= \"NT AUTHORITY\\LocalService\"\n" -"请注意需要给本地服务帐户一些目录的适当权限，包括的Subversion和你的版本库，还有所有钩子脚本使用的应用。此帐号的内置组名是\"LOCAL SERVICE\"。" +#: source/TortoiseSVN_en.xml:4763(para) +msgid "If you click on the Check Repository then you can also look for changes in the repository. That way you can check before an update if there's a possible conflict. You can also update selected files from the repository without updating the whole folder." +msgstr "如果你点击检查版本库，那你还可以看到版本库里的改动。这样，你就可以在提交之前检查是否有存在冲突的可能。你也可以从版本库中更新选中的文件而用不着更新整个文件夹。" -#: source/TortoiseSVN_en.xml:274(para) -msgid "User Actions are indicated using a bold font. ALT+A: press the ALT-Key on your keyboard and while holding it down press the A-Key as well. Right-drag: press the right mouse button and while holding it down drag the items to the new location." -msgstr "用户动作使用粗体显示。ALT+A: 按下键盘的ALT键，同时按下A键，右键拖拽: 点击鼠标邮件并保持，将项目拖放到新位置。" +#: source/TortoiseSVN_en.xml:4777(para) +msgid "Locally modified items." +msgstr "本地被修改过的项" -#: source/TortoiseSVN_en.xml:2747(para) -msgid "Once you have installed the service, you need to go to the services manager to start it (this time only; it will start automatically when the server reboots)." -msgstr "服务安装完毕后，你需要在服务管理器中启动它(仅此一次；当服务器重启后它会自动启动)。" +#: source/TortoiseSVN_en.xml:4785(para) +msgid "Added items. Items which have been added with history have a + sign in the Text status column, and a tooltip shows where the item was copied from." +msgstr "增加的项。那些被加入的项在文本状态列中有个+号表示，工具提示(tooltip shows)显示了该项是从哪里复制来的。 where the item was copied from." -#: source/TortoiseSVN_en.xml:2752(para) -msgid "For more detailed information, refer to Windows Service Support for Svnserve." -msgstr "为了得到更详细的信息，可参考 Windows Service Support for Svnserve。" +#: source/TortoiseSVN_en.xml:4797(para) +msgid "Deleted or missing items." +msgstr "删除的或是丢失的项。" -#: source/TortoiseSVN_en.xml:2758(para) -msgid "" -"If you installed an earlier version of svnserve using the SvnService wrapper, and you now want to use the native support instead, you will need to unregister the wrapper as a service (remember to stop the service first!). Simply use the command \n" -"svnservice -remove\n" -" to remove the service registry entry." -msgstr "" +#: source/TortoiseSVN_en.xml:4805(para) +msgid "Items modified locally and in the repository. The changes will be merged on update. These may produce conflicts on update." +msgstr "在本地和版本库中都有被修改过的项。改动将在更新的时候被合并。这种情况很可能在更新的时候产生冲突。" -#: source/TortoiseSVN_en.xml:2772(title) -msgid "Authentication with svnserve" -msgstr "svnserve 的认证" +#: source/TortoiseSVN_en.xml:4815(para) +msgid "Items modified locally and deleted in repository, or modified in repository and deleted locally. These will produce conflicts on update." +msgstr "在本地被修改过但在版本库中已经被删除的项，或者在版本库中被修改但在本地被删除的项。这种情况必将在更新时产生冲突。" -#: source/TortoiseSVN_en.xml:2773(para) -msgid "The default svnserve setup provides anonymous read-only access. This means that you can use an svn:// Url to checkout and update, or use the repo-browser in TortoiseSVN to view the repository, but you won't be able to commit any changes." -msgstr "缺省的svnserve设置提供了匿名的只读访问，这意味着你可以使用svn://的URL进行检出和更新，或者使用TortoiseSVN的版本库浏览器查看版本库，但是不能提交任何修改。" +#: source/TortoiseSVN_en.xml:4825(para) +msgid "Unchanged and unversioned items." +msgstr "未修改和未受控的项。" -#: source/TortoiseSVN_en.xml:2779(para) -msgid "To enable write access to a repository, you need to edit the conf/svnserve.conf file in your repository directory. This file controls the configuration of the svnserve daemon, and also contains useful documentation." -msgstr "为了打开对版本库的写访问，你可以编辑版本库目录的conf/svnserve.conf文件，这个文件控制了svnserve守护进程的配置，也提供了有用的文档。" +#: source/TortoiseSVN_en.xml:4771(para) +msgid "The dialog uses colour coding to highlight the status. " +msgstr "对话框使用颜色代码来高亮显示状态。" -#: source/TortoiseSVN_en.xml:2785(para) -msgid "" -"You can enable anonymous write access by simply setting: \n" -"[general]\n" -"anon-access = write\n" -" However, you will not know who has made changes to a repository, as the svn:author property will be empty. You will also be unable to control who makes changes to a repository. This is a somewhat risky setup!" -msgstr "" -"为了打开匿名的写访问，只需要简单得设置: \n" -"[general]\n" -"anon-access = write\n" -"然而，你不会知道谁修改了版本库，因为svn:author属性是空的，你也不能控制谁来修改版本库，这是一个很危险的设置。" +#: source/TortoiseSVN_en.xml:4843(para) +msgid "From the context menu of the dialog you can show a diff of the changes. Check the local changes you made using Context MenuCompare with Base. Check the changes in the repository made by others using Context MenuShow Differences as Unified Diff." +msgstr "在对话框的上下文菜单中你可以显示改变的差异。使用 上下文菜单与基础版本比较检查你所作的本地修改。使用上下文菜单使用标准差异格式显示差异检查版本库中别人作的修改。" -#: source/TortoiseSVN_en.xml:2796(para) -msgid "" -"One way to overcome this is to create a password database: \n" -"[general]\n" -"anon-access = none\n" -"auth-access = write\n" -"password-db = userfile\n" -" Where userfile is a file which exists in the same directory as svnserve.conf. This file can live elsewhere in your filesytem (useful for when you have multiple repositories which require the same access rights) and may be referenced using an absolute path, or a path relative to the conf directory. If you include a path, it must be written /the/unix/way. Using \\ or drive letters will not work. The userfile should have a structure of: \n" -"[users]\n" -"username = password\n" -"...\n" -" This example would deny all access for unauthenticated (anonymous) users, and give read-write access to users listed in userfile." -msgstr "" -"解决这个问题的一个方法是创建密码数据库: \n" -"[general]\n" -"anon-access = none\n" -"auth-access = write\n" -"password-db = userfile\n" -"这里userfile与svnserve.conf文件在同一个目录，这个文件也可以存在于文件系统的其他地方(当多个版本库使用相同的访问权限时尤其有用)，并使用绝对路径引用，或者是conf的相对目录，使用\\或盘符不能工作。userfile的结构如下: \n" -"[users]\n" -"username = password\n" -"...\n" -"这个例子拒绝所有的未认证用户(匿名)访问，给userfile中的用户读写权限。" +#: source/TortoiseSVN_en.xml:4856(para) +msgid "You can also revert changes in individual files. If you have deleted a file accidentally, it will show up as Missing and you can use Revert to recover it." +msgstr "你还可以对单个文件进行还原(revert)。如果你不小心删除了一个文件，在对话框中会显示为丢失你可以使用还原来恢复它。" -#: source/TortoiseSVN_en.xml:282(para) -msgid "System output and keyboard input is indicated with a different font as well." -msgstr "系统输出和键盘输入也使用不同的字体显示。" +#: source/TortoiseSVN_en.xml:4861(para) +msgid "Unversioned and ignored files can be sent to the recycle bin from here using Context MenuDelete. If you want to delete files permanently (bypassing the recycle bin) hold the Shift key while clicking on Delete." +msgstr "可以使用邮件菜单删除将未版本控制的或忽略的文件丢到垃圾箱。如果你想彻底删除(不使用垃圾箱)，在点击删除时，请按着Shift键。" -#: source/TortoiseSVN_en.xml:2824(para) -msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseSVN can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" -msgstr "如果维护多个版本库使用相同的密码数据库，使用一个认证域将让用户的工作更加简单，因为TortoiseSVN可以缓存你的凭证，所以你只需要输入一次，更多的信息可以看《使用 Subversion 进行版本管理》，对应的章节为创建用户文件和域和客户端凭证缓存" +#: source/TortoiseSVN_en.xml:4870(para) +msgid "If you want to examine a file in detail, you can drag it from here into another application such as a text editor or IDE." +msgstr "如果你要查询一个文件的详细情况，你可以把它从这里拖到另一个应用程序，比如一个文本编辑器或是IDE中。" -#: source/TortoiseSVN_en.xml:2842(title) -msgid "Authentication with svn+ssh" -msgstr "使用 svn+ssh 认证" +#: source/TortoiseSVN_en.xml:4874(para) +msgid "The columns are customizable. If you right click on any column header you will see a context menu allowing you to select which columns are displayed. You can also change column width by using the drag handle which appears when you move the mouse over a column boundary. These customizations are preserved, so you will see the same headings next time." +msgstr "这些列是可定制的。如果你右击任何一列的头部，你就会看到一个上下文菜单，允许你选择哪一列要显示。还可以在鼠标移动到列边界时通过拖动把手来改变列的宽度。这些定制的内容都会被保留下来，下一次你会见到相同的头部。" -#: source/TortoiseSVN_en.xml:2843(para) -msgid "Another way to authenticate users with a svnserve based server is to use a secure shell (SSH) to tunnel requests through." -msgstr "另一种svnserve认证的方法是使用SSH来建立请求通道。" +#: source/TortoiseSVN_en.xml:4883(para) +msgid "If you are working on several unrelated tasks at once, you can also group files together into changelists. Read for more information." +msgstr "如果你同时做几个不相关的任务，也可以在修改列表中分组文件。阅读以获得更多信息。" -#: source/TortoiseSVN_en.xml:2848(para) -msgid "With this approach, svnserve is not run as a daemon process, rather, the secure shell starts svnserve for you, running it as the SSH authenticated user. To enable this, you need a secure shell daemon on your server." -msgstr "通过此方法，svnserve不会作为守护进程启动，而是SSH为你启动svnserve，以SSH授权用户运行，为此，你需要在你的服务器上有SSH守护进程。" +#: source/TortoiseSVN_en.xml:4888(para) +msgid "At the bottom of the dialog you can see a summary of the range of repository revisions in use in your working copy. These are the commit revisions, not the update revisions; they represent the range of revisions where these files were last committed, not the revisions to which they have been updated. Note that the revision range shown applies only to the items displayed, not to the entire working copy. If you want to see that information for the whole working copy you must check the Show unmodified files checkbox." +msgstr "" -#: source/TortoiseSVN_en.xml:2854(para) -msgid "It is beyond the scope of this documentation to detail the installation and setup of a secure shell, however you can find further information in the TortoiseSVN FAQ. Search for SSH." -msgstr "详细描述安装和设置SSH已经超过了本文的范围，然而你可以在TortoiseSVN FAQ里查找SSH。" +#: source/TortoiseSVN_en.xml:4899(para) +msgid "If you want a flat view of your working copy, i.e. showing all files and folders at every level of the folder hierarchy, then the Check for Modifications dialog is the easiest way to achieve that. Just check the Show unmodified files checkbox to show all files in your working copy." +msgstr "如果你需要工作目录的全面视图，也就是所有文件和文件夹都同时显示，以便方便的使用检查修改对话框。只要选择现实未修改文件检查栏，显示工作目录中的所有文件即可。" -#: source/TortoiseSVN_en.xml:2863(para) -msgid "Further information about svnserve can be found in the Version Control with Subversion." -msgstr "更多的关于svnserve的信息可以看《使用 Subversion 进行版本管理》。" +#: source/TortoiseSVN_en.xml:4925(title) +msgid "Viewing Diffs" +msgstr "查看差别" -#: source/TortoiseSVN_en.xml:287(para) -msgid "Important notes are marked with an icon." -msgstr "使用图标标记的重要提示。" +#: source/TortoiseSVN_en.xml:4927(primary) +msgid "diffing" +msgstr "比较" -#: source/TortoiseSVN_en.xml:2871(title) -msgid "Path-based Authorization with svnserve" -msgstr "svnserve 以路径为基础的授权" +#: source/TortoiseSVN_en.xml:4929(para) +msgid "Often you want to look inside your files, to have a look at what you've changed. You can accomplish this by selecting a file which has changed, and selecting Diff from TortoiseSVN's context menu. This starts the external diff-viewer, which will then compare the current file with the pristine copy (BASE revision), which was stored after the last checkout or update." +msgstr "通常你想要深入文件中了解你修改了什么。要达到这个目的，你可以选中这个文件，然后在TortoiseSVN的右键菜单中选择比较。这个操作会启动一个外部的差别检查程序，由它来比较当前文件与上一次检出或更新后的原始的副本(基础版本)。" -#: source/TortoiseSVN_en.xml:2872(para) -msgid "" -"Starting with Subversion 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" -"[general]\n" -"authz-db = authz\n" -" Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." -msgstr "" -"从Subversion1.3开始，svnserve支持与mod_authz_svn相同的路径为基础的授权模式，你需要编辑版本库路径下的conf/svnserve.conf引用的授权文件。\n" -"[general]\n" -"authz-db = authz\n" -"在这里，authz是你创建用来定义访问权限的文件，你可以为每一个版本库使用单独的文件，或者为所有的版本库使用相同的文件，关于此文件的格式可以查看。" +#: source/TortoiseSVN_en.xml:4939(para) +msgid "Even when not inside a working copy or when you have multiple versions of the file lying around, you can still display diffs:" +msgstr "即使你不是在一个工作副本中工作或者你有多个版本的文件，你都可以按以下方法来进行比较: " -#: source/TortoiseSVN_en.xml:2894(para) -msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Subversion command line client or with TortoiseSVN." -msgstr "无论你用什么协议访问你的版本库，都至少需要创建一个版本库，这可以使用Subversion命令行客户端或TortoiseSVN完成。" +#: source/TortoiseSVN_en.xml:4943(para) +msgid "Select the two files you want to compare in explorer (e.g. using Ctrl and the mouse) and choose Diff from TortoiseSVN's context menu. The file clicked last (the one with the focus, i.e. the dotted rectangle) will be regarded as the later one." +msgstr "选择你要比较的两个文件(比如，你可以使用Ctrl 键加鼠标)，然后从TortoiseSVN的右键菜单中选择比较。最后一个被鼠标点中的文件(具有焦点的文件，比如有虚线框的文件具有焦点)，将作为被比较文件的后一个。" -#: source/TortoiseSVN_en.xml:2899(para) -msgid "If you haven't created a Subversion repository yet, it's time to do that now." -msgstr "如果你还没有创建Subversion版本库，是时间开始了。" +#: source/TortoiseSVN_en.xml:4955(title) +msgid "Revision Log Dialog" +msgstr "版本日志对话框" -#: source/TortoiseSVN_en.xml:2907(title) -msgid "Repository Creation" -msgstr "创建版本库" +#: source/TortoiseSVN_en.xml:4957(primary) +msgid "log" +msgstr "日志" -#: source/TortoiseSVN_en.xml:2908(para) -msgid "You can create a repository with the FSFS backend or with the old but stable Berkeley Database (BDB) format. The FSFS format is faster and it now works on network shares and Windows 98 without problems. The BDB format is more stable because it has been tested longer. Read Repository Data Stores in the Subversion book for more information." -msgstr "你可以使用FSFS或较老但更稳定的Berkeley Database(BDB)作为版本库的后端，FSFS格式更快一点，而且可以正常运行在Windows 98，BDB格式更加的稳定，因为其经过了更长时间的验证。《使用 Subversion 进行版本管理》中的版本库数据存储有更多细节。" +#: source/TortoiseSVN_en.xml:4960(primary) +msgid "history" +msgstr "历史" -#: source/TortoiseSVN_en.xml:292(para) -msgid "Tips that make your life easier." -msgstr "技巧让你的生活更加简单。" +#: source/TortoiseSVN_en.xml:4963(para) +msgid "For every change you make and commit, you should provide a log message for that change. That way you can later find out what changes you made and why, and you have a detailed log for your development process." +msgstr "对于每次进行修改和提交，你应该有针对性地留下日志信息。这样，你就可以在以后方便地看到你都做了什么，为什么这么做。当然这么做还是你拥有了开发过程的详细日志。" -#: source/TortoiseSVN_en.xml:2920(title) -msgid "Creating a Repository with the Command Line Client" -msgstr "使用命令行工具创建版本库" +#: source/TortoiseSVN_en.xml:4975(para) +msgid "The top pane shows a list of revisions where changes to the file/folder have been committed. This summary includes the date and time, the person who committed the revision and the start of the log message." +msgstr "最上方的面板显示了版本的列表。这其中包含了日期和时间，以及提交的用户和日志信息开头的部分内容。" -#: source/TortoiseSVN_en.xml:2922(primary) -#: source/TortoiseSVN_en.xml:2963(primary) -msgid "Create" -msgstr "创建" +#: source/TortoiseSVN_en.xml:4981(para) +msgid "Lines shown in blue indicate that something has been copied to this development line (perhaps from a branch)." +msgstr "以蓝色显示的行表示某些内容被复制到该开发版本中(可能是从一个分支中复制而来)。" -#: source/TortoiseSVN_en.xml:2923(secondary) -msgid "Command Line Client" -msgstr "命令行工具" +#: source/TortoiseSVN_en.xml:4987(para) +msgid "The middle pane shows the full log message for the selected revision." +msgstr "中间的面板显示了被选中的版本的完整的日志信息。" -#: source/TortoiseSVN_en.xml:2927(para) -msgid "Create an empty folder with the name SVN (e.g. D:\\SVN\\), which is used as root for all your repositories." -msgstr "创建一个名为SVN(例如D:\\SVN\\)的空文件夹，作为你的所有版本库的根。" +#: source/TortoiseSVN_en.xml:4993(para) +msgid "The bottom pane shows a list of all files and folders that were changed as part of the selected revision." +msgstr "最下面的面板显示了被选中版本中都对哪里文件和文件夹进行了修改。" -#: source/TortoiseSVN_en.xml:2934(para) -msgid "Create another folder MyNewRepository inside D:\\SVN\\." -msgstr "在D:\\SVN\\里创建另一个目录MyNewRepository。" +#: source/TortoiseSVN_en.xml:4969(para) +msgid "The Revision Log Dialog retrieves all those log messages and shows them to you. The display is divided into 3 panes. But it does much more than that - it provides context menu commands which you can use to get even more information about the project history." +msgstr "版本日志对话框可以获取所有的日志信息，并将其显示出来。对话框的视图分成3个面板。当然，对话框的作用不止于此——它提供了右键菜单，通过它可以获取更多的项目历史信息。" -#: source/TortoiseSVN_en.xml:2941(para) -msgid "" -"Open the command prompt (or DOS-Box), change into D:\\SVN\\ and type \n" -"svnadmin create --fs-type bdb MyNewRepository\n" -" or \n" -"svnadmin create --fs-type fsfs MyNewRepository\n" -"" -msgstr "" -"打开命令行窗口(或DOS窗口)，进入D:\\SVN\\目录，输入\n" -"svnadmin create --fs-type bdb MyNewRepository\n" -"或\n" -"svnadmin create --fs-type fsfs MyNewRepository\n" -"" +#: source/TortoiseSVN_en.xml:5004(title) +msgid "Invoking the Revision Log Dialog" +msgstr "调用版本日志对话框" + +#: source/TortoiseSVN_en.xml:5007(title) +msgid "The Revision Log Dialog" +msgstr "版本日志对话框" + +#: source/TortoiseSVN_en.xml:5013(para) +msgid "From the TortoiseSVN context submenu" +msgstr "从右键菜单的TortoiseSVN子菜单中调用" -#: source/TortoiseSVN_en.xml:2954(para) -msgid "Now you've got a new repository located at D:\\SVN\\MyNewRepository." -msgstr "现在你在D:\\SVN\\MyNewRepository创建了一个新的版本库。" +#: source/TortoiseSVN_en.xml:5018(para) +msgid "From the property page" +msgstr "从属性页中调用" -#: source/TortoiseSVN_en.xml:2961(title) -msgid "Creating The Repository With TortoiseSVN" -msgstr "使用 TortoiseSVN 创建版本库" +#: source/TortoiseSVN_en.xml:5023(para) +msgid "From the Progress dialog after an update has finished. Then the Log dialog only shows those revisions which were changed since your last update" +msgstr "在更新结束后，从进度对话框中调用。在这里，日志对话框只显示你上一次更新以来的版本变化。" -#: source/TortoiseSVN_en.xml:2964(secondary) -#: source/TortoiseSVN_en.xml:4(title) -msgid "TortoiseSVN" -msgstr "TortoiseSVN" +#: source/TortoiseSVN_en.xml:5005(para) +msgid " There are several places from where you can show the Log dialog: " +msgstr "有几种途径可以调出日志对话框: " -#: source/TortoiseSVN_en.xml:2968(title) -msgid "The TortoiseSVN menu for unversioned folders" -msgstr "未版本控制文件夹的 TortoiseSVN 菜单" +#: source/TortoiseSVN_en.xml:5033(title) +msgid "Getting Additional Information" +msgstr "获得更多信息" -#: source/TortoiseSVN_en.xml:297(para) -msgid "Places where you have to be careful what you are doing." -msgstr "操作时需要小心的地方。" +#: source/TortoiseSVN_en.xml:5036(title) +msgid "The Revision Log Dialog Top Pane with Context Menu" +msgstr "版本日志对话框的顶部面板的右键菜单" -#: source/TortoiseSVN_en.xml:2973(para) -msgid "Open the windows explorer" -msgstr "打开资源管理器" +#: source/TortoiseSVN_en.xml:5042(para) +msgid "Compare the selected revision with your working copy. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseSVN. If the log dialog is for a folder, this will show you a list of changed files, and allow you to review the changes made to each file individually." +msgstr "将你的工作版本与选中的版本进行比较。默认的比较工具是与TortoiseSNV一同发布的TortoiseMerge，如果日志对话框是针对文件夹的，那么就会出现一个被修改的文件的列表，你可以单独地查看每个文件所做的修改。" -#: source/TortoiseSVN_en.xml:2978(para) -msgid "Create a new folder and name it e.g. SVNRepository" -msgstr "创建一个新的文件夹，命名为SVNRepository" +#: source/TortoiseSVN_en.xml:5052(para) +msgid "View the changes made in the selected revision as a Unified-Diff file (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all file changes together in a compact format." +msgstr "将选中的版本作为单一差异文件(GNU补丁格式)查看。相对于可视化的文件比较器，它更难阅读，但它将所有的变化显示在一个格式更为紧凑的文件中。" -#: source/TortoiseSVN_en.xml:2984(para) -msgid "Right-click on the newly created folder and select TortoiseSVNCreate Repository here...." -msgstr "右键点击新创建的目录，选择TortoiseSVN在此创建版本库...。" +#: source/TortoiseSVN_en.xml:5061(para) +msgid "Compare the selected revision with the previous revision. This works in a similar manner to comparing with your working copy." +msgstr "比较选择的版本和以前版本。它与你比较工作副本类似。" -#: source/TortoiseSVN_en.xml:2992(para) -msgid "A repository is then created inside the new folder. Don't edit those files yourself!!!. If you get any errors make sure that the folder is empty and not write protected." -msgstr "然后就会在新文件夹创建一个版本库，不要手工编辑这些文件！！！如果你得到什么警告，一定要先确定目录非空并且没有写保护。" +#: source/TortoiseSVN_en.xml:5068(para) +msgid "Blame the selected revision, and the file in your working BASE and compare the results using a visual diff tool. Read for more detail." +msgstr "评审选中的版本，和你的工作基础文件，使用可视化差异工具显示结果。参阅 以获得更多信息。" -#: source/TortoiseSVN_en.xml:3001(para) -msgid "TortoiseSVN no longer offers the option to create BDB repositories, although you can still use the command line client to create them. FSFS repositories are generally easier for you to maintain, and also makes it easier for us to maintain TortoiseSVN due to compatibility issues between the different BDB versions." -msgstr "" +#: source/TortoiseSVN_en.xml:5075(para) +msgid "Blame the selected revision, and the previous revision, and compare the results using a visual diff tool." +msgstr "追溯选中的版本和旧版本，用可视化差异工具比较结果。" -#: source/TortoiseSVN_en.xml:3008(para) -msgid "Future versions of TortoiseSVN will not support file:/// access to BDB repositories due to these compatibility issues, although it will of course always support this repository format when accessed via a server through the svn://, http:// or https:// protocols. For this reason, we strongly recommend that any new repository which must be accessed using file:/// protocol is created as FSFS." -msgstr "" +#: source/TortoiseSVN_en.xml:5081(para) +msgid "Save the selected revision to a file so you have an older version of that file. This option is only available when you access the log for a file, and it saves a version of that one file only." +msgstr "将选中的版本保存成文件，这样你就获得了该文件的一个旧的版本。这个选项只在你查看一个文件的日志时才可用，它只保存那一个文件的一个版本。" -#: source/TortoiseSVN_en.xml:302(para) -msgid "Where extreme care has to be taken, data corruption or other nasty things may occur if these warnings are ignored." -msgstr "需要特别关注的地方，如果忽略这些警告，会导致数据损坏或其他令人讨厌的事情。" +#: source/TortoiseSVN_en.xml:5089(para) +msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose. This option is only available when you access the log for a file." +msgstr "用默认查看器，或用你指定的程序，打开选中文件。这个选项仅在存取文件日志是可用。" -#: source/TortoiseSVN_en.xml:3020(para) -msgid "Of course we also recommend that you don't use file:/// access at all, apart from local testing purposes. Using a server is more secure and more reliable for all but single-developer use." -msgstr "" +#: source/TortoiseSVN_en.xml:5096(para) +msgid "Open the repository browser to examine the selected folder. This option is only available when you access the log for a directory." +msgstr "打开版本库浏览器，可以查看选中的目录。这个选项只在你查看一个目录的日志时可用。" -#: source/TortoiseSVN_en.xml:3029(title) -msgid "Local Access to the Repository" -msgstr "本地访问版本库" +#: source/TortoiseSVN_en.xml:5103(para) +msgid "Create a branch/tag from a selected revision. This is useful e.g. if you forgot to create a tag and already committed some changes which weren't supposed to get into that release." +msgstr "从选中的版本建立一个分支/标记。这个选项很有用。比如: 如果你提交了某些你不想使其进入发行版的修改，却忘记了为此建立标记。" -#: source/TortoiseSVN_en.xml:3031(primary) -msgid "Access" -msgstr "访问" +#: source/TortoiseSVN_en.xml:5111(para) +msgid "Update your working copy to the selected revision. Useful if you want to have your working copy reflect a time in the past. It is best to update a whole directory in your working copy, not just one file, otherwise your working copy will be inconsistent and you will be unable to commit any changes." +msgstr "将你的工作副本更新到选中的版本。如果你想要你的工作副本折返到过去的某个时间，那这个功能就很好用。你最好是更新工作副本的整个目录而不是单一某个文件，因为如果只更新某个文件，你的工作副本就可能不一致，从而导致你无法提交任何修改。" -#: source/TortoiseSVN_en.xml:3034(primary) -msgid "UNC paths" -msgstr "UNC路径" +#: source/TortoiseSVN_en.xml:5121(para) +msgid "Revert changes from which were made in the selected revision. The changes are reverted in your working copy so this operation does not affect the repository at all! Note that this will undo the changes made in that revision only. It does not replace your working copy with the entire file at the earlier revision. This is very useful for undoing an earlier change when other unrelated changes have been made since. If you have made local changes, this command will merge these changes into your working copy." +msgstr "还原选中版本所做的修改。还原的内容只在你的工作副本中，所以此操作完全不会影响版本库！要注意的是，这个操作仅仅还原该版本中的修改。不是将整个文件替换成选中的那个版本。它对于已经做过其它无关修改的还原早期修改非常有用。如果你做了本地修改，此命令将会合并修改到工作副本。" -#: source/TortoiseSVN_en.xml:3036(para) -msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." -msgstr "为了访问本地版本库，你需要这个文件夹的路径，只要记住Subversion期望所有的版本库路径使用的形式为file:///C:/SVNRepository/，请注意全部使用的是斜杠。" +#: source/TortoiseSVN_en.xml:5135(para) +msgid "Revert to an earlier revision. If you have made several changes, and then decide that you really want to go back to how things were in revision N, this is the command you need. Again, the changes are reverted in your working copy so this operation does not affect the repository until you commit the changes. Note that this will undo all changes made after the selected revision, replacing the file/folder with the earlier version. If you have made local changes, this command will merge these changes into your working copy." +msgstr "恢复到某个以前的版本。如果你做了多处修改，然后决定要返回到版本 N，你就可以使用这个命令。再次说明，恢复的修改位于你的工作副本，在你提交之前，并不会影响版本库。注意，这将会丢弃从那个版本以来的所有修改，使用选中的版本来替换文件/文件夹。" -#: source/TortoiseSVN_en.xml:3042(para) -msgid "To access a repository located on a network share you can either use drive mapping, or you can use the UNC path. For UNC paths, the form is file://ServerName/path/to/repos/. Note that there are only 2 leading slashes here." -msgstr "为了访问网络共享中的版本库，你可以使用驱动器影射或使用UNC路径，对于UNC路径，形式为file://ServerName/path/to/repos/，请注意这里前面只有两个斜杠。" +#: source/TortoiseSVN_en.xml:5149(para) +msgid "Make a fresh checkout of the selected folder at the selected revision. This brings up a dialog for you to confirm the URL and revision, and select a location for the checkout." +msgstr "检出你选择的目录的选中版本，创建一个全新副本。它弹出对话框，让你确认URL和版本，并且选择保存的位置。" -#: source/TortoiseSVN_en.xml:3049(para) -msgid "Prior to SVN 1.2, UNC paths had to be given in the more obscure form file:///\\ServerName/path/to/repos. This form is still supported, but not recommended." -msgstr "在SVN 1.2之前，UNC路径曾经是一种非常晦涩的格式file:///\\ServerName/path/to/repos，这种格式依然支持，但不推荐。" +#: source/TortoiseSVN_en.xml:5156(para) +msgid "Export the selected file/folder at the selected revision. This brings up a dialog for you to confirm the URL and revision, and select a location for the export." +msgstr "导出选择的文件/目录的选中版本。它弹出对话框，让你确认URL和版本，选择导出位置。" -#: source/TortoiseSVN_en.xml:3067(para) -msgid "If you really need to access a repository through a network share, create the repository with fsfs format. If you need to provide server access as well, you will need Subversion Server 1.1 or higher." -msgstr "如果你需要访问网络共享中的版本库，请使用fsfs格式创建版本库，如果也希望提供服务器访问，你需要1.1或更高版本的Subversion服务器。" +#: source/TortoiseSVN_en.xml:5163(para) +msgid "Edit the log message or author attached to a previous commit. Read to find out how this works." +msgstr "编辑之前提交时的日志信息或是作者。请阅读，了解其工作原理。" -#: source/TortoiseSVN_en.xml:3075(title) -msgid "Repository Backup" -msgstr "版本库备份" +#: source/TortoiseSVN_en.xml:5170(para) +msgid "Copy the log details of the selected revisions to the clipboard. This will copy the revision number, author, date, log message and the list of changed items for each revision." +msgstr "将选中版本的详细日志信息复制到剪贴板。它会复制版本号，作者，日期，日志信息，以及每个版本的改变项目列表。" -#: source/TortoiseSVN_en.xml:3077(primary) -msgid "backup" -msgstr "备份" +#: source/TortoiseSVN_en.xml:5177(para) +msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." +msgstr "在日志信息中搜索你输入的的文字。这个操作搜索日志信息，也搜索由Subversion建立的提交行为总结(最底部的面板中的内容)。搜索大小写无关。" -#: source/TortoiseSVN_en.xml:3079(para) -msgid "Whichever type of repository you use, it is vitally important that you maintain regular backups, and that you verify the backup. If the server fails, you may be able to access a recent version of your files, but without the repository all your history is lost forever." -msgstr "无论你使用何种版本库，定期维护和验证版本库备份非常重要，或许你可以访问最近版本的文件，但是如果没有版本库，所有的历史将会丢失。" +#: source/TortoiseSVN_en.xml:5034(para) +msgid " The top pane of the Log dialog has a context menu that allows you to " +msgstr "日志对话框的顶底面板右键菜单功能如下: " -#: source/TortoiseSVN_en.xml:3086(para) -msgid "The simplest (but not recommended) way is just to copy the repository folder onto the backup medium. However, you have to be absolutely sure that no process is accessing the data. In this context, access means any access at all. A BDB repository is written to even when the operation only appears to require reading, such as getting status. If your repository is accessed at all during the copy, (web browser left open, WebSVN, etc.) the backup will be worthless." -msgstr "最简单(但不推荐)的方法是复制整个版本库目录到备份介质，然而你必须绝对确定没有访问数据的进程，在这里“访问”的意思是任何访问，一个BDB版本库即使在访问看起来只需要读时也会有写操作，如果在复制时版本库被访问了(web浏览器，WebSVN等等)，备份将毫无价值。" +#: source/TortoiseSVN_en.xml:5188(title) +msgid "Top Pane Context Menu for 2 Selected Revisions" +msgstr "选种两个版本的顶部面板的右键菜单" -#: source/TortoiseSVN_en.xml:3096(para) -msgid "" -"The recommended method is to run \n" -"svnadmin hotcopy path/to/repository path/to/backup --clean-logs\n" -" to create a copy of your repository in a safe manner. Then backup the copy. The --clean-logs option is not required, but removes any redundant log files when you backup a BDB repository, which may save some space." -msgstr "" -"推荐的方法是运行\n" -"svnadmin hotcopy path/to/repository path/to/backup --clean-logs\n" -"，用一种安全的方式创建版本库的备份，备份是一个副本，--clean-logs选项并不必须，但是通过删除BDB版本库中多余的日志文件可以节省一些空间。" +#: source/TortoiseSVN_en.xml:5196(para) +msgid "Compare the two selected revisions using a visual difference tool. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseSVN." +msgstr "使用可视化差异比较工作比较两个选中的版本。默认的比较工作是与TortoiseSVN一起提供的TortoiseMerge。" -#: source/TortoiseSVN_en.xml:3106(para) -msgid "The svnadmin tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Subversion command line client from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91." -msgstr "svnadmin在安装Subversion命令行客户端时会自动安装，如果你在Windows PC上安装这个命令行工具，最好的方式是下载Windows安装版本，它比.zip版本的压缩效率更好，所以更小，并且小心的为你设定路径。你可以从http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91下载最新版本的命令行客户端。" +#: source/TortoiseSVN_en.xml:5201(para) +msgid "If you select this option for a folder, a further dialog pops up listing the changed files and offering you further diff options. Read more about the Compare Revisions dialog in ." +msgstr "如果你是针对文件夹选中这个选项，则会弹出一个对话框列出修改过的文件，提供了更多的差异比较选项。请参考比较版本对话框获得详情: 。" -#: source/TortoiseSVN_en.xml:3121(title) -msgid "Hook Scripts" -msgstr "钩子脚本" +#: source/TortoiseSVN_en.xml:5209(para) +msgid "Blame the two revisions and compare the results using a visual difference tool. Read for more detail." +msgstr "评审两个版本，并使用差异比较工作比较结果。详情请参考 。" -#: source/TortoiseSVN_en.xml:3123(primary) -msgid "hooks" -msgstr "钩子" +#: source/TortoiseSVN_en.xml:5216(para) +msgid "View the differences between the two selected revisions as a Unified-Diff file. This works for files and folders." +msgstr "使用单一差异文件显示差异。这对文件和文件夹都有效。" -#: source/TortoiseSVN_en.xml:3125(para) -msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Subversion Book for full details about the hooks which are implemented." -msgstr "钩子脚本是被版本库事件触发的程序，例如新修订版本的创建或未版本控制属性的修改。每一种钩子都会被告知事件的足够信息，操作的目标，触发事件的用户名。依赖于钩子的输出或返回状态，钩子程序可以继续执行，停止或以某种方式挂起。请参阅《使用 Subversion 进行版本管理》的钩子脚本部分来查看关于钩子实现的细节。" +#: source/TortoiseSVN_en.xml:5222(para) +msgid "Copy log messages to clipboard as described above." +msgstr "如前所述将日志消息复制到剪贴板。" -#: source/TortoiseSVN_en.xml:314(primary) -msgid "version control" -msgstr "版本控制" +#: source/TortoiseSVN_en.xml:5227(para) +msgid "Search log messages as described above." +msgstr "如前所述可以搜索日志消息。" -#: source/TortoiseSVN_en.xml:3140(para) -msgid "These hook scripts are executed by the server that hosts the repository. TortoiseSVN also allows you to configure client side hook scripts that are executed locally upon certain events. See for more information." -msgstr "" +#: source/TortoiseSVN_en.xml:5186(para) +msgid " If you select two revisions at once (using the usual Ctrl-modifier), the context menu changes and gives you fewer options: " +msgstr "如果你使用Ctrl组合键一次选中了两个版本，右键菜单有所改变: " -#: source/TortoiseSVN_en.xml:3146(para) -msgid "" -"Sample hook scripts can be found in the hooks directory of the repository. These sample scripts are suitable for Unix/Linux servers but need to be modified if your server is Windows based. The hook can be a batch file or an executable. The sample below shows a batch file which might be used to implement a pre-revprop-change hook. \n" -"rem Only allow log messages to be changed.\n" -"if \"%4\" == \"svn:log\" exit 0\n" -"echo Property '%4' cannot be changed >&2\n" -"exit 1\n" -" Note that anything sent to stdout is discarded. if you want a message to appear in the Commit Reject dialog you must send it to stderr. In a batch file this is achieved using >&2" -msgstr "" -"版本库的hooks目录中有一些钩子的例子脚本，这些例子脚本适合于Unix/Linux服务器，在Windows下需要修改。钩子可以是批处理文件或可执行文件，下面是用来实现pre-revprop-change钩子的例子。\n" -"rem Only allow log messages to be changed.\n" -"if \"%4\" == \"svn:log\" exit 0\n" -"echo Property '%4' cannot be changed >&2\n" -"exit 1\n" -"请注意所有发送到标准输出的东西都会被忽略，如果你希望信息出现在拒绝提交对话框中，你需要将这些信息发送到标准错误，在一个批处理文件中使用>&2实现。" +#: source/TortoiseSVN_en.xml:5233(para) +msgid "If you select multiple consecutive revisions (using the usual Ctrl or Shift modifiers), the context menu will include an entry to Revert all changes which were made in that range of revisions. This is the easiest way to rollback a group of revisions in one go." +msgstr "如果你用Ctrl或Shift组合键选择了多个连续的版本，右键菜单将有一个选项，可以让你还原这些版本中的修改。这是一次性还原多个版本中修改的最简方法。" -#: source/TortoiseSVN_en.xml:3166(title) -msgid "Checkout Links" -msgstr "检出链接" +#: source/TortoiseSVN_en.xml:5242(title) +msgid "The Log Dialog Bottom Pane with Context Menu" +msgstr "日志对话框的底部面板的右键菜单" -#: source/TortoiseSVN_en.xml:3168(primary) -msgid "checkout link" -msgstr "检出链接" +#: source/TortoiseSVN_en.xml:5248(para) +msgid "Show differences made in the selected revision for the selected file. This context menu is only available for files shown as Modified." +msgstr "显示选中版本中的选中文件的差异。这个操作只对显示为已修改的文件有效。" -#: source/TortoiseSVN_en.xml:317(para) -msgid "Version control is the art of managing changes to information. It has long been a critical tool for programmers, who typically spend their time making small changes to software and then undoing or checking some of those changes the next day. Imagine a team of such developers working concurrently - and perhaps even simultaneously on the very same files! - and you can see why a good system is needed to manage the potential chaos." -msgstr "版本控制是管理信息修改的艺术，它一直是程序员最重要的工具，程序员经常会花时间作出小的修改，然后又在某一天取消了这些修改，想象一下一个开发者并行工作的团队 - 或许是同时工作在同一个文件！- 你就会明白为什么一个好的系统需要管理潜在的混乱。" +#: source/TortoiseSVN_en.xml:5255(para) +msgid "Blame the selected revision and the previous revision for the selected file, and show the differences using a visual diff tool. Read for more detail." +msgstr "评审选中文件的选中版本与前一个版本，使用可视化差异工具显示差异。详情请参阅 。" -#: source/TortoiseSVN_en.xml:3170(para) -msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TSVN users." -msgstr "如果你希望你的Subversion版本库对于别人可用，你可以在你的站点包含一个链接。为了让这些更加容易访问，你可以为其他TSVN用户包含一个检出链接。" +#: source/TortoiseSVN_en.xml:5262(para) source/TortoiseSVN_en.xml:8004(para) +msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose." +msgstr "用默认查看器或你指定的程序打开选中文件的选中版本。" -#: source/TortoiseSVN_en.xml:3176(para) -msgid "When you install TortoiseSVN, it registers a new tsvn: protocol. When a TSVN user clicks on such a link, the checkout dialog will open automatically with the repository URL already filled in." -msgstr "当你安装了TortoiseSVN，它会注册一个tsvn:协议，当TSVN用户点击这样一个链接，检出窗口会自动弹出，且版本库URL已经填入。" +#: source/TortoiseSVN_en.xml:5268(para) +msgid "Revert the changes made to the selected file in that revision." +msgstr "还原选中文件的选中版本所作的变更。" -#: source/TortoiseSVN_en.xml:3182(para) -msgid "" -"To include such a link in your own html page, you need to add code which looks something like this: \n" -"<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\"></a>\n" -"" -msgstr "" -"为了在你自己的网页上包含这样一个链接，你需要添加类似下面的代码: \n" -"<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\"></a>\n" -"" +#: source/TortoiseSVN_en.xml:5273(para) +msgid "View the Subversion properties for the selected item." +msgstr "查看选中项的Subversion属性。" -#: source/TortoiseSVN_en.xml:3189(para) -msgid "" -"Of course it would look even better if you included a suitable picture. You can use the TortoiseSVN logo or you can provide your own image. \n" -"<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\">\n" -"<img src=TortoiseCheckout.png></a>\n" -"" -msgstr "" -"当然，如果你提供一个合适的图片会更好，你可以使用TortoiseSVN logo，也可以使用自己的图片。\n" -"<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\">\n" -"<img src=TortoiseCheckout.png></a>\n" -"" +#: source/TortoiseSVN_en.xml:5278(para) +msgid "Show the revision log for the selected single file." +msgstr "显示选中的单个文件的版本日志。" -#: source/TortoiseSVN_en.xml:3204(title) -msgid "Daily Use Guide" -msgstr "日常使用指南" +#: source/TortoiseSVN_en.xml:5283(para) +msgid "Save the selected revision to a file so you have an older version of that file." +msgstr "将选中的版本保存成文件，你可以得到一份该文件的旧版本。" -#: source/TortoiseSVN_en.xml:3208(para) -msgid "This document describes day to day usage of the TortoiseSVN client. It is not an introduction to version control systems, and not an introduction to Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." -msgstr "本文目的在与描述TortoiseSVN客户端的日常使用。不是一个版本控制系统指南，也不是Subversion (SVN)的指南。本文档的价值在于，当你知道大概要做什么，却又记不起应该怎么做的时候，可以有个参考的地方。" +#: source/TortoiseSVN_en.xml:5240(para) +msgid " The bottom pane of the Log dialog also has a context menu that allows you to " +msgstr " 日志对话框的底部面板也有右键菜单，你可以: " -#: source/TortoiseSVN_en.xml:3216(para) -msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." -msgstr "如果你需要了解使用Subversion进行版本控制的指南，我们建立你阅读以下这本梦幻之书: 《使用 Subversion 进行版本管理》." +#: source/TortoiseSVN_en.xml:5292(title) +msgid "Getting more log messages" +msgstr "获取更多的日志信息" -#: source/TortoiseSVN_en.xml:3223(para) -msgid "This document is also a work in progress, just as TortoiseSVN and Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseSVN in our free time." -msgstr "本文档与TortoiseSVN和Subversion一样，也是处于“正在开发”的状态。如果你找到了错误之处，请向邮件列表报告，这样我们就可以更新它。日常使用指南(DUG)中的一些屏幕截图也许不符合当前软件中的情况。请您原谅我们。毕竟我们只是用业余的时间在制作TortoiseSVN 。" +#: source/TortoiseSVN_en.xml:5298(para) +msgid "For a large repository there may be hundreds or even thousands of changes and fetching them all could take a long time. Normally you are only interested in the more recent changes. By default, the number of log messages fetched is limited to 100, but you can change this value in TortoiseSVNSettings ()," +msgstr "对于一个大的库，可能存在几百上千个改动，全部得到它们可能要花上很久的时间。通常你只关心最近的修改。默认情况下，日志消息限制只获取100条，但你可以在TortoiseSVN设置中修改这个值 ()，" -#: source/TortoiseSVN_en.xml:3231(para) -msgid "In order to get the most out of the Daily Use Guide: " -msgstr "为了获得比每日用户指南更多的信息: " +#: source/TortoiseSVN_en.xml:5313(para) +msgid "When the Stop on copy/rename box is checked, Show Log will stop at the point that the selected file or folder was copied from somewhere else within the repository. This can be useful when looking at branches (or tags) as it stops at the root of that branch, and gives a quick indication of changes made in that branch only." +msgstr "当复制/重命名时停止复选框被选中时， 如果选中的文件或文件夹是从版本库中的其他地方复制而来的，显示日志将停止在该点。这对于查看分支(或标记)时很有用，因为它会停在分支的根节点上，可以快速查看该分支的修改。" -#: source/TortoiseSVN_en.xml:3235(para) -msgid "You should have installed TortoiseSVN already." -msgstr "你应该已经安装了TortoiseSVN。" +#: source/TortoiseSVN_en.xml:5322(para) +msgid "Normally you will want to leave this option unchecked. TortoiseSVN remembers the state of the checkbox, so it will respect your preference." +msgstr "一般情况下你可以不要勾选它。 TortoiseSVN会记住它的状态，以改进性能。" -#: source/TortoiseSVN_en.xml:3240(para) -msgid "You should be familiar with version control systems." -msgstr "你应该熟悉版本控制系统。" +#: source/TortoiseSVN_en.xml:5327(para) +msgid "When the Show Log dialog is invoked from within the Merge dialog, the box is always checked by default. This is because merging is most often looking at changes on branches, and going back beyond the root of the branch does not make sense in that instance." +msgstr "如果你在从合并对话框中调用的显示日志对话框，那么这个复选框默认将总是选中的。这是由于合并通常都是查看分支中的修改， 获取分支的根之前的日志在这种情况下通常没有什么意义。" -#: source/TortoiseSVN_en.xml:3245(para) -msgid "You should know the basics of Subversion." -msgstr "你应该知道Subversion的基础。" +#: source/TortoiseSVN_en.xml:5334(para) +msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." +msgstr "注意，Subversion当前是用复制/删除来实现重命名的，所以重命名一个文件或文件夹也会造成日志显示停止(如果选择了复制/重命名时停止)在该点。" -#: source/TortoiseSVN_en.xml:3250(para) -msgid "You should have set up a server and/or have access to a Subversion repository." -msgstr "你应该已经建立了一个服务器并且可以访问Subversion库。" +#: source/TortoiseSVN_en.xml:5293(para) +msgid "The Log dialog does not always show all changes ever made for a number of reasons: " +msgstr "日志对话框并不总是显示所有曾经的修改，日志不显示的可能原因如下: " -#: source/TortoiseSVN_en.xml:3261(title) -msgid "Getting Started" -msgstr "开始" +#: source/TortoiseSVN_en.xml:5343(para) +msgid "If you want to see more log messages, click the Next 100 to retrieve the next 100 log messages. You can repeat this as many times as needed." +msgstr "如果你要查看更多的日志信息，点击下100个，以获取下100个日志信息。如果有需要你可以多次重复这个操作。" -#: source/TortoiseSVN_en.xml:3263(title) source/TortoiseSVN_en.xml:4590(title) -msgid "Icon Overlays" -msgstr "图标重载" +#: source/TortoiseSVN_en.xml:5348(para) +msgid "Next to this button there is a multi-function button which remembers the last option you used it for. Click on the arrow to see the other options offered." +msgstr "这个按钮旁边的是一个多功能按钮，它可以记住上一次你要它进行的操作。点击它上面的箭头，可以看到更多的选项。" -#: source/TortoiseSVN_en.xml:3264(para) -msgid " One of the most visible features of TortoiseSVN is the icon overlays which appear on files in your working copy. These show you at a glance which of your files have been modified. Refer to to find out what the different overlays represent." -msgstr " TortoiseSVN 最明显的特性之一就是图标重载，重载的图标显示在你的工作副本文件上。你一眼就可以看到文件被修改过了。参考 查阅不同的重载图标含义。" +#: source/TortoiseSVN_en.xml:5353(para) +msgid "Use Show Range ... if you want to view a specific range of revisions. A dialog will then prompt you to enter the start and end revision." +msgstr "如果你要查询指定范围的版本，使用显示范围 ...。这会出现一个对话框，要求输入开始和结束的版本。" -#: source/TortoiseSVN_en.xml:3266(title) source/TortoiseSVN_en.xml:4599(title) -msgid "Explorer showing icon overlays" -msgstr "显示重载图标的资源管理器" +#: source/TortoiseSVN_en.xml:5358(para) +msgid "Use Show All if you want to see all log messages from HEAD right back to revision 1." +msgstr "如果你要查询从最新版本直到版本1的所有的日志消息，使用显示所有。" -#: source/TortoiseSVN_en.xml:3277(title) -msgid "Context Menus" -msgstr "右键菜单" +#: source/TortoiseSVN_en.xml:5364(title) +msgid "Changing the Log Message and Author" +msgstr "修改日志消息和作者" -#: source/TortoiseSVN_en.xml:3279(primary) -msgid "context menu" -msgstr "右键菜单" +#: source/TortoiseSVN_en.xml:5366(primary) +msgid "edit log/author" +msgstr "编辑日志/作者" -#: source/TortoiseSVN_en.xml:3281(para) -msgid " All TortoiseSVN commands are invoked from the context menu of the windows explorer. Most are directly visible, when you right click on a file or folder. The commands that are available depend on whether the file or folder or its parent folder is under version control or not. You can also see the TortoiseSVN menu as part of the Explorer file menu." -msgstr " 所有的TortoiseSVN命令都是通过windows资源管理器的右键菜单执行。右键点击一个文件或者文件夹，大多数菜单项都能够直接显示。一个命令是否显示取决于这个文件或文件夹或者它们的父文件夹是否受版本控制，你也可以将TortoiseSVN的菜单作为资源管理器菜单的一部分。" +#: source/TortoiseSVN_en.xml:5368(para) +msgid "Sometimes you might want to change a log message you once entered, maybe because there's a spelling error in it or you want to improve the message or change it for other reasons. Or you want to change the author of the commit because you forgot to set up authentication or..." +msgstr "有时你可能想要修改你曾经输入的日志消息，也许是因为有拼写错误或是你想改进消息内容，或是其他别的原因。偶尔你还想修改提交者，可能是你忘了设置认证等原因。" -#: source/TortoiseSVN_en.xml:3283(title) -msgid "Context menu for a directory under version control" -msgstr "版本控制下一个目录的右键菜单" +#: source/TortoiseSVN_en.xml:5375(para) +msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." +msgstr "Subversion允许你在任何时候修改日志消息和作者。但这种改变不可还原(不在版本控制之下)，正因如此，这些功能默认是不可用的，如果要开启它，必须设置一个pre-revprop-change钩子。具体如何做，请参考《使用 Subversion 进行版本管理》的相关章节钩子脚本。在Windows机器上实现钩子的注意事项请阅读。" -#: source/TortoiseSVN_en.xml:3292(para) -msgid "In some cases you may see several TortoiseSVN entries. This is not a bug! This example is for an unversioned shortcut within a versioned folder, and in the Explorer file menu there are three entries for TortoiseSVN. One is for the folder, one for the shortcut itself, and the third for the object the shortcut is pointing to. To help you distinguish between them, the icons have an indicator in the lower right corner to show whether the menu entry is for a file, a folder, a shortcut or for multiple selected items." -msgstr "在某些情况下，你可能看到多个TortoiseSVN条目。这不是BUG！本示例是在一个受控文件夹下的某个未受控的快捷方式， 在资源管理器的文件菜单下有三个TortoiseSVN条目。一个是受控文件夹本身的，一个是快捷方式本身的，第三个是快捷方式所指向的对象。为了帮助你区分它们，菜单条目的图标的右下角有标志，表明是文件、快捷方式、文件夹或是选中了多项。" +#: source/TortoiseSVN_en.xml:5388(para) +msgid "Once you've set up your server with the required hooks, you can change both author and log message of any revision, using the context menu from the top pane of the Log dialog." +msgstr "一旦你按需要为服务器设置了钩子，你就可以使用日志对话框顶部面板的右键菜单来修改任意版本的作者和日志信息了。" -#: source/TortoiseSVN_en.xml:3295(title) -msgid "Explorer file menu for a shortcut in a versioned folder" -msgstr "在一个版本控制的文件夹下资源管理器文件菜单中的快捷方式。" +#: source/TortoiseSVN_en.xml:5394(para) +msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." +msgstr "由于Subversion的版本属性不受版本控制，对于这种属性的修改(如 svn:log提交信息属性将永久覆盖该属性之前的值。" -#: source/TortoiseSVN_en.xml:3308(title) source/TortoiseSVN_en.xml:4085(title) -msgid "Drag and Drop" -msgstr "拖放" +#: source/TortoiseSVN_en.xml:5404(title) +msgid "Filtering Log Messages" +msgstr "过滤日志信息" -#: source/TortoiseSVN_en.xml:331(title) -msgid "What is TortoiseSVN?" -msgstr "什么是 TortoiseSVN？" +#: source/TortoiseSVN_en.xml:5406(primary) +msgid "filter" +msgstr "过滤器" -#: source/TortoiseSVN_en.xml:3310(primary) -msgid "drag handler" -msgstr "拖拽句柄" +#: source/TortoiseSVN_en.xml:5408(para) +msgid "If you want to restrict the log messages to show only those you are interested in rather than scrolling through a list of hundreds, you can use the filter controls at the top of the Log Dialog. The start and end date controls allow you to restrict the output to a known date range. The search box allows you to show only messages which contain a particular phrase." +msgstr "如果你只想要显示上千条日志中你所感兴趣的日志，你可以使用日志对话框顶部的过滤器控件。开始和结束日期控件允许你查看指定日期范围内的输出。查找框帮你查出含有指定内容的信息。" -#: source/TortoiseSVN_en.xml:3313(primary) -msgid "drag-n-drop" -msgstr "拖放" +#: source/TortoiseSVN_en.xml:5417(para) +msgid "Note that these filters act on the messages already retrieved. They do not control downloading of messages from the repository." +msgstr "要注意的是，这些过滤器只对已经获取的信息有效。它们并不从版本库中下载信息。" -#: source/TortoiseSVN_en.xml:3316(primary) -msgid "right drag" -msgstr "右键拖动" +#: source/TortoiseSVN_en.xml:5421(para) +msgid "You can also filter the path names in the bottom pane using the Hide unrelated changed paths checkbox. Related paths are those which contain the path used to display the log. If you fetch the log for a folder, that means anything in that folder or below it. For a file it means just that one file. The checkbox is tri-state: you can show all paths, grey out the unrelated ones, or hide the unrelated paths completely." +msgstr "你还可以使用隐藏无关的修改路径 复选框来过滤底部面板中的路径名称。所谓相关路径，是指那些与日志相关的路径。对于一个文件夹的日志来说，相关路径就是该文件夹以其下的所有内容。对于一个文件的日志来说，相关路径就是与该文件的路径。该复选框是3态的: 可以显示所有的路径，将无关的内容灰色显示，或是完全隐藏无关路径。" -#: source/TortoiseSVN_en.xml:3319(primary) -#: source/TortoiseSVN_en.xml:6839(primary) -#: source/TortoiseSVN_en.xml:7970(primary) -msgid "copy" -msgstr "复制" +#: source/TortoiseSVN_en.xml:5433(title) +msgid "Statistical Information" +msgstr "统计信息" -#: source/TortoiseSVN_en.xml:332(para) -msgid "TortoiseSVN is a free open-source client for the Subversion version control system. That is, TortoiseSVN manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Subversion and version control systems in general as a sort of time machine." -msgstr "TortoiseSVN 是 Subversion 版本控制系统的一个免费开源客户端，可以超越时间的管理文件和目录。文件保存在中央版本库，除了能记住文件和目录的每次修改以外，版本库非常像普通的文件服务器。你可以将文件恢复到过去的版本，并且可以通过检查历史知道数据做了哪些修改，谁做的修改。这就是为什么许多人将 Subversion 和版本控制系统看作一种时间机器。" +#: source/TortoiseSVN_en.xml:5435(primary) +msgid "statistics" +msgstr "统计" -#: source/TortoiseSVN_en.xml:3321(para) -msgid " Other commands are available as drag handlers, when you right drag files or folders to a new location inside working copies or when you right drag a non-versioned file or folder into a directory which is under version control." -msgstr " 在工作副本里右键拖拽文件或目录到新的位置，或者右键拖拽一个非版本控制的文件或文件夹到一个版本控制目录下的时候，右键菜单还能够出现其他的命令。" +#: source/TortoiseSVN_en.xml:5437(para) +msgid "The Statistics button brings up a box showing some interesting information about the revisions shown in the Log dialog. This shows how many authors have been at work, how many commits they have made, progress by week, and much more. Now you can see at a glance who has been working hardest and who is slacking ;-)" +msgstr "统计按扭，可以显示一些你感兴趣的关于日志对话框中版本的信息。可以显示已经有几个作者做了工作，他们各提交了几次，按周的统计，等等。现在，你可以发现一个大概情况: 谁最勤快，谁偷懒。;-)" -#: source/TortoiseSVN_en.xml:3323(title) -msgid "Right drag menu for a directory under version control" -msgstr "版本控制下的一个目录的右键拖拽菜单" +#: source/TortoiseSVN_en.xml:5446(title) +msgid "Statistics Page" +msgstr "统计页" -#: source/TortoiseSVN_en.xml:3333(title) -msgid "Common Shortcuts" -msgstr "常用快捷方式" +#: source/TortoiseSVN_en.xml:5447(para) +msgid "This page gives you all the numbers you can think of, in particular the period and number of revisions covered, and some min/max/average values." +msgstr "此页可以提供所有你可以想到的数据，特别是周期和包括的版本数，还有一些最大/最小/平均值。" -#: source/TortoiseSVN_en.xml:3334(para) -msgid "Some common operations have well-know Windows shortcuts, but do not appear on buttons or in menus. If you can't work out how to do something obvious, like refreshing a view, check here. " -msgstr "一些常见的操作与Windows的快捷键是一样的，但没有出现在按钮或是菜单中。如果你找不到一些显而易见的操作，比如刷新视图，请参考以下内容。 " +#: source/TortoiseSVN_en.xml:5454(title) +msgid "Commits by Author Page" +msgstr "作者提交次数统计页" -#: source/TortoiseSVN_en.xml:3340(term) -msgid "F1" -msgstr "F1" +#: source/TortoiseSVN_en.xml:5457(title) +msgid "Commits-by-Author Histogram" +msgstr "作者提交次数统计柱状图" -#: source/TortoiseSVN_en.xml:3342(para) -msgid "Help, of course." -msgstr "当然是帮助。" +#: source/TortoiseSVN_en.xml:5464(title) +msgid "Commits-by-Author Pie Chart" +msgstr "作者提交次数统计饼图" -#: source/TortoiseSVN_en.xml:3348(term) -msgid "F5" -msgstr "F5" +#: source/TortoiseSVN_en.xml:5455(para) +msgid " This graph shows you which authors have been active on the project as a simple histogram, stacked histogram or pie chart. " +msgstr "此图用简单柱状图、叠加柱状图或饼图显示了哪些作者已经在项目中活跃了。" -#: source/TortoiseSVN_en.xml:3350(para) -msgid "Refresh the current view. This is perhaps the single most useful one-key command. For example ... In Explorer this will refresh the icon overlays on your working copy. In the commit dialog it will re-scan the working copy to see what may need to be committed. In the Revision Log dialog it will contact the repository again to check for more recent changes." -msgstr "刷新当前视图。这也许是单键命令中唯一一个最常用的了。比如... 在资源浏览器中，这个键可以刷新工作副本中的图标重载。在提交对话框中，它可以重新扫描查找哪些是需要提交的。在版本日志对话框中，可以重新联系版本库以检查更多的最近修改情况。" +#: source/TortoiseSVN_en.xml:5468(para) +msgid "Where there are a few major authors and many minor contributors, the number of tiny segments can make the graph more difficult to read. The slider at the bottom allows you to set a threshold (as a per centage of total commits) below which any activity is grouped into an Others category." +msgstr "其中有几个主要作者和许多辅助的作者。由于太小的部分会导致图形难于阅读，所以在底部有个滑动条，可以设置一个范围(占所有提交的百分比)，在这个范围下的所有行为都整合成其他类。" -#: source/TortoiseSVN_en.xml:3362(term) -msgid "Ctrl-A" -msgstr "Ctrl-A" +#: source/TortoiseSVN_en.xml:5477(title) +msgid "Commits by date Page" +msgstr "按日期提交统计页" -#: source/TortoiseSVN_en.xml:3364(para) -msgid "Select all. This can be used if you get an error message and want to copy and paste into an email. Use Ctrl-A to select the error message and then ..." -msgstr "全选。可用于在得到一个错误消息并想要复制粘贴到电子邮件时。使用Ctrl-A to选择错误错误，然后..." +#: source/TortoiseSVN_en.xml:5480(title) +msgid "Commits-by-date Graph" +msgstr "按日期提交统计图" -#: source/TortoiseSVN_en.xml:3372(term) -msgid "Ctrl-C" -msgstr "Ctrl-C" +#: source/TortoiseSVN_en.xml:5478(para) +msgid " This page gives you a graphical representation of project activity in terms of number of commits and author. This gives some idea of when a project is being worked on, and who was working at which time." +msgstr "本页图示了以提交次数和作者作为条件的项目行为统计。这里可以看出项目什么时候有人在工作，以及什么人在什么时候进行了工作。" -#: source/TortoiseSVN_en.xml:3374(para) -msgid "... Copy the selected text." -msgstr "... 复制选中的文本。" +#: source/TortoiseSVN_en.xml:5488(para) +msgid "When there are several authors, you will get many lines on the graph. There are two views available here: normal, where each author's activity is relative to the base line, and stacked, where each author's activity is relative to the line underneath. The latter option avoids the lines crossing over, which can make the graph easier to read, but less easy to see one author's output." +msgstr "如果有多个作者，你就会在图中看到多行。有两种视图可用正常，在这里，每个作者的行为都相对于基线；叠加，在这里每个作者的行为是相对于他的下面那条线。后一种视图避免了线的交叉，对于图来说更明了，但对查看一个作者的输出比较不直观。" -#: source/TortoiseSVN_en.xml:3385(primary) -msgid "authentication" -msgstr "认证" +#: source/TortoiseSVN_en.xml:5498(para) +msgid "By default the analysis is case-sensitive, so users PeterEgan and PeteRegan are treated as different authors. However, in many cases usernames are not case-sensitive, and are sometimes entered inconsistently, so you may want DavidMorgan and davidmorgan to be treated as the same person. Use the Authors case insensitive checkbox to control how this is handled." +msgstr "默认统计是区别大小写的，也就是说用户PeterEgan与PeteRegan被认为是两个不同的作者。但在多数时候用户名并不区别大小写，有时会存在不一致，所以你可能希望PeterEgan和PeteRegan能被当成是同一个作者。使用作者不区分大小写复选框来控制。" + +#: source/TortoiseSVN_en.xml:5508(para) +msgid "Note that the statistics cover the same period as the Log dialog. If that is only displaying one revision then the statistics will not tell you very much." +msgstr "注意，统计只包括了日志对话框中的那段时期。如果日志对话框中只显示一个版本，那么统计就没有什么意义了。" + +#: source/TortoiseSVN_en.xml:5516(title) +msgid "Viewing Differences" +msgstr "查看差异" -#: source/TortoiseSVN_en.xml:3387(para) -msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseSVN store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: There is one file for each server that you access, formatted as plain text, so you can use a text editor to check which server it applies to. In order to make Subversion and TortoiseSVN (and any other Subversion client) forget your credentials for a particular server, simply delete the corresponding file." -msgstr "如果连接的版本库需要口令，就会显示认证对话框。 输入你的用户名和口令。其检查框能让 TortoiseSVN 在 Subversion的 缺省目录：%APPDATA%\\Subversion\\auth 的三个子目录内保存认证信息： 每个文件对应一个服务器，文件是纯文本格式，因此可以用文本编辑器查看文件是对应哪个服务器。如果希望 Subversion 和 TortoiseSVN(或者其它 Subversion 客户端) 忘记某个服务器的凭证信息，只需删除这个服务器的对应文件即可。" +#: source/TortoiseSVN_en.xml:5518(primary) +msgid "diff" +msgstr "比较" -#: source/TortoiseSVN_en.xml:3391(title) -msgid "Authentication Dialog" -msgstr "认证对话框" +#: source/TortoiseSVN_en.xml:5520(para) +msgid "One of the commonest requirements in project development is to see what has changed. You might want to look at the differences between two revisions of the same file, or the differences between two separate files. TortoiseSVN provides a builtin tool named TortoiseMerge for viewing differences of text files. For viewing differences of image files, TortoiseSVN also has a tool named TortoiseIDiff. Of course, you can use your own favourite diff program if you like." +msgstr "在项目开发中，有一个很常用的要求就是查看更改。可能是你要求查看同一文件的两个版本之间的差异，或者是查看两个独立的文件的差异。TortoiseSVN自带了一个工具叫TortoiseMerge用来查看文本文件的差异。也有一个叫TortoiseIDiff的工具来比较图像文件的差异。当然，你可以根据你自己的喜好来选择比较差异的工具。" -#: source/TortoiseSVN_en.xml:3399(para) -msgid "svn.simple contains credentials for basic authentication (username/password)." -msgstr "svn.simple文件里包含了基本认证方式所需要的认证信息(用户名/口令)。" +#: source/TortoiseSVN_en.xml:5533(title) +msgid "File Differences" +msgstr "文件差异" -#: source/TortoiseSVN_en.xml:3405(para) -msgid "svn.ssl.server contains SSL server certificates." -msgstr "svn.ssl.server文件里包含了SSL服务器证书。" +#: source/TortoiseSVN_en.xml:5536(term) +msgid "Local changes" +msgstr "本地更改" -#: source/TortoiseSVN_en.xml:3411(para) -msgid "svn.username contains credentials for username-only authentication (no password needed)." -msgstr "svn.username文件里包含了用户名认证的认证信息(不需要提供密码)。" +#: source/TortoiseSVN_en.xml:5538(para) +msgid "If you want to see what changes you have made in your working copy, just use the explorer context menu and select TortoiseSVNDiff." +msgstr "如果你想看到你的本地副本有哪些更加，只用在资源管理器中右键菜单下选TortoiseSVN比较差异。" -#: source/TortoiseSVN_en.xml:3423(para) -msgid "If you want to clear the authentication cache for all servers, you can do so from the General page of TortoiseSVN's settings dialog. That button will clear all cached auth data from the Subversion auth directories, as well as any auth data stored in the registry by earlier versions of TortoiseSVN. Refer to ." -msgstr "如果想要清除所有服务器的认证缓存，可以通过TortoiseSVN的设置对话框的常规设置页来实现。那个按钮能够清除Subversion的auth目录下缓存的所有认证数据，以及老版本的TortoiseSVN存储在注册表里的认证数据。请参考 。" +#: source/TortoiseSVN_en.xml:5550(term) +msgid "Difference to another branch/tag" +msgstr "与另外一个分支/标签之间的差异" -#: source/TortoiseSVN_en.xml:3431(para) -msgid "For more information on how to set up your server for authentication and access control, refer to " -msgstr "关于如何设置服务器的认证和权限的更多信息，请参考" +#: source/TortoiseSVN_en.xml:5552(para) +msgid "If you want to see what has changed on trunk (if you are working on a branch) or on a specific branch (if you are working on trunk), you can use the explorer context menu. Just hold down the Shift key while you right click on the file. Then select TortoiseSVNDiff with URL. In the following dialog, specify the URL in the repository with which you want to compare your local file to." +msgstr "如果你想查看主干程序(假如你在分支上开发)有哪些修改或者是某一分支(假如你在主干上开发)有哪些修改，你可以使用右键菜单。在你点击文件的同时按住Shift键，然后选择TortoiseSVN URL比较。在弹出的对话框中，将特别显示将与你本地版本做比较的版本的URL地址。" -#: source/TortoiseSVN_en.xml:3437(para) -msgid "If you have to authenticate against a Windows NT domain, enter your username including the domain name, like: MYDOMAIN\\johnd." -msgstr "如果使用 Windows NT 域认证，输入用户名的时候要包括域名，如: MYDOMAIN\\johnd。" +#: source/TortoiseSVN_en.xml:5565(para) +msgid "You can also use the repository browser and select two trees to diff, perhaps two tags, or a branch/tag and trunk. The context menu there allows you to compare them using Compare revisions. Read more in ." +msgstr "你还可以使用版本库浏览器，选择两个目录树比较，也许是两个标记，或者是分支/标记和最新版本。邮件菜单允许你使用比较版本来比较它们。阅读以便获得更多信息。" -#: source/TortoiseSVN_en.xml:344(para) -msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Subversion, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." -msgstr "某些版本控制系统也是软件配置管理(SCM)系统，这种系统经过精巧的设计，专门用来管理源代码树，并且具备许多与软件开发有关的特性 - 比如，对编程语言的支持，或者提供程序构建工具。不过 Subversion 并不是这样的系统；它是一个通用系统，可以管理任何类型的文件集，包括源代码。" +#: source/TortoiseSVN_en.xml:5575(term) +msgid "Difference from a previous revision" +msgstr "与历史版本的比较差异" -#: source/TortoiseSVN_en.xml:3445(title) -msgid "Maximising Windows" -msgstr "" +#: source/TortoiseSVN_en.xml:5577(para) +msgid "If you want to see the difference between a particular revision and your working copy, use the Revision Log dialog, select the revision of interest, then select Compare with working copy from the context menu." +msgstr "如果你想查看某一特定版本与本地副本之间的差异，使用显示日志对话框，选择要比较的版本，然后选择在右键菜单中选与本地副本比较差异" -#: source/TortoiseSVN_en.xml:3447(primary) -msgid "maximise" -msgstr "" +#: source/TortoiseSVN_en.xml:5587(term) +msgid "Difference between two previous revisions" +msgstr "两个历史版本的比较" -#: source/TortoiseSVN_en.xml:3449(para) -msgid "Many of TortoiseSVN's dialogs have a lot of information to display, but it is often useful to maximise only the height, or only the width, rather than maximising to fill the screen. As a convenience, there are shortcuts for this on the Maximise button. Use the middle mouse button to maximise vertically, and right mouse to maximise horizontally." -msgstr "" +#: source/TortoiseSVN_en.xml:5589(para) +msgid "If you want to see the difference between two revisions which are already committed, use the Revision Log dialog and select the two revisions you want to compare (using the usual Ctrl-modifier). Then select Compare revisions from the context menu." +msgstr "如果你要查看任意已提交的两个历史版本之间的差异，在版本日志对话框中选择你要比较的两个版本(一般使用 Ctrl-更改)，然后在右键菜单中选比较版本差异" -#: source/TortoiseSVN_en.xml:3460(title) -msgid "Importing Data Into A Repository" -msgstr "导入数据到版本库" +#: source/TortoiseSVN_en.xml:5597(para) +msgid "If you did this from the revision log for a folder, a Compare Revisions dialog appears, showing a list of changed files in that folder. Read more in ." +msgstr "如果你在文件夹的版本日志中这样做，就会出现一个比较版本对话框，显示此文件夹的文件修改列表。阅读以便获得更多信息。" -#: source/TortoiseSVN_en.xml:3462(primary) -msgid "import" -msgstr "导入" +#: source/TortoiseSVN_en.xml:5606(term) +msgid "All changes made in a commit" +msgstr "提交所有修改" -#: source/TortoiseSVN_en.xml:3469(title) -msgid "Repository Layout" -msgstr "版本库布局" +#: source/TortoiseSVN_en.xml:5608(para) +msgid "If you want to see the changes made to all files in a particular revision in one view, you can use Unified-Diff output (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all the changes together. From the Revision Log dialog select the revision of interest, then select Show Differences as Unified-Diff from the context menu." +msgstr "如果你要在一个视窗中查看某一版本的所有更改，你可以使用统一显示所有比较 (GNU 片段整理)。它将显示所有修改中的部分内容。它很难显示一个全面清晰的比较，但是会将所有更改都集中显示出来。在版本日志对话框中选择某一版本，然后在右键菜单中选择统一显示所有比较。" -#: source/TortoiseSVN_en.xml:3470(para) -msgid "Before you import your data into the repository you should first think about how you want to organize your data. If you use one of the recommended layouts you will later have it much easier." -msgstr "在将你的数据导入到版本库之前，首先你得考虑如何组织你的数据。如果你使用一种推荐的布局，你在后面的操作将会更容易许多。" +#: source/TortoiseSVN_en.xml:5622(term) +msgid "Difference between files" +msgstr "文件差异" -#: source/TortoiseSVN_en.xml:3476(para) -msgid "There are some standard, recommended ways to organize a repository. Most people create a trunk directory to hold the \"main line\" of development, a branches directory to contain branch copies, and a tags directory to contain tag copies. If a repository holds only one project, then often people create these top-level directories:" -msgstr "有一些标准的、推荐的方式来组织一个版本库。大多数人建一个trunk目录来存放开发的“主线”、一个branches目录来容纳分支副本、以及一个tags目录来容纳标签复制。如果一个版本库只存放一个项目，人们通常创建三个这样的顶层目录: " +#: source/TortoiseSVN_en.xml:5624(para) +msgid "If you want to see the differences between two different files, you can do that directly in explorer by selecting both files (using the usual Ctrl-modifier). Then from the explorer context menu select TortoiseSVNDiff." +msgstr "如果你要查看两个不同文件之间的差异，你可以直接在资源管理器中选择这两个文件(一般使用 Ctrl-modifier)，然后右键菜单中选TortoiseSVN比较差异。" -#: source/TortoiseSVN_en.xml:3485(screen) -#, no-wrap -msgid "" -"\n" -"/trunk\n" -"/branches\n" -"/tags\n" -msgstr "" -"\n" -"/trunk\n" -"/branches\n" -"/tags\n" +#: source/TortoiseSVN_en.xml:5637(term) +msgid "Difference between WC file/folder and a URL" +msgstr "WC文件/文件夹与URL之间的比较差异" -#: source/TortoiseSVN_en.xml:3490(para) -msgid "If a repository contains multiple projects, people often index their layout by branch:" -msgstr "如果一个版本库包含多个项目，人们通常按分支来安排布局: " +#: source/TortoiseSVN_en.xml:5639(para) +msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseSVNDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patchfile - a list of changed files which you can view one at a time." +msgstr "如果你要查看你本地副本中的任一文件与版本库中任一文件之间差异，" -#: source/TortoiseSVN_en.xml:3494(screen) -#, no-wrap -msgid "" -"\n" -"/trunk/paint\n" -"/trunk/calc\n" -"/branches/paint\n" -"/branches/calc\n" -"/tags/paint\n" -"/tags/calc\n" -msgstr "" -"\n" -"/trunk/paint\n" -"/trunk/calc\n" -"/branches/paint\n" -"/branches/calc\n" -"/tags/paint\n" -"/tags/calc\n" +#: source/TortoiseSVN_en.xml:5657(term) +msgid "Difference with blame information" +msgstr "谴责信息之间的比较差异" -#: source/TortoiseSVN_en.xml:35(para) -msgid "Do you work in a team?" -msgstr "你是否在一个团队中工作？" +#: source/TortoiseSVN_en.xml:5659(para) +msgid "If you want to see not only the differences but also the author, revision and date that changes were made, you can combine the diff and blame reports from within the revision log dialog. Read for more detail." +msgstr "如果你要查看的不仅是比较差异而且包括修改该版本的作者，版本号和日期，你可以在版本日志对话框中综合比较差异和谴责信息。这里有更多详细介绍。" -#: source/TortoiseSVN_en.xml:3502(para) -msgid "...or by project:" -msgstr "……或者按项目: " +#: source/TortoiseSVN_en.xml:5668(term) +msgid "Difference between folders" +msgstr "比较文件夹差异" -#: source/TortoiseSVN_en.xml:3505(screen) -#, no-wrap -msgid "" -"\n" -"/paint/trunk\n" -"/paint/branches\n" -"/paint/tags\n" -"/calc/trunk\n" -"/calc/branches\n" -"/calc/tags\n" -msgstr "" -"\n" -"/paint/trunk\n" -"/paint/branches\n" -"/paint/tags\n" -"/calc/trunk\n" -"/calc/branches\n" -"/calc/tags\n" +#: source/TortoiseSVN_en.xml:5670(para) +msgid "The builtin tools supplied with TortoiseSVN do not support viewing differences between directory hierarchies. But if you have an external tool which does support that feature, you can use that instead. In we tell you about some tools which we have used." +msgstr "TortoiseSVN 自带的内置工具不支持查看多级目录之间的差异，但你可以使用支持该功能的外置工具来替代。在这里 我们可以介绍一些我们使用过的工具。" -#: source/TortoiseSVN_en.xml:3513(para) -msgid "Indexing by project makes sense if the projects are not closely related and each one is checked out individually. For related projects where you may want to check out all projects in one go, or where the projects are all tied together in a single distribution package, it is often better to index by branch. This way you have only one trunk to checkout, and the relationships between the sub-projects is more easily visible." -msgstr "如果项目不是密切相关，而且每一个是单独被检出，那么按项目布局是合理的。对于那些你想一次检出所有项目，或需要将它们打成一个分发包的相关项目，按分支来布局通常比较好。这种方式你只要检出一个分支，而且子项目之间的关系也比较清楚。" +#: source/TortoiseSVN_en.xml:5682(title) +msgid "Comparing Folders" +msgstr "比较文件夹" -#: source/TortoiseSVN_en.xml:3521(para) -msgid "If you adopt a top level /trunk /tags /branches approach, there is nothing to say that you have to copy the entire trunk for every branch and tag, and in some ways this structure offers the most flexibility." -msgstr "如果你采用顶层/trunk /tags /branches这种方式，并不意味着你必须复制整个主线为分支或标签，而且某些情况下这种结构更具灵活性。" +#: source/TortoiseSVN_en.xml:5684(primary) +msgid "compare revisions" +msgstr "比较两个修订版本" -#: source/TortoiseSVN_en.xml:3527(para) -msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Subversion and TortoiseSVN projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." -msgstr "对于不相关的项目，你可能更愿意使用不同的版本库。当你提交时，改变的是整个版本库的修订号，而不是项目的。让两个不相关的项目共用一个版本库，会导致修订号出现较大的跳跃。Subversion和TortoiseSVN项目看起来是在同一个主机地址，但是它们是在完全独立的版本库中开发着，并且版本号也不相干。" +#: source/TortoiseSVN_en.xml:5687(primary) +msgid "export changes" +msgstr "导出修改" -#: source/TortoiseSVN_en.xml:3537(para) -msgid "Of course, you're free to ignore these common layouts. You can create any sort of variation, whatever works best for you or your team. Remember that whatever you choose, it's not a permanent commitment. You can reorganize your repository at any time. Because branches and tags are ordinary directories, TortoiseSVN can move or rename them however you wish." -msgstr "当然，你完全可以不理会上面提及的通用布局。你可以自由改变，来满足你和你团队的需要。请记住，不管你选择哪种布局，它都不是永久的。你可以在随时重新组织你的版本库。因为分支和标签是普通的目录，只要你愿意，TortoiseSVN可以将它们移动或重命名。" +#: source/TortoiseSVN_en.xml:5691(title) +msgid "The Compare Revisions Dialog" +msgstr "修订版本版本比较对话框" -#: source/TortoiseSVN_en.xml:3545(para) -msgid "Switching from one layout to another is just a matter of issuing a series of server-side moves; If you don't like the way things are organized in the repository, just juggle the directories around." -msgstr "从一种布局转换到另一种布局仅仅是在服务器端移动一些文件或目录；如果你不喜欢版本库的组织形式，仅管大胆地修改那些目录。" +#: source/TortoiseSVN_en.xml:5689(para) +msgid " When you select two trees within the repository browser, or when you select two revisions of a folder in the log dialog, you can Context menuCompare revisions." +msgstr " 当你在版本库浏览器中选择了两个树，或者在日志对话框中选择了一个文件夹的两个版本，就可以使用上下文菜单比较版本。" -#: source/TortoiseSVN_en.xml:3551(para) -msgid "So if you haven't already created a basic folder structure inside your repository you should do that now: " -msgstr "所以，如果你还没创建一个基本的文件夹结构到你的版本库中，你现在可以这样做: " +#: source/TortoiseSVN_en.xml:5701(para) +msgid "This dialog shows a list of all files which have changed and allows you to compare or blame them individually using context menu." +msgstr "这个对话框显示一个所有已经修改的文件列表，允许你使用邮件菜单单独的比较或回溯它们。" -#: source/TortoiseSVN_en.xml:3556(para) -msgid "create a new empty folder on your hard drive" -msgstr "在你的硬盘上创建一个空的文件夹" +#: source/TortoiseSVN_en.xml:5705(para) +msgid "You can also export the list of changed files to a text file, or you can export the changed files themselves to a folder. This operation works on the selected files only, so you need to select the files of interest - usually that means all of them." +msgstr "你也可以将已经修改的文件列表导出到一个文本文件中，或者将修改的文件导出到一个目录。这个操作只在选择的文件上工作，所以你需要选择感兴趣的文件 - 通常是所有文件。" -#: source/TortoiseSVN_en.xml:3561(para) -msgid "create your desired top-level folder structure inside that folder - don't put any files in it yet!" -msgstr "在那个文件夹下创建你想要的顶级目录－－千万不要放任何文件进去！" +#: source/TortoiseSVN_en.xml:5711(para) +msgid "If you want to export the list of files and the actions (modified, added, deleted) as well, you can do that using the keyboard shortcuts Ctrl-A to select all entries and Ctrl-C to copy the detailed list to the clipboard." +msgstr "如果你需要导出文件列表和和动作(修改，增加，删除)，你可以使用快捷键Ctrl-A选择所有项，用Ctrl-C将详细列表复制到剪贴板。" -#: source/TortoiseSVN_en.xml:3567(para) -msgid "import this structure into the repository via a right click on the folder and selecting TortoiseSVNImport... This will import your temp folder into the repository root to create the basic repository layout." -msgstr "通过在那个文件夹右键，选择TortoiseSVN导入... 将这个结构导入到版本库中。这将导入临时文件夹到版本库的根目录形成一个基本的版本库布局。" +#: source/TortoiseSVN_en.xml:5717(para) +msgid "The button at the top allows you to change the direction of comparison. You can show the changes need to get from A to B, or if you prefer, from B to A." +msgstr "顶部的按钮允许你改变比较的方向。你可以显示从A到B的修改，或者如果你喜欢，显示从B到A的修改。" -#: source/TortoiseSVN_en.xml:3582(para) -msgid "" -"Note that the name of the folder you are importing does not appear in the repository, only its contents. For example, create the following folder structure: \n" -"C:\\Temp\\New\\trunk\n" -"C:\\Temp\\New\\branches\n" -"C:\\Temp\\New\\tags\n" -" Import C:\\Temp\\New into the repository root, which will then look like this: \n" -"/trunk\n" -"/branches\n" -"/tags\n" -"" -msgstr "" -"注意，你所导入的那个文件夹的名字并不存在于版本库中，仅仅是它所包含的内容。比如，创建如下结构的文件夹\n" -"C:\\Temp\\New\\trunk\n" -"C:\\Temp\\New\\branches\n" -"C:\\Temp\\New\\tags\n" -"导入C:\\Temp\\New到版本库的根目录，版本库中将会是这样: \n" -"/trunk\n" -"/branches\n" -"/tags\n" -"" +#: source/TortoiseSVN_en.xml:5722(para) +msgid "The buttons with the revision numbers on can be used to change to a different revision range. When you change the range, the list of items which differ between the two revisions will be updated automatically." +msgstr "有版本数字的按钮可以用来改变版本范围。当你改变范围时，两个版本不同的项目列表会自动更新。" -#: source/TortoiseSVN_en.xml:3599(para) -msgid "You can also use the repository browser to create new folders directly in the repository." -msgstr "你还可以使用版本库浏览器直接在版本库中创建文件夹。" +#: source/TortoiseSVN_en.xml:5729(title) +msgid "Diffing Images Using TortoiseIDiff" +msgstr "使用 TortoiseIDiff 进行比较的图像" -#: source/TortoiseSVN_en.xml:360(title) -msgid "TortoiseSVN's History" -msgstr "TortoiseSVN 的历史" +#: source/TortoiseSVN_en.xml:5731(primary) +msgid "image diff" +msgstr "图像比较" -#: source/TortoiseSVN_en.xml:3607(primary) -msgid "temporary files" -msgstr "临时文件" +#: source/TortoiseSVN_en.xml:5734(primary) +msgid "TortoiseIDiff" +msgstr "TortoiseIDiff" -#: source/TortoiseSVN_en.xml:3609(para) -msgid "Before you import your project into a repository you should: " -msgstr "在将你的项目导入到版本库之前，你应该: " +#: source/TortoiseSVN_en.xml:5736(para) +msgid "There are many tools available for diffing text files, including our own TortoiseMerge, but we often find ourselves wanting to see how an image file has changed too. That's why we created TortoiseIDiff." +msgstr "我们有许多有用的比较文本文件的工具，包括我们自带的TortoiseMerge，但是我们也需要查看图像文件的更改。这就是我们设计TortoiseIDiff的原因。" -#: source/TortoiseSVN_en.xml:361(para) -msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." -msgstr "在2002年，Tim Kemp 发现 Subversion 是一个很好的版本控制系统，但是没有好的图形化客户端，创建一个作为 Windows 外壳集成的 Subversion 客户端的创意来自 TortoiseCVS，一个非常类似的 CVS 客户端。" +#: source/TortoiseSVN_en.xml:5743(title) +msgid "The image difference viewer" +msgstr "差异察看器截图" -#: source/TortoiseSVN_en.xml:3613(para) -msgid "Remove all files which are not needed to build the project (temporary files, files which are generated by a compiler e.g. *.obj, compiled binaries, ...)" -msgstr "删除所有构建工程不需要的文件(临时文件，编译器产生的文件，例如 *.obj，生成的二进制文件，...)" +#: source/TortoiseSVN_en.xml:5741(para) +#, fuzzy +msgid "TortoiseSVNDiff for any of the common image file formats will start TortoiseIDiff to show image differences. By default the images are displayed side-by-side but you can use the View menu or toolbar to switch to a top-bottom view instead, or if you prefer, you can overlay the images and pretend you are using a lightbox." +msgstr "TortoiseSVN比较差异TortoiseIDiff可以显示同种格式的图像差异。一般情况下是左右对称地显示两个图像，但你也可以通过调整视图滑动条转变为上下显示的模式，如果你愿意，这里支持使用透明框进行图像覆盖的方式，在顶端的滑动条可以调整图像之间的吻合程度(alpha blend)，你也可以使用Ctrl-Shift-Wheel来调整这种程度。" -#: source/TortoiseSVN_en.xml:3621(para) -msgid "Organize the files in folders and subfolders. Although it is possible to rename/move files later it is highly recommended to get your project's structure straight before importing!" -msgstr "组织目录和子目录内的文件。尽管以后可能会改名/删除文件，我们还是建议你在导入之前使你的项目结构组织良好！" +#: source/TortoiseSVN_en.xml:5756(para) +msgid "Naturally you can also zoom in and out and pan around the image. You can also pan the image simply by left-dragging it. If you select the Link images together option, then the pan controls (scrollbars, wheelmouse) on both images are linked." +msgstr "当然你也可以放大和缩小，或者拉伸图像。你也可以简单的通过左拖组合图像。如果你选择连接图像，则被选择(滑动条，鼠标)的两个图像就被关联起来。" -#: source/TortoiseSVN_en.xml:3630(para) -msgid "Now select the top-level folder of your project directory structure in the windows explorer and right click to open the context menu. Select the command TortoiseSVNImport... which brings up a dialog box: " -msgstr "现在进入资源管理器，选择你的项目的顶层目录，右击打开上下文菜单。选择命令TortoiseSVN导入 ...，它会弹出一个对话框: " +#: source/TortoiseSVN_en.xml:5762(para) +msgid "In image info box shows details about the image file, such as the size in pixels, resolution and colour depth. If this box gets in the way, use ViewImage Info to hide it." +msgstr "在图像信息框中显示了图像的基本信息，比如像素的大小，颜色的深度。如果觉得这个框碍眼可以选择视图图像信息来隐藏它" -#: source/TortoiseSVN_en.xml:3641(title) -msgid "The Import dialog" -msgstr "导入对话框" +#: source/TortoiseSVN_en.xml:5772(para) +msgid "When the images are overlaid, the relative intensity of the images (alpha blend) is controlled by a slider control at the left side. You can click anywhere in the slider to set the blend directly, or you can drag the slider to change the blend interactively. Ctrl-Shift-Wheel to change the blend." +msgstr "" -#: source/TortoiseSVN_en.xml:3645(para) -msgid "In this dialog you have to enter the URL of the repository into which you want to import your project." -msgstr "在这个对话框中，输入你的项目导入到版本库的URL。" +#: source/TortoiseSVN_en.xml:5779(para) +msgid "The button above the slider toggles between two preset blends, indicated by the markers on either side of the blend slider. By default one is at the top and the other at the bottom, so the toggle button just switches between one image and the other. You can move the markers to choose the two blend values that the toggle button will use." +msgstr "" -#: source/TortoiseSVN_en.xml:3649(para) -msgid "The import message is used as a log message." -msgstr "这个输入信息将用作提交日志。" +#: source/TortoiseSVN_en.xml:5788(title) +msgid "External Diff/Merge Tools" +msgstr "其他的比较/合并工具" -#: source/TortoiseSVN_en.xml:3652(para) -msgid "By default, files and folders which match the global-ignore patterns are not imported. To override this behaviour you can use the Include ignored files checkbox. Refer to for more information on setting a global ignore pattern." -msgstr "默认情况下，匹配全局忽略模式的文件和文件夹不会被导入。你可以使用包含忽略文件检验栏来禁止此行为。参考以获得关于全局忽略模式的更多信息。" +#: source/TortoiseSVN_en.xml:5790(primary) +msgid "diff tools" +msgstr "差异比较工具" -#: source/TortoiseSVN_en.xml:3659(para) -msgid "As soon as you press OK TortoiseSVN imports the complete directory tree including all files into the repository. As before, the name of the folder you import does not appear in the repository, only the folder contents. The project is now stored in the repository under version control. Please note that the folder you imported is NOT under version control! To get a version-controlled working copy you need to do a Checkout of the version you just imported. Or read on to find out how to import a folder in place." -msgstr "当你点击确认时，TortoiseSVN 会导入包含所有文件的完整目录树到版本库。如前所述，你导入的文件夹名称不会在版本库中出现，只有这个文件夹的内容会在版本库中出现。现在这个工程就存贮在版本库，被版本控制。请注意，你导入的文件夹没有被版本控制！你需要检出刚才导入的版本，以便获得受版本控制的工作目录。或者继续阅读，找到如何导入文件夹到合适的位置。" +#: source/TortoiseSVN_en.xml:5793(primary) +msgid "merge tools" +msgstr "合并工具" -#: source/TortoiseSVN_en.xml:367(para) -msgid "Tim studied the sourcecode of TortoiseCVS and used it as a base for TortoiseSVN. He then started the project, registered the domain tortoisesvn.org and put the sourcecode online. During that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseSVN. Since TortoiseSVN was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." -msgstr "Tim 学习了 TortoiseCVS 的源代码，将其作为 TortoiseSVN 的基础，然后开始这个项目，注册了域名 tortoisesvn.org，并将源代码提交到网上。此时 Stefan Küng 正在寻找一个好的免费版本控制系统，他发现了 Subversion 和 TortoiseSVN，TortoiseSVN 依然还不能够使用，他加入了这个项目并开始编程。很快他便编写了大多数现在的代码，并开始添加命令和特性，此时，最初的代码都已经不复存在了。" +#: source/TortoiseSVN_en.xml:5795(para) +msgid "If the tools we provide don't do what you need, try one of the many open-source or commercial programs available. Everyone has their own favourites, and this list is by no means complete, but here are a few that you might consider:" +msgstr "如果我们提供的这些工具不是你所需要的，可以尝试使用一些其他开源的或者商业的软件。每个人都有不同喜好，下面列表虽不完全，或许有些你也会认可的: " -#: source/TortoiseSVN_en.xml:3673(title) -msgid "Import in Place" -msgstr "导入适当的位置" +#: source/TortoiseSVN_en.xml:5803(term) +msgid "WinMerge" +msgstr "WinMerge" -#: source/TortoiseSVN_en.xml:3675(primary) -msgid "import in place" -msgstr "导入适当的位置" +#: source/TortoiseSVN_en.xml:5805(para) +msgid "WinMerge is a great open-source diff tool which can also handle directories." +msgstr "WinMergeWinMerge也是一款很好的能处理目录的开源软件。" -#: source/TortoiseSVN_en.xml:3677(para) -msgid "The Subversion import command has limited functionality - you cannot easily pick items for import. Also, the folder you are importing does not become a Subversion working copy - you have to do a separate checkout. But don't worry, there is another way of working which overcomes both these shortcomings :-)" -msgstr "Subversion 导入命令功能有限 - 你不能容易的选择导入的项目。而且，你导入的文件夹不会成为 Subversion 工作副本 - 你不得不单独做检出。但是不要担心，有其它方法克服这些缺陷 :-)" +#: source/TortoiseSVN_en.xml:5815(term) +msgid "Perforce Merge" +msgstr "Perforce Merge" -#: source/TortoiseSVN_en.xml:3684(para) -msgid "Assuming you already have a repository, and you want to add a new folder structure to it, just follow these steps: " -msgstr "假定你已经有个版本库，你想给它增加一个新目录结构，只需以下步骤: " +#: source/TortoiseSVN_en.xml:5817(para) +msgid "Perforce is a commercial RCS, but you can download the diff/merge tool for free. Get more information from Perforce." +msgstr "Perforce 是一款商业 RCS，但是你也可以免费下载到。可以从Perforce获得更多信息。" -#: source/TortoiseSVN_en.xml:3689(para) -msgid "Use the repository browser to create a new project folder directly in the repository." -msgstr "使用版本库浏览器直接在版本库中创建项目文件夹。" +#: source/TortoiseSVN_en.xml:5827(term) +msgid "KDiff3" +msgstr "KDiff3" -#: source/TortoiseSVN_en.xml:3695(para) -msgid "Checkout the new folder over the top of the folder you want to import. You will get a warning that the local folder is not empty. Now you have a versioned top level folder with unversioned content." -msgstr "在你要导入的文件夹检出新目录。你会得到一个本地目录为空的警告。现在你有一个版本控制的顶级目录，含有未版本控制的内容。" +#: source/TortoiseSVN_en.xml:5829(para) +msgid "KDiff3 is a free diff tool which can also handle directories. You can download it from here." +msgstr "KDiff3也是一款能处理目录的免费比较工具。你可以从here下载。" -#: source/TortoiseSVN_en.xml:3702(para) -msgid "Use TortoiseSVNAdd... on this versioned folder to add some or all of the content. You can add and remove files, set svn:ignore properties on folders and make any other changes you need to." -msgstr "在此受版本控制的文件夹上使用TortoiseSVN增加...增加部分或全部内容。你可以增加或删除文件，在文件夹上设置svn:ignore属性，或者你需要的其它修改。" +#: source/TortoiseSVN_en.xml:5839(term) +msgid "ExamDiff" +msgstr "ExamDiff" -#: source/TortoiseSVN_en.xml:3714(para) -msgid "Commit the top level folder, and you have a new versioned tree, and a local working copy, created from your existing folder." -msgstr "提交顶级目录，你有一个新的版本树，一份从你已有目录创建的本地工作副本。" +#: source/TortoiseSVN_en.xml:5841(para) +msgid "ExamDiff Standard is freeware. It can handle files but not directories. ExamDiff Pro is shareware and adds a number of goodies including directory diff and editing capability. In both flavours, version 3.2 and above can handle unicode. You can download them from PrestoSoft." +msgstr "ExamDiff Standard是免费软件。它能处理文件但不能处理目录。ExamDiff Pro是共享软件，拥有一系列的功能包括目录比较和编辑的能力。对于以上体验，3.2及以上版本能处理二进制。你可以从PrestoSoft下载它们。" -#: source/TortoiseSVN_en.xml:3723(title) -msgid "Special Files" -msgstr "专用文件" +#: source/TortoiseSVN_en.xml:5856(term) +msgid "Beyond Compare" +msgstr "Beyond Compare" -#: source/TortoiseSVN_en.xml:3725(primary) -msgid "special files" -msgstr "专用文件" +#: source/TortoiseSVN_en.xml:5858(para) +msgid "Similar to ExamDiff Pro, this is an excellent shareware diff tool which can handle directory diffs and unicode. Download it from Scooter Software." +msgstr "和ExamDiff Pro一样，这也是一款很不错的共享软件，同样也能进行目录比较和二进制处理。下载地址Scooter Software。" -#: source/TortoiseSVN_en.xml:3727(para) -msgid "Sometimes you need to have a file under version control which contains user specific data. That means you have a file which every developer/user needs to modify to suit his/her local setup. But versioning such a file is difficult because every user would commit his/her changes every time to the repository." -msgstr "有时候你需要版本控制一个包含用户专用的数据。它意味着你有一个文件，每个开发者/用户都需要修改，一边满足他/她的本地配置。但是版本控制这样的文件是困难的，因为每个用户可能都要提交他/她的修改。" +#: source/TortoiseSVN_en.xml:5869(term) +msgid "Araxis Merge" +msgstr "Araxis Merge" -#: source/TortoiseSVN_en.xml:3734(para) -msgid "In such cases we suggest to use template files. You create a file which contains all the data your developers will need, add that file to version control and let the developers check this file out. Then, each developer has to make a copy of that file and rename that copy. After that, modifying the copy is not a problem anymore." -msgstr "在这种情况下，我们建议使用模版文件。创建你个包含所有开发者需要的数据的文件，增加到版本库中，让开发者检出。然后，每个开发者创建一个副本，改名此文件。于是，修改这个文件不再是问题。 " +#: source/TortoiseSVN_en.xml:5871(para) +msgid "Araxis Merge is a useful commercial tool for diff and merging both files and folders. It does three-way comparision in merges and has synchronization links to use if you've changed the order of functions. Download it from Araxis." +msgstr "Araxis Merge是一款能对文件和文件夹进行比较和合并的商业软件。它从三条比较路径进行合并，而且在你修改的同时进行及时有效的链接。可以从这里下载Araxis。" -#: source/TortoiseSVN_en.xml:3742(para) -msgid "As an example, you can have a look at TortoiseSVN's build script. It calls a file named TortoiseVars.bat which doesn't exist in the repository. Only the file TortoiseVars.tmpl. TortoiseVars.tmpl is the template file which every developer has to create a copy from and rename that file to TortoiseVars.bat. Inside that file, we added comments so that the users will see which lines they have to edit and change according to their local setup to get it working." -msgstr "作为例子，你可以看看TortoiseSVN的构建脚本。它调用一个TortoiseVars.bat文件，它并不在版本库中。 只有TortoiseVars.tmpl在版本库中。TortoiseVars.tmpl是一个模版文件，每个开发者都需要创建一个副本，改名为TortoiseVars.bat。在这个文件中，我们增加了注释，所以用户知道他们需要编辑那些行，以便适应他们的本地配置，使其能工作。" +#: source/TortoiseSVN_en.xml:5883(term) +msgid "SciTE" +msgstr "SciTE" -#: source/TortoiseSVN_en.xml:3753(para) -msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." -msgstr "于是为了不干扰用户，我们也将TortoiseVars.bat增加到它的父目录的忽略列表，也就是，我们设置了Subversion属性svn:ignore包含这个文件名称。这样，每次提交时它都不会作为没有版本控制的文件出现。" +#: source/TortoiseSVN_en.xml:5885(para) +msgid "This text editor includes syntax colouring for unified diffs, making them much easier to read. Download it from Scintilla." +msgstr "这款文本编译器在统一比较时提供语法显示，读起来更加容易。可以从这里下载Scintilla。" -#: source/TortoiseSVN_en.xml:3762(title) -msgid "Referenced Projects" -msgstr "引用的工程" +#: source/TortoiseSVN_en.xml:5895(term) +msgid "Notepad2" +msgstr "Notepad2" -#: source/TortoiseSVN_en.xml:3764(primary) -msgid "external repositories" -msgstr "外部版本库" +#: source/TortoiseSVN_en.xml:5897(para) +msgid "Notepad2 is designed as a replacement for the standard Windows Notepad program, and is based on the Scintilla open-source edit control. As well as being good for viewing unified diffs, it is much better than the Windows notepad for most jobs. Download it for free here." +msgstr "Notepad2的设计旨在替代 Windows自带的记事本的功能，它以开源编译控制为基础。在查看统一比较时，它能实现比Windows自带的记事本更多功能。免费下载here。" -#: source/TortoiseSVN_en.xml:3767(primary) -msgid "externals" -msgstr "外部" +#: source/TortoiseSVN_en.xml:5910(para) +msgid "Read for information on how to set up TortoiseSVN to use these tools." +msgstr "这里可以了解到怎样起用TortoiseSVN来使用这些工具。" -#: source/TortoiseSVN_en.xml:3769(para) -msgid "Sometimes it is useful to construct a working copy that is made out of a number of different checkouts. For example, you may want different subdirectories to come from different locations in a repository, or perhaps from different repositories altogether. If you want every user to have the same layout, you can define the svn:externals properties." -msgstr "有时候，构建一个需要不同检出的工作目录是很有用的。举例来说，你需要不同的子目录来自版本库的不同位置。，或者可能完全来自不同的版本库。如果你需要每个用户具有相同的目录结构，你可以定义svn:externals属性。" +#: source/TortoiseSVN_en.xml:5917(title) +msgid "Adding New Files And Directories" +msgstr "添加新文件和目录" -#: source/TortoiseSVN_en.xml:3777(para) -msgid "" -"Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Subversion tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository url in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work properly. For example you must replace each space with %20. Note that it is not possible to use foldernames with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" -"sounds http://sounds.red-bean.com/repos\n" -"quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" -"skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" Now click Set and commit your changes. When you (or any other user) update your working copy, Subversion will create a subfolder D:\\dev\\project1\\sounds and checkout the sounds project, another subfolder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested subfolder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." -msgstr "" -"比如说，你检出了/project1到 D:\\dev\\project1。选择目录D:\\dev\\project1，右击，选择Windows 菜单属性。出现属性对话框。在Subversion页，你可以设置属性。点击增加...。从组合框选择svn:externals属性，在编辑框按照名称 URL格式输入版本库URL，或者你需要一个指定的版本，那么使用名称 -r版本 URL。你可以增加多个外部工程，每行一个。注意，URL必须使用逃逸字符编码，不然可能无法正常工作。举例说明，你必须将每个空格替换为%20。注意使用包含空格的目录名称是不可能的。假设你为D:\\dev\\project1设置了这些属性: \n" -"sounds http://sounds.red-bean.com/repos\n" -"quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" -"skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" -" 现在点击 设置，提交你的修改。当你(或其他用户)更新工作副本时， Subversion 将会创建子目录D:\\dev\\project1\\sounds，并且检出sounds工程，另一个子目录D:\\dev\\project1\\quick_graphs包含graphics工程，最后一个嵌套的子目录D:\\dev\\project1\\skins\\toolkit包含的skin-maker工程的版本21。" +#: source/TortoiseSVN_en.xml:5919(primary) +msgid "add" +msgstr "增加" -#: source/TortoiseSVN_en.xml:378(para) -msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseSVN as their Subversion client. The userbase grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseSVN. And he takes care of the website and manages the translation." -msgstr "随着 Subversion 越来越稳定，吸引了越来越多的用户开始使用 TortoiseSVN 作为他们的 Subversion 客户端，用户基础增长迅速(每天都持续增长)。Lübbe Onken 提供了许多漂亮图标和 TortoiseSVN 的 logo，细心照料网站并且管理翻译。" +#: source/TortoiseSVN_en.xml:5924(title) source/TortoiseSVN_en.xml:6000(title) +msgid "Explorer context menu for unversioned files" +msgstr "未受版本控制的文件之资源管理器上下文菜单" -#: source/TortoiseSVN_en.xml:3827(para) -msgid "Note that if you change the URL in an svn:externals property, then next time you update your working copy Subversion will delete the old external folder and make a fresh checkout, so you will see files being Added, rather than being Updated as you might have expected. This situation might occur if you reference a tag from another project. When a new version of that project is released, you change your external reference to point to the new tag." -msgstr "注意如果你修改了svn:externals属性中的URL，下次更新工作目录时，Subversion将会删除老的外部目录，重新检出副本，于是你将看到文件被增加而不是你期望的被更新。当你引用一个其它项目的标记时，这种情况就可能发生。即当那个项目发布新版本时，你将外部引用改为新的标记。" +#: source/TortoiseSVN_en.xml:5922(para) +msgid " If you created new files and/or directories during your development process then you need to add them to source control too. Select the file(s) and/or directory and use TortoiseSVNAdd." +msgstr "如果在你的开发过程中你创建了新的文件或目录，那么你需要把他们加入你的版本控制中。选择那个文件或目录并使用TortoiseSVN添加(Add)." -#: source/TortoiseSVN_en.xml:3838(para) -msgid "You should strongly consider using explicit revision numbers in all of your externals definitions. Doing so means that you get to decide when to pull down a different snapshot of external information, and exactly which snapshot to pull. Besides the common sense aspect of not being surprised by changes to third-party repositories that you might not have any control over, using explicit revision numbers also means that as you backdate your working copy to a previous revision, your externals definitions will also revert to the way they looked in that previous revision, which in turn means that the external working copies will be updated to match they way they looked back when your repository was at that previous revision. For software projects, this could be the difference between a successful and a failed build of an older snapshot of your complex codebase." -msgstr "你应当认真考虑在所有外部定义中使用确定的版本号。这样做意味着你决定下载一个快照，并且精确的指明了是哪个快照。与使用通常的分支相比，你不会为第三方版本库的修改感到惊讶，这些版本库你可能没有任何控制，使用精确的版本号能使你回溯工作目录到以前的版本，你的外部定义也遵循此规则，看起来是以前的版本，即外部工作副本的更新匹配他们的老版本。对于软件工程，它是你的复杂代码构建成功或失败的重要区别。" +#: source/TortoiseSVN_en.xml:5936(para) +msgid "After you added the files/directories to source control the file appears with a added icon overlay which means you first have to commit your working copy to make those files/directories available to other developers. Adding a file/directory does not affect the repository!" +msgstr "当你添加了指定的文件/目录到版本控制系统之后，这个文件上会出现一个added标志，这意味着你得先提交你的工作副本使该文件/目录对其他开发者来说成为有效的。添加一个文件/目录不会not影响版本库" -#: source/TortoiseSVN_en.xml:3856(para) -msgid "URLs in svn:externals definitions are absolute. You cannot use relative URLs. If you relocate your working copy, or if the external repository is relocated, these URLs will not be updated automatically. Also, if you branch a project which has external references within the same repository, the URLs in the branched copy will be unchanged; you may then want to change trunk references to branch references instead." -msgstr "外部定义svn:externals中的URL是绝对路径。如果你重新定位工作副本，或者外部版本库重新定位了，这些URL不会自动更新。而且，如果你分支了一个工程，它的外部定义位于同一版本库中，分支中的这些URL也不会更新；你可能需要用对分支的引用替换对最新版本的引用。" +#: source/TortoiseSVN_en.xml:5945(title) +msgid "Many Adds" +msgstr "更多" -#: source/TortoiseSVN_en.xml:3865(para) -msgid "If you need more information how TortoiseSVN handles Properties read ." -msgstr "如果你需要TortoiseSVN如何处理属性的更多信息，请阅读。" +#: source/TortoiseSVN_en.xml:5946(para) +msgid "You can also use the Add command on already versioned folders. In that case, the add dialog will show you all unversioned files inside that versioned folder. This helps if you have many new files and need them to add at once." +msgstr "你也可以在已经版本控制的目录上使用Add命令。那样的话，添加对话框会显示该版本控制目录下所有未版本控制的文件。如果你有许多新文件需要一起添加的话，这是很有帮助的。" -#: source/TortoiseSVN_en.xml:3869(para) -msgid "To find out about different methods of accessing common sub-projects read ." -msgstr "如果你需要知道存取公共子个我我你工程的不同方法，请阅读." +#: source/TortoiseSVN_en.xml:5959(para) +msgid "select the files you want to add" +msgstr "选择你要添加的文件" + +#: source/TortoiseSVN_en.xml:5964(para) source/TortoiseSVN_en.xml:6240(para) +msgid "right-drag them to the new location inside the working copy" +msgstr "拖拽(right-drag)他们到新的工作副本下，" + +#: source/TortoiseSVN_en.xml:5970(para) source/TortoiseSVN_en.xml:6246(para) +msgid "release the right mouse button" +msgstr "松开鼠标右键" + +#: source/TortoiseSVN_en.xml:5975(para) +msgid "select Context MenuSVN Add files to this WC. The files will then be copied to the working copy and added to version control." +msgstr "选择上下文菜单SVN 增加文件到工作副本。这些文件会被复制到工作副本，加入版本控制。" -#: source/TortoiseSVN_en.xml:3876(title) -msgid "Checking Out A Working Copy" -msgstr "检出工作副本" +#: source/TortoiseSVN_en.xml:5954(para) +msgid "To add files from outside your working copy you can use the drag-and-drop handler: " +msgstr "你可以使用鼠标拖拽的方式从你的工作副本外部添加进文件。" -#: source/TortoiseSVN_en.xml:3878(primary) -msgid "checkout" -msgstr "检出" +#: source/TortoiseSVN_en.xml:5987(para) +msgid "You can also add files within a working copy simply by left-dragging and dropping them onto the commit dialog." +msgstr "你可以在工作副本中通过左拖，将文件放到提交对话框中，来增加文件。" -#: source/TortoiseSVN_en.xml:3881(para) -msgid "To obtain a working copy you need to do a checkout from a repository." -msgstr "为了得到一个工作副本，需要进行从版本库检出的操作。" +#: source/TortoiseSVN_en.xml:5993(title) +msgid "Ignoring Files And Directories" +msgstr "忽略文件和目录" -#: source/TortoiseSVN_en.xml:3885(para) -msgid "Select a directory in windows explorer where you want to place your working copy. Right click to pop up the context menu and select the command TortoiseSVNCheckout..., which brings up the following dialog box: If you enter a folder name that does not yet exist, then a directory with that name is created." -msgstr "在Windows资源管理器里选择一个存放工作副本的目录。右键点击弹出右键菜单，选择TortoiseSVN检出…命令。然后就会看到下面的对话框: 如果输入一个并不存在的目录名，那么这个名字的目录就会被创建出来。" +#: source/TortoiseSVN_en.xml:5995(primary) +msgid "ignore" +msgstr "忽略" -#: source/TortoiseSVN_en.xml:3895(title) -msgid "The Checkout dialog" -msgstr "检出对话框" +#: source/TortoiseSVN_en.xml:5998(para) +msgid " In most projects you will have files and folders that should not be subject to version control. These might include files created by the compiler, *.obj, *.lst, maybe an output folder used to store the executable. Whenever you commit changes, TSVN shows your unversioned files, which fills up the file list in the commit dialog. Of course you can turn off this display, but then you might forget to add a new source file." +msgstr "在多数项目中你总会有文件和目录不需要进行版本控制。这可能包括一些由编译器生成的文件，*.obj,*.lst。或许是一个外部的用于存放可执行程序的目录。只要你提交变更，TSVN就会在提交对话框的文件列表中列表显示出你的未版本控制文件。当然你可以关闭这个显示，不过你可能会忘记添加新的版本文件。" -#: source/TortoiseSVN_en.xml:3902(para) -msgid "You should only check out into an empty directory. If you want to check out your source tree into the same directory that you imported from, Subversion will throw an error message because it will not overwrite the existing unversioned files with versioned ones. You will have to check out into a different directory or delete the existing sourcetree first." -msgstr "你应该只检出到一个空的目录。如果你要将你的源代码树检出到与你导入它们时相同的目录，Subversion会给出一个错误信息它不会用已受控的文件覆盖已经存在的但未受控的文件。你必须检出到一个不同的目录或是先将已经存在的源代码树删除。" +#: source/TortoiseSVN_en.xml:6011(para) +msgid "The best way to avoid these problems is to add the derived files to the project's ignore list. That way they will never show up in the commit dialog, but genuine unversioned source files will still be flagged up." +msgstr "最好的避免类似问题的方法是添加参考文件到该项目的忽略列表。这样他们就永远不会出现在提交对话框中，而真正的未版本控制文件则仍然列出。" -#: source/TortoiseSVN_en.xml:391(title) -msgid "TortoiseSVN's Features" -msgstr "TortoiseSVN 的特性" +#: source/TortoiseSVN_en.xml:6017(para) +msgid "If you right click on a single unversioned file, and select the command TortoiseSVNAdd to Ignore List from the context menu, a submenu appears allowing you to select just that file, or all files with the same extension. If you select multiple files, there is no submenu and you can only add those specific files/folders." +msgstr "如果你右键一个单独的未版本控制文件，并从菜单栏选择TortoiseSVN(加入忽略列表)Add to Ignore List，会出现一个子菜单允许你仅选择该文件，或者所有具有相同后缀的文件。如果你选择多种文件，那么就没有子菜单了，你仅能添加这些特定的文件/目录。" -#: source/TortoiseSVN_en.xml:3911(para) -msgid "If you want to check out the top level folder only and omit all sub-folders, use the Only check out the top folder checkbox." -msgstr "如果你只希望检出最顶层的文件夹而忽略子文件夹，请选中只检出顶层文件夹复选框。" +#: source/TortoiseSVN_en.xml:6029(para) +msgid "If you want to remove one or more items from the ignore list, right click on those items and select TortoiseSVNRemove from Ignore List You can also access a folder's svn:ignore property directly. That allows you to specify more general patterns using filename globbing, described in the section below. Read for more information on setting properties directly. Please be aware that each ignore pattern has to be placed on a separate line. Separating them by spaces does not work." +msgstr "如果你想从忽略列表中移除一个或多个条目，右击这些条目，选择TortoiseSVN从忽略列表删除。你也可以直接存取目录的svn:ignore属性。它允许你使用文件匹配来指定多个模式，这在下面的章节叙述，阅读获得更多关于直接设置属性的信息。请注意每个忽略模式占一行，不支持使用空格分割。" -#: source/TortoiseSVN_en.xml:3915(para) -msgid "If the project contains references to external projects which you do not want checked out at the same time, use the Omit externals checkbox." -msgstr "如果项目含有外部项目的引用，而这个引用你不希望同时检出，请选中忽略外部的复选框。" +#: source/TortoiseSVN_en.xml:6044(title) +msgid "The Global Ignore List" +msgstr "全局忽略列表" -#: source/TortoiseSVN_en.xml:392(para) -msgid "What makes TortoiseSVN such a good Subversion client? Here's a short list of features." -msgstr "是什么让 TortoiseSVN 成为一个好的 Subversion 客户端？下面是一个简短的特性列表。" +#: source/TortoiseSVN_en.xml:6045(para) +msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." +msgstr "另一个忽略文件的方法是添加这些文件到global ignore list .他们最大的不同是全局忽略列表是一个客户端特性。它会作用到 所有的(all)subversion 项目。但只能在pc客户端使用。在全局尽可能更好的使用svn:ignore特性，因为他能够应用到特殊的项目区域，并却他作用于所有检出该项目的人。阅读获得更多信息。" -#: source/TortoiseSVN_en.xml:3921(para) -msgid "If either of these options are checked, you will have to perform updates to your working copy using TortoiseSVNUpdate to Revision... instead of TortoiseSVNUpdate. The standard update will include all sub-folders and all externals." -msgstr "如果这两个选项的任何一个选中了，你应该使用TortoiseSVN更新至版本...来更新你的工作副本而不是使用TortoiseSVN更新。标准的更新将会包含所有的子文件夹和外部引用。" +#: source/TortoiseSVN_en.xml:6058(title) +msgid "Ignoring Versioned Items" +msgstr "忽略已版本控制的条目" -#: source/TortoiseSVN_en.xml:3936(para) -msgid "It is recommended that you check out only the trunk part of the directory tree. If you specify the parent path of the directory tree in the URL then you might end up with a full hard disk since you will get a copy of the entire repository tree including every branch and tag of your project!" -msgstr "强烈建议你只检出trunk的那部分目录树。如果你在URL中指定了目录树的父路径，你的硬盘有可能被塞满，因为你将会得到整个版本库树的副本，包括项目所有的分支和标签(tag)！" +#: source/TortoiseSVN_en.xml:6059(para) +msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." +msgstr "已版本控制的文件或目录不能够忽略，这是subversion的一个特性。如果你错误的版本控制了一个文件，阅读介绍怎样取消版本控制(unversion)。" -#: source/TortoiseSVN_en.xml:3944(title) -msgid "Exporting" -msgstr "关于导出" +#: source/TortoiseSVN_en.xml:6067(title) +msgid "Pattern Matching in Ignore Lists" +msgstr "忽略列表中的模式匹配" -#: source/TortoiseSVN_en.xml:3945(para) -msgid "Sometimes you may want to create a local copy without any of those .svn directories, e.g. to create a zipped tarball of your source. Read to find out how to do that." -msgstr "有时你可能想要建立一个没有.svn目录的本地的副本，比如建立一个源代码压缩包。要达到这个目的，请参考。" +#: source/TortoiseSVN_en.xml:6069(primary) +msgid "globbing" +msgstr "globbing" -#: source/TortoiseSVN_en.xml:3954(title) -msgid "Committing Your Changes To The Repository" -msgstr "将你的修改提交到版本库" +#: source/TortoiseSVN_en.xml:6072(primary) +msgid "pattern matching" +msgstr "模式匹配" -#: source/TortoiseSVN_en.xml:3956(primary) -msgid "commit" -msgstr "提交" +#: source/TortoiseSVN_en.xml:6081(term) +msgid "*" +msgstr "*" -#: source/TortoiseSVN_en.xml:3959(para) -msgid "Sending the changes you made to your working copy is known as committing the changes. But before you commit you have to make sure that your working copy is up to date. You can either use TortoiseSVNUpdate directly. Or you can use TortoiseSVNCheck for Modifications first, to see which files have changed locally or on the server." -msgstr "将你对工作副本的修改发送给版本库，称为提交修改。但在你提交之前要确保你的工作副本是最新的。你可以直接使用TortoiseSVN更新，或者，你可以先使用TortoiseSVN检查修改看看哪些文件在本地或是服务器上已经有了改动。" +#: source/TortoiseSVN_en.xml:6083(para) +msgid "Matches any string of characters, including the empty string (no characters)." +msgstr "匹配任何字符串，包括空串(没有字符)" -#: source/TortoiseSVN_en.xml:3976(title) -msgid "The Commit Dialog" -msgstr "提交对话框" +#: source/TortoiseSVN_en.xml:6090(term) +msgid "?" +msgstr "?" -#: source/TortoiseSVN_en.xml:3977(para) -msgid "If your working copy is up to date and there are no conflicts, you are ready to commit your changes. Select any file and/or folders you want to commit, then TortoiseSVNCommit.... " -msgstr "如果你的工作副本是最新的，并且没有冲突，你就已经为提交做好准备了，选择你要提交的文件和/或文件夹，然后TortoiseSVN提交.... " +#: source/TortoiseSVN_en.xml:6092(para) +msgid "Matches any single character." +msgstr "匹配任何单字符" -#: source/TortoiseSVN_en.xml:398(term) -msgid "Shell integration" -msgstr "外壳集成" +#: source/TortoiseSVN_en.xml:6098(term) +msgid "[...]" +msgstr "[...]" -#: source/TortoiseSVN_en.xml:3986(title) -msgid "The Commit dialog" -msgstr "提交对话框" +#: source/TortoiseSVN_en.xml:6100(para) +msgid "Matches any one of the characters enclosed in the square brackets. Within the brackets, a pair of characters separated by - matches any character lexically between the two. For example [AGm-p] matches any one of A, G, m, n, o or p." +msgstr "匹配任何单在方括号[]内的单字符，在方括号内，一对字符被-分隔，匹配任何词汇表(lexically)上在他们中间的字符。例如[AGm-p]匹配任何但个的A,G,m,n,o或者p。" -#: source/TortoiseSVN_en.xml:3990(para) -msgid "The commit dialog will show you every changed file, including added, deleted and unversioned files. If you don't want a changed file to be committed, just uncheck that file. If you want to include an unversioned file, just check that file to add it to the commit." -msgstr "提交对话框将显示每个被改动过的文件，包括新增的、删除的和未受控的文件。如果你不想改动被提交，只要将该文件的复选框的勾去掉就可以了。如果你要加入未受控的文件，只要勾选该文件把它加入提交列表就可以了。" +#: source/TortoiseSVN_en.xml:6074(para) +msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " +msgstr "Subversion 的忽略模式使用了文件匹配，一种原先在Unix系统中使用meta字符作为通配符的技术。下面的字符有着特殊的意思: " -#: source/TortoiseSVN_en.xml:3997(para) source/TortoiseSVN_en.xml:4837(para) -msgid "Items which have been switched to a different repository path are also indicated using an (s) marker. You may have switched something while working on a branch and forgotten to switch back to trunk. This is your warning sign!" -msgstr "那些被切换(switched)到不同版本库路径的项也用(s)标记来表示。当工作在分支上的时候你可能切换到某处，然后忘记切换回主干。这是你的警告信号！" +#: source/TortoiseSVN_en.xml:6114(para) +msgid "Subversion uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." +msgstr "Subversion 在所有内部路径名称中使用 / 作为路径分割符，所有模式匹配都使用这种路径名称风格。如果你想在忽略模式中使用路径分割符，确认使用 /, 而不是 Windows 的反斜线符号。" -#: source/TortoiseSVN_en.xml:40(para) -msgid "Has it ever happened that you were working on a file, and someone else was working on the same file at the same time? Did you lose your changes to that file because of that?" -msgstr "是否发生过这样的情况: 当你在修改一个文件时，其他人也在修改这个文件？而你是否因此丢失过自己所作的修改呢？" +#: source/TortoiseSVN_en.xml:6120(para) +msgid "Pattern matching is case sensitive, which can cause problems on Windows. You can force case insensitivity the hard way by pairing characters, eg. to ignore *.tmp regardless of case, you could use a pattern like *.[Tt][Mm][Pp]." +msgstr "模式匹配是大小写敏感的，这在windows平台下会出问题。你可以要比较的字符硬性的强制忽略大小写。例如，忽略不记*.tmp的大小写。那么你可以使用像*.[Tt][Mm][Pp]这样的模式。" -#: source/TortoiseSVN_en.xml:4004(title) -msgid "Commit files or folders?" -msgstr "提交文件还是文件夹？" +#: source/TortoiseSVN_en.xml:6127(para) +msgid "Subversion uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." +msgstr "Subversion 对每个路径使用这种匹配模式。这些路径通常相对于执行导入，增加，提交等动作的目录。因此，此匹配模式考虑在文件名称之前可能有，也可能没有路径组件这个事实。" -#: source/TortoiseSVN_en.xml:4005(para) -msgid "When you commit files, the commit dialog shows only the files you have selected. When you commit a folder the commit dialog will select the changed files automatically. If you forget about a new file you created, committing the folder will find it anyway. Committing a folder does not mean that every file gets marked as changed; It just makes your life easier by doing more work for you." -msgstr "当你提交文件时，提交对话框只显示你所提中的文件。当你提交文件夹中，提交对话框将自动选择有改动的文件。如果你忘记了你建立的一个新文件，提交文件夹将使你可以找到它。提交一个文件夹并不意味着每个文件都被标识为修改过的，它仅仅是通过帮你多做些事从而让你的生活更滋润一点。" +#: source/TortoiseSVN_en.xml:6134(para) +msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Subversion compares them with the ignore pattern." +msgstr "如果目录名称在路径中，匹配算法不会删除它们，所以模式Fred.*匹配Fred.c，但是不匹配subdir/Fred.c。这对于你添加一个包含你想忽略的一些文件的目录来说是非常有意义的，因为在 Subversion 处理忽略模式时，这些文件名的优先级高于目录名。" -#: source/TortoiseSVN_en.xml:401(primary) -msgid "Windows shell" -msgstr "Windows 外壳" +#: source/TortoiseSVN_en.xml:6143(para) +msgid "The / character is not treated in any special way for pattern matching purposes, so the pattern abc*xyz would match abcdxyz but also abcdir/subdir/anything/morexyz." +msgstr "在模式匹配中，/ 字符不会做任何特别处理，所以模式 abc*xyz 匹配 abcdxyz，但是不匹配 abcdir/subdir/anything/morexyz。" -#: source/TortoiseSVN_en.xml:4015(para) -msgid "If you have modified files which have been included from a different repository using svn:externals, those changes cannot be included in the same atomic commit. A warning symbol below the file list tells you if this has happened, and the tooltip explains that those external files have to be committed separately." -msgstr "如果你修改的文件是使用了svn:externals从别的版本库中包含进来的，那么这些改动不会被自动提交。在文件列表下方的警告符号会告诉你是否出现了这种状况，工具提示(tooltip)提示了外部文件必须要分开提交。" +#: source/TortoiseSVN_en.xml:6149(para) +msgid "To ignore all CVS folders you should either specify a pattern of *CVS or better, the pair CVS */CVS. The first option works, but would also exclude something called ThisIsNotCVS. Using */CVS alone will not work on an immediate child CVS folder, and CVS alone will not work on subfolders." +msgstr "你应该指定一个*CVS或者更好的CVS */CVS模式中的任意一个来忽略所有的CVS目录。执行第一个选择也将会排斥一些像ThisIsNotCVS这样的命令。而单独使用*/CVS又不能作用在一个紧跟着CVS的子目录上，而且单独的CVS 不能作用在子目录上。" -#: source/TortoiseSVN_en.xml:4023(title) -msgid "Many unversioned files in the commit dialog" -msgstr "在提交对话框中有很多未受控的文件" +#: source/TortoiseSVN_en.xml:6158(para) +msgid "If you want an official definition for globbing, you can find it in the IEEE specifications for the shell command language Pattern Matching Notation." +msgstr "如果你想要定义一个特殊的忽略规则。你可以在关于shell命令行语言的IEEE规范中找到Pattern Matching Notation。" -#: source/TortoiseSVN_en.xml:4024(para) -msgid "If you think that the TSVN commit dialog shows you too many unversioned (e.g. compiler generated or editor backup) files, there are several ways to handle this. You can: Read for more information." -msgstr "如果你认为TSVN提交对话框显示了太多的未受控文件(如编译器产生的文件或是编辑器的备份文件)，有几种方法可以处理这种情况。你可以: 参考 获得更多的信息。" +#: source/TortoiseSVN_en.xml:6168(title) +msgid "Deleting, Renaming And Moving" +msgstr "删除、重命名和移动" -#: source/TortoiseSVN_en.xml:4030(para) -msgid "add the file (or a wildcard extension) to the list of files to exclude on the settings page. This will affect every working copy you have." -msgstr "将文件(或是通配符扩展)加入到设置页的排除列表中。这对每个工作副本都起作用。" +#: source/TortoiseSVN_en.xml:6170(primary) +msgid "delete" +msgstr "删除" -#: source/TortoiseSVN_en.xml:4037(para) -msgid "add the file to the svn:ignore list using TortoiseSVNAdd to ignore list This will only affect the directory on which you set the svn:ignore property. Using the SVN Property Dialog, you can alter the svn:ignore property for a directory." -msgstr "使用TortoiseSVN加入忽略列表，将文件加入svn:ignore列表。 这只对你设置了svn:ignore属性的路径有效。使用SVN属性对话框，你可以改变一个目录的svn:ignore属性。" +#: source/TortoiseSVN_en.xml:6173(primary) +msgid "remove" +msgstr "删除" -#: source/TortoiseSVN_en.xml:404(primary) -msgid "explorer" -msgstr "资源管理器" +#: source/TortoiseSVN_en.xml:6176(primary) +msgid "rename" +msgstr "改名" -#: source/TortoiseSVN_en.xml:4054(para) -msgid "Doubleclicking on any modified file in the commit dialog will launch the external diff tool to show your changes. The context menu will give you more options, as shown in the screenshot. You can also drag files from here into another application such as a text editor or an IDE." -msgstr "在提交对话框中双击任何修改过的文件，将运行外部diff工具显示你作的改动。上下文菜单(右键菜单)将给你更多的选项，请看屏幕截图。你可以从这里将文件拖动到另一个应用程序中，如文本编辑器或是IDE。" +#: source/TortoiseSVN_en.xml:6179(primary) +msgid "move" +msgstr "移动" -#: source/TortoiseSVN_en.xml:406(para) -msgid "TortoiseSVN integrates seamlessly into the Windows shell (i.e. the explorer). This means you can keep working with the tools you're already familiar with. And you do not have to change into a different application each time you need functions of the version control!" -msgstr "TortoiseSVN 与Windows 外壳(例如资源管理器)无缝集成，你可以保持在熟悉的工具上工作，不需要在每次使用版本控制功能时切换应用程序。" +#: source/TortoiseSVN_en.xml:6187(title) +msgid "Explorer context menu for versioned files" +msgstr "版本控制文件的菜单浏览" -#: source/TortoiseSVN_en.xml:4061(para) -msgid "You can select or deselect items by clicking on the checkbox to the left of the item. For directories you can use SHIFT-Select to make the action recursive." -msgstr "" +#: source/TortoiseSVN_en.xml:6182(para) +msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseSVN submenu. " +msgstr "不像CVS,Subversion允许重命名和移动文件和目录。因此在TortoiseSVN 的子菜单中有删除和重命名的菜单项。" -#: source/TortoiseSVN_en.xml:4066(para) -msgid "The columns displayed in the bottom pane are customizable. If you right click on any column header you will see a context menu allowing you to select which columns are displayed. You can also change column width by using the drag handle which appears when you move the mouse over a column boundary. These customizations are preserved, so you will see the same headings next time." -msgstr "在底部面板中显示的列是可定制的。如果你右击任何一列的头部，你就会看到一个上下文菜单，允许你选择哪一列要显示。还可以在鼠标移动到列边界时通过拖动手把来改变列的宽度。这些定制的内容都会被保留下来，下一次你会见到相同的列。" +#: source/TortoiseSVN_en.xml:6191(para) +msgid "If you delete a file/directory using TSVN, the file is removed from your working copy and marked for deletion. The file's parent folder shows a \"deleted\" icon overlay. You can always get the file back, if you call TortoiseSVNRevert on the parent folder." +msgstr "如果你通过TSVN删除了一个文件/目录，吗呢这个文件被移出你的工作副本并标记为删除。该文件的父目录会覆盖上一个\"删除\"标记。你随时可以通过在父目录调用TortoiseSVNRevert命令来恢复该文件。" -#: source/TortoiseSVN_en.xml:4075(para) -msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Subversion configuration file. Read for information on how to edit the Subversion config file." +#: source/TortoiseSVN_en.xml:6202(para) +msgid "When you TortoiseSVNDelete a file, it is removed from your working copy immediately as well as being marked for deletion in the repository on next commit. When you TortoiseSVNDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. This difference in behaviour is a part of Subversion, not TortoiseSVN." msgstr "" -#: source/TortoiseSVN_en.xml:4086(para) -msgid "You can drag files into the commit dialog from elsewhere, so long as the working copies are checked out from the same repository. For example, you may have a huge working copy with several explorer windows open to look at distant folders of the hierarchy. If you want to avoid committing from the top level folder (with a lengthy folder crawl to check for changes) you can open the commit dialog for one folder and drag in items from the other windows to include within the same atomic commit." -msgstr "你可以将文件从别的地方拖动到提交对话框，只要工作副本是由同一版本库中检出就可以了。比如，你有一个很大的工作副本，要开好几个资源管理器窗口来查看层次中不同的文件夹。如果你要避免从顶级文件夹提交(冗长而缓慢的文件夹改动检查)，你可以打开一个文件夹的提交对话框，然后将别的窗口中的项拖进去，可样就可以一次提交它们了。" - -#: source/TortoiseSVN_en.xml:4096(para) -msgid "You can drag unversioned files which reside within a working copy into the commit dialog, and they will be SVN added automatically." -msgstr "你可以将未版本控制的文件拖到工作副本提交对话框中，它们就会被自动增加。" +#: source/TortoiseSVN_en.xml:6219(para) +msgid "If you want to delete an item from the repository, but keep it locally as an unversioned file/folder, use Extended Context MenuDelete (keep local). You have to hold the Shift while right clicking on the item in the explorer list pane (right pane) in order to see this in the extended context menu." +msgstr "如果你想从版本库删除项目，但是在本地作为非版本控制的文件/目录保留，可以使用 扩展上下文菜单删除(保留本地副本)。为了看到扩展上下文菜单，你必须在文件管理器列表窗格(右窗格)中的项目上点击右键，同时按着 Shift 键。" -#: source/TortoiseSVN_en.xml:4102(title) source/TortoiseSVN_en.xml:4909(title) -msgid "Repairing External Renames" -msgstr "修复外部改名" +#: source/TortoiseSVN_en.xml:6235(para) +msgid "select the files or directories you want to move" +msgstr "选择你要移动的文件或目录" -#: source/TortoiseSVN_en.xml:4103(para) source/TortoiseSVN_en.xml:4910(para) -msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "有时候文件不是用Subversion改名，于是它们在文件列表中作为丢失和未版本控制的文件出现。为了避免丢失历史，你需要通知Subversion。简单的选择老名称(丢失)和新名称(未版本控制)，然后使用右键菜单修复移动来指明这两个文件是改名关系。" +#: source/TortoiseSVN_en.xml:6251(para) +msgid "in the popup menu select Context MenuSVN Move versioned files here" +msgstr "在弹出菜单选择上下文菜单SVN 移动文件。" -#: source/TortoiseSVN_en.xml:4118(title) -msgid "Change Lists" -msgstr "修改列表" +#: source/TortoiseSVN_en.xml:6230(para) +msgid "If you want to move files inside a working copy, use the drag-and-drop handler again: " +msgstr "如果你想在工作副本中移动文件，那么可以这样使用鼠标拖拽: " -#: source/TortoiseSVN_en.xml:4120(primary) -msgid "changelist" -msgstr "修改列表" +#: source/TortoiseSVN_en.xml:6262(title) +msgid "Do Not SVN Move Externals" +msgstr "不要使用 SVN 移动外部连接" -#: source/TortoiseSVN_en.xml:4122(para) -msgid "In an ideal world, you only ever work on one thing at a time, and your working copy contains only one set of logical changes. OK, back to reality. It often happens that you have to work on several unrelated tasks at once, and when you look in the commit dialog, all the changes are mixed in together. The changelist feature helps you group files together, making it easier to see what you are doing. Of course this can only work if the changes do not overlap. If two different tasks affect the same file, there is no way to separate the changes." -msgstr "理想情况下，你任何时候都只做一件事，你的工作副本只包含一个逻辑修改集合。很好，回到现实。你经常会同时做几件不相关的事，当你察看提交对话框时，所有修改混到一起。修改列表特性帮助你分组，让你容易看到正在做什么。当然它只能在修改不重合的时候工作。如果两个不同的任务影响到同一个文件，没有办法隔离修改。" +#: source/TortoiseSVN_en.xml:6263(para) +msgid "You should not use the TortoiseSVN Move or Rename commands on a folder which has been created using svn:externals. This action would cause the external item to be deleted from its parent repository, probably upsetting many other people. If you need to move an externals folder you should use an ordinary shell move, then adjust the svn:externals properties of the source and destination parent folders." +msgstr "你不应该用TortoiseSVN的移动或重命名命令作用在一个已经用svn:externals创建的目录上。因为这个动作可能会导致外部的元素(item)被从他的父版本库中删除，这可能会使其他很多人烦恼。如果你必须移动洋外部的目录，你应该使用一个普通的shell移动，然后调整源文件和目的文件的父目录的svn:externals道具。" -#: source/TortoiseSVN_en.xml:413(para) -msgid "And you are not even forced to use the Windows Explorer. TortoiseSVN's context menus work in many other file managers, and in the File/Open dialog which is common to most standard Windows applications. You should, however, bear in mind that TortoiseSVN is intentionally developed as extension for the Windows Explorer. Thus it is possible that in other applications the integration is not as complete and e.g. the icon overlays may not be shown." -msgstr "并且你不一定必须使用 Windows 资源管理器，TortoiseSVN 的右键菜单可以工作在其他文件管理器，以及文件/打开对话框等标准的 Windows 应用程序中。你必须牢记，TortoiseSVN 是有意作为 Windows 资源管理器的扩展开发，因此在其他程序可能集成的并不完整，例如覆盖图标可能不会显示。" +#: source/TortoiseSVN_en.xml:6276(para) +msgid "If a file is deleted via the explorer instead of using the TortoiseSVN context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseSVNDelete so that Subversion doesn't have to guess what you really want to do." +msgstr "如果一个 文件 是通过浏览器而不是使用TortoiseSVN 快捷菜单被删除，提交对话框也会显示这些文件并让你在提交前把他们从版本控制中移除。可是,如果你更新你的工作副本， Subversion 将会混淆这个丢失文件并替换他为版本库中的最新版本。因此，如果你需要删除一个版本控制下的文件，请始终使用TortoiseSVNDelete保证 Subversion不去猜测你到底想干什么。" -#: source/TortoiseSVN_en.xml:4133(para) -msgid "The changelist feature is only available in Windows XP and later, as it depends on a shell capability which is not present in Windows 2000. Sorry, but Win2K is really quite old now, so please don't complain." -msgstr "修改列表依赖一个不存在于 Windows 2000 的外壳特性，所以它只能用于 Windows XP 或更新的系统。抱歉，但是现在 Windows 2000 真的很古老了，请不要抱怨。" +#: source/TortoiseSVN_en.xml:6290(para) +msgid "If a folder is deleted via the explorer instead of using the TortoiseSVN context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseSVNDelete." +msgstr "如果一个 目录 是通过浏览器而不是使用TortoiseSVN 快捷菜单被删除，你的工作副本将回被损坏，并且你将不能提交。如果你更新你的工作副本，如果你更新你的工作副本， Subversion 将用版本库中的最新版本替换已丢失目录。接下来你就可以使用TortoiseSVNDelete这种正确的方法来删除它了。" -#: source/TortoiseSVN_en.xml:4139(para) -msgid "Use Context MenuMove to changelist to add an item to a changelist. Initially there will be no changelists, so the first time you do this you will create a new changelist. Give it name which describes what you are using it for, and click OK. The commit dialog will now change to show groups of items. " -msgstr "使用右键菜单移到修改列表 可以增加一个项目到修改列表。最初没有修改列表，所以你第一次做的时候，会创建一个新的修改列表。给出一个能描述它的作用的名称，然后点击 OK。提交对话框会改变为显示项目分组。 " +#: source/TortoiseSVN_en.xml:6303(title) +msgid "Commit the parent folder" +msgstr "提交父目录" -#: source/TortoiseSVN_en.xml:4151(title) -msgid "Commit dialog with Changelists" -msgstr "带有修改列表的提交对话框" +#: source/TortoiseSVN_en.xml:6304(para) +msgid "Since renames and moves are done as a delete followed by an add you must commit the parent folder of the renamed/moved file so that the deleted part of the rename/move will show up in the commit dialog. If you don't commit the removed part of the rename/move, it will stay behind in the repository and an update of your coworkers won't remove the old file. i.e. they will have both the old and the new copies." +msgstr "既然重命名和移动都可以像添加之后又删除一样被执行，你必需提交该重命名/移动文件的父目录，所以重命名/移动的删除部分将出现在提交对话框中。如果你不提交重命名/移动的已删除部分，他将保留在仓库中并且你的同组人将更新该未移除的旧文件。例如，他们将有两个一老一新的副本。" -#: source/TortoiseSVN_en.xml:4155(para) -msgid "Apart from giving an immediate visual indication of groupings, you can also use the group headings to select which files to commit." -msgstr "除了分组可以直接指示之外，你也可以使用组头选择提交哪些文件。" +#: source/TortoiseSVN_en.xml:6314(para) +msgid "You must commit a folder rename before changing any of the files inside the folder, otherwise your working copy can get really messed up." +msgstr "你 必须在重命名目录后而在更改目录下的任何文件前进行提交，不然你的工作副本就回真的混淆。" -#: source/TortoiseSVN_en.xml:4160(para) -msgid "Changelists are purely a local client feature. Creating and removing changelists will not affect the repository, not any other client." -msgstr "修改列表是纯本地客户端特性。创建和删除修改列表不会影响到版本库，或任何其它客户端。" +#: source/TortoiseSVN_en.xml:6321(title) +msgid "Getting a deleted file or folder back" +msgstr "找回已删除的文件或目录" -#: source/TortoiseSVN_en.xml:4167(title) -msgid "Commit Log Messages" -msgstr "提交日志信息" +#: source/TortoiseSVN_en.xml:6322(para) +msgid "If you have deleted a file or a folder and already committed that delete operation to the repository, then a normal TortoiseSVNRevert can't bring it back anymore. But the file or folder is not lost at all. If you know the revision the file or folder got deleted (if you don't, use the log dialog to find out) open the repository browser and switch to that revision. Then select the file or folder you deleted, right-click and select Context MenuCopy to... as the target for that copy operation select the path to your working copy." +msgstr "如果你删除了洋文件或目录并已经提交该删除操作到版本库，那么 一个常规的TortoiseSVNRevert已不能再将其找回。但是该文件或目录并没有完全丢失。如果你知道该被删除文件或目录的版本(如果不能，使用日志对话框来查找出来)，打开数据仓库的浏览器，并选择那个版本。然后选择你删除的文件或目录，右键并选择Context MenuCopy to...作为目标执行复制操作，然后选择你的工作副本的路径。" -#: source/TortoiseSVN_en.xml:4168(para) -msgid "Be sure to enter a log message which describes the changes you are committing. This will help you to see what happened and when, as you browse through the project log messages at a later date. The message can be as long or as brief as you like; many projects have guidelines for what should be included, the language to use, and sometimes even a strict format." -msgstr "确保输入描述你所提交的修改内容的日志信息。这可以帮你回顾做了什么，什么时候做的。信息的内容可长可短，许多项目规定了要包含的内容、使用的语言甚至是严格的格式。" +#: source/TortoiseSVN_en.xml:6343(title) +msgid "Renaming a file only in case" +msgstr "仅在单一实例中重命名文件" -#: source/TortoiseSVN_en.xml:4176(para) -msgid "You can apply simple formatting to your log messages using a convention similar to that used within emails. To apply styling to text, use *text* for bold, _text_ for underlining, and ^text^ for italics." -msgstr "你可以使用与电子邮件相似的约定，简单格式化日志消息。如果对文本采用这些样式，使用*文本*表示粗体，_文本_表示下划线，^文本^表示斜体。" +#: source/TortoiseSVN_en.xml:6345(para) +msgid "In case you have two files in the repository with the same name but differing only in case (e.g. TEST.TXT and test.txt) you can't update or checkout the directory where those files are in anymore." +msgstr "万一在你的版本库中有两个名字相同但大小拼写不同(例如: TEST.TXT和test.txt)的文件，你是不能更新或者检出该包含该文件的目录的。" -#: source/TortoiseSVN_en.xml:4184(para) -msgid " TortoiseSVN includes a spellchecker to help you get your log messages right. This will highlight any mis-spelled words. Use the context menu to access the suggested corrections. Of course, it doesn't know every technical term that you do, so correctly spelt words will sometimes show up as errors. But don't worry. You can just add them to your personal dictionary using the context menu." -msgstr " TortoiseSVN包含了一个拼写检查器帮助你正确地书写日志信息。对任何错误拼写的词都高亮显示。使用右键菜单可以获得修改建议。当然它不会知道所有的技术术语，所以有时一些拼写正确的词会被当作错误。但不用担心，你可以使用右键菜单将它们加入你的个人字典中。" +#: source/TortoiseSVN_en.xml:6350(para) +msgid "In that case, you have to decide which one of them you want to keep and delete (or rename) the other one from the repository." +msgstr "如果是那样的话，你得决定在这个版本库里的哪一个文件是你想保留的，哪一个是要删除(或重命名)的" -#: source/TortoiseSVN_en.xml:4186(title) -msgid "The Commit Dialog Spellchecker" -msgstr "提交对话框的拼写检查器" +#: source/TortoiseSVN_en.xml:6354(para) +msgid "There are (at least) two possible solutions to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!!!" +msgstr "这里(至少)有两种可能的解决方案来重命名文件而不丢失他的日志记录。在subversion里重命名它是很重要的。仅在浏览器中重命名将会损坏你的工作副本。" -#: source/TortoiseSVN_en.xml:4196(para) -msgid "The log message window also includes a filename and function auto-completion facility. This uses regular expressions to extract class and function names from the (text) files you are committing, as well as the filenames themselves. If a word you are typing matches anything in the list (after you have typed at least 3 characters), a drop-down appears allowing you to select the full name. The regular expressions supplied with TortoiseSVN are held in the TortoiseSVN installation bin folder. You can also define your own regexes and store them in %APPDATA%\\TortoiseSVN\\autolist.txt. Of course your private autolist will not be overwritten when you update your installation of TortoiseSVN. If you are unfamiliar with regular expressions, take a look at the online documentation and tutorial at http://www.regular-expressions.info/." -msgstr "日志信息窗口还包含一个文件名和函数自动完成的功能。这使用了正则表达式来从你提交的(文本)文件中提取类和函数名，当然包括文件名本身。如果你现在敲入的一个词与列表中的任意一个匹配(在你输入至少3个字符后)，就会出现一个下拉列表，允许你选择完整的名字。与TortoiseSVN一起提供的正则表达式位于TortoiseSVN安装路径的bin文件夹中。你可以定义自己的正则式并将其存放在%APPDATA%\\TortoiseSVN\\autolist.txt。当然你自定义的自动列表不会在升级安装的时候被覆盖。如果你不熟悉正则表达式，请参考在线文件和教程: http://www.regular-expressions.info/." +#: source/TortoiseSVN_en.xml:6364(para) +msgid "Commit the changes in your working copy." +msgstr "提交你工作副本中的改变到版本库" -#: source/TortoiseSVN_en.xml:4213(title) -msgid "Special Folder Properties" -msgstr "指定文件夹属性" +#: source/TortoiseSVN_en.xml:6369(para) +msgid "Rename the file from UPPERcase to upperCASE directly in the repository using the repository browser." +msgstr "使用版本库的浏览器立即重命名该文件的大写(小写)为小写(大写)" -#: source/TortoiseSVN_en.xml:4214(para) -msgid "There are several special folder properties which can be used to help give more control over the formatting of commit log messages and the language used by the spellchecker module. Read for further information." -msgstr "有几个特殊的文件夹属性可用于帮助我们得到更多的对提交日志信息的格式以及拼写检查模块的控制。参考以了解详情。" +#: source/TortoiseSVN_en.xml:6375(para) +msgid "Update your working copy." +msgstr "更新你的工作副本" -#: source/TortoiseSVN_en.xml:4222(title) -msgid "Integration with Bugtracking Tools" -msgstr "与缺陷跟踪工具整合" +#: source/TortoiseSVN_en.xml:6360(para) +msgid "Solution A) (recommended) " +msgstr "解决方案 A)(推荐) " -#: source/TortoiseSVN_en.xml:4223(para) -msgid "If you have activated the bugtracking system, you can set one or more Issues in the Bug-ID / Issue-Nr: text box. Multiple issues should be comma separated. Alternatively, if you are using regex-based bugtracking support, just add your issue references as part of the log message. Learn more ." -msgstr "如果你激活了一个缺陷跟踪系统，你可以在Bug-ID / Issue-Nr:文本框中设置一个或多个问题。多个问题应该用逗号分割。另外，如果你使用基于正则表达式的缺陷跟踪支持，只要将你的问题引用作为日志信息的一部分加入就可以了。详情请见。" +#: source/TortoiseSVN_en.xml:6385(para) +msgid "Rename from UPPERcase to UPPERcase_ with the rename command in the TortoiseSVN submenu." +msgstr "使用TortoiseSVN子菜单中的重命名命令将UPPERcase重命名为UPPERcase_ 格式" -#: source/TortoiseSVN_en.xml:4234(title) -msgid "Commit Progress" -msgstr "提交进程" +#: source/TortoiseSVN_en.xml:6391(para) source/TortoiseSVN_en.xml:6401(para) +msgid "Commit the changes." +msgstr "提交该更改" -#: source/TortoiseSVN_en.xml:4235(para) -msgid "After pressing OK, a dialog appears displaying the progress of the commit. " -msgstr "在按下OK之后，会出现一个对话框显示提交的进度。" +#: source/TortoiseSVN_en.xml:6396(para) +msgid "Rename from UPPERcase_ to upperCASE." +msgstr "将UPPERcase_重命名为upperCASE格式" -#: source/TortoiseSVN_en.xml:4239(title) -msgid "The Progress dialog showing a commit in progress" -msgstr "显示提交进度的进度对话框" +#: source/TortoiseSVN_en.xml:6381(para) +msgid "Solution B) " +msgstr "解决方案 B) " -#: source/TortoiseSVN_en.xml:4243(para) -msgid "The progress dialog uses colour coding to highlight different commit actions " -msgstr "进度对话框使用颜色代码来高亮显示不同的提交行为。" +#: source/TortoiseSVN_en.xml:6408(title) +msgid "Preventing two files with the same name" +msgstr "防止两个文件名字相同" -#: source/TortoiseSVN_en.xml:4248(term) source/TortoiseSVN_en.xml:4775(term) -msgid "Blue" -msgstr "蓝色" +#: source/TortoiseSVN_en.xml:6409(para) +msgid "There is a server hook script available at: http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ that will prevent checkins which result in case conflicts." +msgstr "这有一个有用的服务器端脚本在http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/将会防止检入拼写(大小写)冲突文件。" -#: source/TortoiseSVN_en.xml:4250(para) -msgid "Committing a modification." -msgstr "提交一个修改。" +#: source/TortoiseSVN_en.xml:6419(title) +msgid "Repairing File Renames" +msgstr "修复文件改名" -#: source/TortoiseSVN_en.xml:4256(term) source/TortoiseSVN_en.xml:4320(term) -#: source/TortoiseSVN_en.xml:4783(term) -msgid "Purple" -msgstr "紫色" +#: source/TortoiseSVN_en.xml:6420(para) +msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." +msgstr "有时候你的IDE会因为执行反射操作，改名文件，当然它不能告诉Subversion。如果你尝试提交修改，Subversion会发现丢失了老文件，新增了未版本控制的新文件。你可以简单的增加新文件，但是你将丢失历史记录，因为Subversion不知道这些文件的关系。" -#: source/TortoiseSVN_en.xml:4258(para) -msgid "Committing a new addition." -msgstr "提交一个新增项。" +#: source/TortoiseSVN_en.xml:6428(para) +msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." +msgstr "更好的方法是通知Subversion这实际上是改名，你可以在提交和检查修改对话框中做此操作。简单选择老文件(丢失的)和新文件(未版本控制的)，使用右键菜单修复移动设置这两个文件是改名关系。" -#: source/TortoiseSVN_en.xml:4264(term) source/TortoiseSVN_en.xml:4328(term) -#: source/TortoiseSVN_en.xml:4795(term) -msgid "Dark red" -msgstr "深红" +#: source/TortoiseSVN_en.xml:6442(title) +msgid "Deleting Unversioned Files" +msgstr "删除未版本控制的文件" -#: source/TortoiseSVN_en.xml:4266(para) -msgid "Committing a deletion or a replacement." -msgstr "提交一个删除或是替换。" +#: source/TortoiseSVN_en.xml:6443(para) +msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." +msgstr "通常你可以在Subversion中设置自己的忽略列表，例如忽略所有产生的文件。但是你如何清理这些忽略的项目，从而产生一个干净的构建呢？通常你在makefile中清理，但是如果你在调试makefile，或者修改构建系统，那么有一个清理方法是极为有用的。" -#: source/TortoiseSVN_en.xml:427(term) -msgid "Icon overlays" -msgstr "覆盖图标" +#: source/TortoiseSVN_en.xml:6450(para) +msgid "TortoiseSVN provides just such an option using Extended Context MenuDelete unversioned items.... You have to hold the Shift while right clicking on a folder in the explorer list pane (right pane) in order to see this in the extended context menu. This will produce a dialog which lists all unversioned files anywhere in your working copy. You can then select or deselect items to be removed." +msgstr "TortoiseSVN 提供了使用扩展上下文菜单删除未版本控制的项目...来清理工作副本。你可以在目录上右键操作时，保持 Shift按下，就可以看到这个上下文菜单。它会出现一个对话框，列出工作副本中的所有未版本控制的文件。你可以选择或取消删除的项目。" -#: source/TortoiseSVN_en.xml:4272(term) source/TortoiseSVN_en.xml:4355(term) -#: source/TortoiseSVN_en.xml:4823(term) -msgid "Black" -msgstr "黑色" +#: source/TortoiseSVN_en.xml:6462(para) +msgid "When such items are deleted, the recycle bin is used, so if you make a mistake here and delete a file that should have been versioned, you can still recover it." +msgstr "当删除这些项目时，使用了垃圾箱。所以如果你犯了错误，删除了应该版本控制的文件，你仍旧可以恢复。" -#: source/TortoiseSVN_en.xml:4274(para) -msgid "All other items." -msgstr "所有其他项。" +#: source/TortoiseSVN_en.xml:6470(title) +msgid "Undo Changes" +msgstr "撤消更改" -#: source/TortoiseSVN_en.xml:4281(para) source/TortoiseSVN_en.xml:4365(para) -#: source/TortoiseSVN_en.xml:4832(para) -msgid "This is the default colour scheme, but you can customise those colours using the settings dialog. Read for more information." -msgstr "这是默认的配色方案，但你可以通过设置对话框来定制这些颜色。参考获得详情。" +#: source/TortoiseSVN_en.xml:6472(primary) +msgid "revert" +msgstr "恢复" -#: source/TortoiseSVN_en.xml:4289(title) -msgid "Update Your Working Copy With Changes From Others" -msgstr "用来自别人的修改更新你的工作副本" +#: source/TortoiseSVN_en.xml:6475(primary) +msgid "undo" +msgstr "撤消" -#: source/TortoiseSVN_en.xml:429(para) -msgid "The status of every versioned file and folder is indicated by small overlay icons. That way you can see right away what the status of your working copy is." -msgstr "每个版本控制的文件和目录的状态使用小的覆盖图标表示，可以让你立刻看出工作副本的状态。" +#: source/TortoiseSVN_en.xml:6490(title) +msgid "Revert dialog" +msgstr "恢复对话框" -#: source/TortoiseSVN_en.xml:4293(para) -msgid " Periodically, you should ensure that changes done by others get incorporated in your local working copy. The process of getting changes from the server to your local copy is known as updating. Updating may be done on single files, a set of selected files, or recursively on entire directory hierarchies. To update, select the files and/or directories you want, right click and select TortoiseSVNUpdate in the explorer context menu. A window will pop up displaying the progress of the update as it runs. Changes done by others will be merged into your files, keeping any changes you may have done to the same files. The repository is not affected by an update." -msgstr "你应该定期地确保别人作的修改与你的工作副本可以整合。从服务器上获取改动到你本地副本的过程称为更新。更新可以针对一个文件、几个选中的文件或是递归整个目录层次。要进行更新操作，请选择要更新文件和/或路径，右击选择右键菜单中的TortoiseSVN更新。会弹出一个窗口显示更新的进度。别人作的修改将合并到你的文件中，你所做的修改会被保留。版本库受更新操作的影响。" +#: source/TortoiseSVN_en.xml:6477(para) +msgid "If you want to undo all changes you made in a file since the last update you need to select the file, right click to pop up the context menu and then select the command TortoiseSVNRevert A dialog will pop up showing you the files that you've changed and can revert. Select those you want to revert and click on OK. " +msgstr "如果你想要撤消一个文件自上次更新后的所有的变更，你需要选择该文件, 右击弹出快捷菜单，然后选择TortoiseSVNRevert命令，将会弹出一个显示这个你已经变更并能恢复的文件。选择那些你想要恢复的然后按OK. 。" -#: source/TortoiseSVN_en.xml:4295(title) -msgid "Progress dialog showing finished update" -msgstr "已经完成更新的进度对话框" +#: source/TortoiseSVN_en.xml:6494(para) source/TortoiseSVN_en.xml:7686(para) +msgid "The columns in this dialog can be customized in the same way as the columns in the Check for modifications dialog. Read for further details." +msgstr "在这一对话框中，纵列和在 检查修改对话框中的纵列同样是可以定制的。更多细节请阅读 " -#: source/TortoiseSVN_en.xml:4315(para) -msgid "The progress dialog uses colour coding to highlight different update actions " -msgstr "进度对话框使用颜色代码来高亮不同的更新行为" +#: source/TortoiseSVN_en.xml:6500(title) +msgid "Undoing Changes which have been Committed" +msgstr "取消已经提交的改变" -#: source/TortoiseSVN_en.xml:4322(para) -msgid "New item added to your WC." -msgstr "新项已经增加到你的工作副本中。" +#: source/TortoiseSVN_en.xml:6501(para) +msgid "Revert will only undo your local changes. It does not undo any changes which have already been committed. If you want to undo all the changes which were committed in a particular revision, read for further information." +msgstr "Revert仅能撤消你本地的变更。他不能撤消已经提交的的变更。如果你想撤消所有的包括已经提交到一个特定版本的变更，请阅读 获得更多信息。" -#: source/TortoiseSVN_en.xml:4330(para) -msgid "Redundant item deleted from your WC, or missing item replaced in your WC." -msgstr "你的工作副本中删除了多余项，或是你的工作副本中丢失的项被替换。" +#: source/TortoiseSVN_en.xml:6513(title) +#: source/TortoiseSVN_en.xml:11951(title) +#: source/TortoiseSVN_en.xml:12214(glossterm) +msgid "Cleanup" +msgstr "清理" -#: source/TortoiseSVN_en.xml:4337(term) source/TortoiseSVN_en.xml:4803(term) -msgid "Green" -msgstr "绿色" +#: source/TortoiseSVN_en.xml:6515(primary) +msgid "cleanup" +msgstr "清理" -#: source/TortoiseSVN_en.xml:4339(para) -msgid "Changes from repository successfully merged with your local changes." -msgstr "版本库中的修改与你的本地修改成功合并。" +#: source/TortoiseSVN_en.xml:6517(para) +msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseSVNCleanup on the folder. It is a good idea to do this at the top level of the working copy." +msgstr "也许由于服务器问题，一个Subversion指令不能成功地完成，你的工作副本因此被滞留在一个不一致的状态。 那样的话，你需要在该目录上使用TortoiseSVN清理命令。在工作副本的根目录使用它是一个好主意。" + +#: source/TortoiseSVN_en.xml:6528(para) +msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to repond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." +msgstr "清理有另外的一个有用的副作用。如果一个文件日期变化了但是它的内容没变,Subversion除了采用byte-by-byte将该文件和原副本进行对照，不能分清它是否真的变更。 如果你有很多这种状态下的文件，将会使获得状态非常慢，还会导致许多会话响应变慢。在你的工作副本上执行一个清理命令将会修正这些 \" 坏掉的 \" 时戳，从而可以全速检查它们的状态。" -#: source/TortoiseSVN_en.xml:4346(term) source/TortoiseSVN_en.xml:4813(term) -msgid "Bright red" -msgstr "亮红" +#: source/TortoiseSVN_en.xml:6539(title) +msgid "Use Commit Timestamps" +msgstr "使用提交时戳" -#: source/TortoiseSVN_en.xml:4348(para) -msgid "Changes from repository merged with local changes, resulting in conflicts which you need to resolve." -msgstr "来自版本库的修改在与本地修改合并时出现了冲突，需要你解决。" +#: source/TortoiseSVN_en.xml:6540(para) +msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." +msgstr "Subversion的一些早期发布中存在一个bug，当你使用使用提交时戳选项检出的时候会造成时戳混乱。使用清理命令可以修正工作副本中的这些问题。" -#: source/TortoiseSVN_en.xml:4357(para) -msgid "Unchanged item in your WC updated with newer version from the repository." -msgstr "你WC中的没有改动的项被来自版本库中新版本所更新。" +#: source/TortoiseSVN_en.xml:6550(title) +msgid "Project Settings" +msgstr "项目设置" -#: source/TortoiseSVN_en.xml:437(term) -msgid "Easy access to Subversion commands" -msgstr "Subversion 命令的简便访问" +#: source/TortoiseSVN_en.xml:6552(primary) +msgid "properties" +msgstr "属性" -#: source/TortoiseSVN_en.xml:4370(para) -msgid "If you get any conflicts during an update (this can happen if others changed the same lines in the same file as you did and those changes don't match) then the dialog shows those conflicts in red. You can double click on these lines to start the external merge tool to resolve the conflicts." -msgstr "如果你在更新中遇到了冲突(这是由于别人与你修改了同一个文件的同一行代码，并且两者的修改不匹配)，对话框中将冲突显示为红色，你可以双击这些行启动外部合并工具来解决冲突。" +#: source/TortoiseSVN_en.xml:6556(title) +msgid "Explorer property page, Subversion tab" +msgstr "资源管理器属性页，Subversion 页面" -#: source/TortoiseSVN_en.xml:4377(para) -msgid "When the update is complete, the progress dialog shows a summary of the number of items updated, added, removed, conflicted, etc. below the file list. This summary information can be copied to the clipboard using CTRL+C." -msgstr "当更新完成后，进度对话框在文件列表下面显示汇总信息，多少项更新，增加，删除，冲突等。汇总信息可以使用CTRL+C复制到剪贴板。" +#: source/TortoiseSVN_en.xml:6554(para) +msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseSVN submenu!). In the properties dialog box TortoiseSVN has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." +msgstr "有时你可能想得到关于一个文件/目录的更多的细节信息而不仅是一个覆盖的标志。 你能得到Subversion的属性对话框中浏览到的所有信息。只需选择指定文件或目录，然后在文件菜单中选择Windows Menuproperties(注意: 这是浏览器提供的标准属性菜单，而不是TortoiseSVN 子菜单的其中之一)。在TortoiseSVN 属性对话框中已经为在Subversion控制下的文件/目录增加新的属性页。在这里你能看到所有的关于选择文件/目录的相关信息。" -#: source/TortoiseSVN_en.xml:4384(para) -msgid "The standard Update command has no options and just updates your working copy to the HEAD revision of the repository, which is the most common use case. If you want more control over the update process, you should use TortoiseSVNUpdate to Revision... instead. This allows you to update your working copy to a specific revision, not only to the most recent one. Suppose your working copy is at revision 100, but you want it to reflect the state which it had in revision 50 - then simply update to revision 50. In the same dialog you can also choose to update the current folder non-recursively (without all the subfolders) and you can choose whether to ignore any external projects in the update (i.e. projects referenced using svn:externals)." -msgstr "标准的更新命令没有选项，仅仅是把你的工作副本更新到版本库中的最新版本，这也是最常用的情况。如果你要对更新过程进行更多的控制，就要使用TortoiseSVN更新到版本...。这个操作允许你更新工作副本到一个指定的版本，不仅仅是最新的。假设你的工作副本是在版本100，但你要回顾一下版本50是什么样的——那你只要简单地更新到版本50就可以了。在同一个对话框中你还可以选择不递归更新当前文件夹(就是不更新所有的子文件夹)并且可以选择是否在更新中忽略外部的项目(比如具有属性 svn:externals的被引用的项目)." +#: source/TortoiseSVN_en.xml:6576(title) +msgid "Subversion Properties" +msgstr "Subversion 属性" -#: source/TortoiseSVN_en.xml:439(para) -msgid "All Subversion commands are available from the explorer context menu. TortoiseSVN adds its own submenu there." -msgstr "所有的 Subversion 命令存在于资源管理器的右键菜单，TortoiseSVN 在那里添加子菜单。" +#: source/TortoiseSVN_en.xml:6581(title) +msgid "Subversion property page" +msgstr "Subversion 属性页" -#: source/TortoiseSVN_en.xml:4404(para) -msgid "If you update a file or folder to a specific revision, you should not make changes to those files. You will get out of date error messages when you try to commit them! If you want to undo changes to a file and start afresh from an earlier revision, you can rollback to a previous revision from the revision log dialog. Take a look at for further instructions, and alternative methods." -msgstr "如果你把一个文件或是文件夹更新到某个特定的版本，你不应该对这些文件做修改。你在提交的时候会得到一个已经过期的错误消息!如果你要取消修改，从一个早前的版本重新开始，你可以通过版本日志对话框回滚到之前的版本。请看以获得详情和其他方法。" +#: source/TortoiseSVN_en.xml:6579(para) +msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseSVNproperties and within TSVN's status lists, from Context menuproperties." +msgstr " 你可以在 Windows 属性对话框读写 Subversion 属性。也可以从TortoiseSVN属性，或者 上下文菜单属性，来读写 Subversion 属性。" -#: source/TortoiseSVN_en.xml:4414(para) -msgid "Update to Revision can occasionally be useful to see what your project looked like at some earlier point in its history. But in general, updating individual files to an earlier revision is not a good idea as it leaves your working copy in an inconsistent state. If the file you are updating has changed name, you may even find that the file just disappears from your working copy because no file of that name existed in the earlier revision. If you simply want a local copy of an old version of a file it is better to use the Context MenuSave revision to... command from the log dialog for that file." -msgstr "更新到版本在你偶尔要看看你的项目在早前某时刻是什么样子的时候很有用。但通常，更新单个文件到之前的版本不是一个好主意，因为这会使你的工作副本处于不一致的状态。如果你要更新的文件已经改了名，你可能甚至发现该文件从你的工作副本中消失了，因为早期的版本中不存在这个名字的文件。如果你只是简单地想要一个旧版本文件的本地副本，最好是在该文件的日志对话框中使用右键菜单另存版本为...命令。" +#: source/TortoiseSVN_en.xml:6596(para) +msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in . For more information about properties in Subversion see the Special Properties." +msgstr "从版本库里删除数据的唯一方法就是使用svnadmin这个Subversion命令行工具。具体如何实现请参考《使用 Subversion 进行版本管理》。" -#: source/TortoiseSVN_en.xml:4433(title) -msgid "Multiple Files/Folders" -msgstr "多文件/文件夹" +#: source/TortoiseSVN_en.xml:6608(title) +msgid "Adding properties" +msgstr "增加属性" -#: source/TortoiseSVN_en.xml:4434(para) -msgid "If you select multiple files and folders in the explorer and then select Update, all of those files/folders are updated one by one. TortoiseSVN makes sure that all files/folders which are from the same repository are updated to the exact same revision! Even if between those updates another commit occurred." -msgstr "如果你在资源管理器中选择了多文件和文件夹，然后选择更新，这些文件/文件夹一个接一个的被更新。TortoiseSVN确保所有的来自同一版本库的文件/文件夹被更新到同一个版本!即使在更新过程中发生了另一个提交。" +#: source/TortoiseSVN_en.xml:6606(para) +msgid " To add a new property, first click on Add.... Select the required property name from the combo box, or type in a name of your own choice, then enter a value in the box below. Properties which take multiple values, such as an ignore list, can be entered on multiple lines. Click on OK to add that property to the list." +msgstr "为了增加新属性，先单击增加...，从组合框中选择需要的属性名称，或者输入你自定义的名称，然后在下面的编辑框内输入取值。有多个取值的属性，例如忽略列表，肯呢个输入多行。单极确认将属性增加到属性列表。" -#: source/TortoiseSVN_en.xml:4446(title) -msgid "Local File Already Exists" -msgstr "本地文件已经存在" +#: source/TortoiseSVN_en.xml:6618(para) +msgid "If you want to apply a property to many items at once, select the files/folders in explorer, then select Context menuproperties" +msgstr "如果你想一次性设置许多文件的属性，在资源管理器中选择文件/文件夹，然后选择上下文菜单属性。" -#: source/TortoiseSVN_en.xml:4447(para) -msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." -msgstr "有时在你试图更新的时候，更新失败，提示信息说已经有一个同名的本地文件。通常发生在Subversion试图检出一个新增的受控文件时，发现一个未受控的同名文件已经在工作路径中存在。Subversion绝不会覆盖一个未受控的文件——因为它有可能有你需要的东西，却碰巧与另一个开发者新提交的文件重名了。" +#: source/TortoiseSVN_en.xml:6626(para) +msgid "If you want to apply the property to every file and folder in the hierarchy below the current folder, check the Recursive checkbox." +msgstr "如果你想设置当前文件夹内的全部文件和文件夹，选中递归检查框。" -#: source/TortoiseSVN_en.xml:4456(para) -msgid "If you get this error message, the solution is simply to rename the local unversioned file. After completing the update, you can check whether the renamed file is still needed." -msgstr "如果你得到这个错误信息，解决的方法就是把本地的未受控文件重命名。在完成更新之后，你再检查被重命名的文件是不是还需要。" +#: source/TortoiseSVN_en.xml:6631(para) +msgid "Some properties, for example svn:needs-lock, can only be applied to files, so the property name doesn't appear in the drop down list for folders. You can still apply such a property recursively to all files in a hierarchy, but you have to type in the property name yourself." +msgstr "一些属性，例如svn:needs-lock只能用于文件，所以它们在文件夹的属性下拉列表内不会出现。你仍旧可以递归的设置目录树中所有文件的属性，但是需要你自己输入属性名称。" -#: source/TortoiseSVN_en.xml:446(para) -msgid "Since TortoiseSVN is a Subversion client, we would also like to show you some of the features of Subversion itself:" -msgstr "因为 TortoiseSVN 是一个 Subversion 客户端，我们也很愿意为你展示一些 Subversion 本身的特性: " +#: source/TortoiseSVN_en.xml:6638(para) +msgid "If you wish to edit an existing property, select that property from the list of existing properties, then click on Edit...." +msgstr "如果你想编辑一个已有属性，在已有属性列表中选择它，然后单击编辑...即可。" -#: source/TortoiseSVN_en.xml:4461(para) -msgid "If you keep getting error messages, use TortoiseSVNCheck for Modifications instead to list all the problem files. That way you can deal with them all at once." -msgstr "如果你一直得到错误，使用TortoiseSVN检查修改来列出所有有问题的文件。这样你可以一次性解决它们。" +#: source/TortoiseSVN_en.xml:6642(para) +msgid "If you wish to remove an existing property, select that property from the list of existing properties, then click on Remove." +msgstr "如果你想删除已有属性，在已有属性列表中选择它，然后单击删除即可。" -#: source/TortoiseSVN_en.xml:4474(title) -msgid "Resolving Conflicts" -msgstr "解决冲突" +#: source/TortoiseSVN_en.xml:6646(para) +msgid "The svn:externals property can be used to pull in other projects from the same repository or a completely different repository. For more information, read ." +msgstr "属性svn:externals可以用来下载位于同一版本库或不同版本库的其它工程。阅读以获得更多信息。" -#: source/TortoiseSVN_en.xml:4476(primary) -#: source/TortoiseSVN_en.xml:929(primary) -msgid "conflict" -msgstr "冲突" +#: source/TortoiseSVN_en.xml:6652(para) +msgid "TortoiseSVN can handle binary property values using files. To read a binary property value, Save... to a file. To set a binary value, use a hex editor or other appropriate tool to create a file with the content you require, then Load... from that file." +msgstr "TortoiseSVN可以处理文件的二进制属性。使用保存...到文件读取二进制属性值。使用十六进制编辑器或其它适当的工具创建文件，然后用从文件加载...设置二进制值为此文件的内容。" -#: source/TortoiseSVN_en.xml:4478(para) -msgid "" -"Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" -"<<<<<<< filename\n" -" your changes\n" -"=======\n" -" code merged from repository\n" -">>>>>>> revision\n" -" Also, for every conflicted file Subversion places three additional files in your directory: " -msgstr "" -"有时当你从版本库中更新你的文件时，会有冲突。冲突出现的原因是两个开发人员修改了文件中相同的几行。由于Subversion不知道你的项目的具体情况，它把解决冲突的工作留给了开发人员。一旦出现冲突，你就应该打开有问题的文件，查找以字符串<<<<<<<开头的行。有冲突的区域用如下的方式标记: \n" -"<<<<<<< filename\n" -" 你的修改\n" -"=======\n" -" 来自版本库中的代码\n" -">>>>>>> revision\n" -" 对于每个冲突的文件Subversion在你的目录下放置了三个文件: " +#: source/TortoiseSVN_en.xml:6659(para) +msgid "Although binary properties are not often used, they can be useful in some applications. For example if you are storing huge graphics files, or if the application used to load the file is huge, you might want to store a thumbnail as a property so you can obtain a preview quickly." +msgstr "尽管二进制文件不经常使用，它们在一些程序中是有用的。举例来说，如果你存储了巨大的图形文件，或者用程序加载的文件巨大，你可能想将缩略图作为属性存储，于是你可以快速的预览。" -#: source/TortoiseSVN_en.xml:4499(term) -msgid "filename.ext.mine" -msgstr "filename.ext.mine" +#: source/TortoiseSVN_en.xml:6666(title) +msgid "Commit properties" +msgstr "提交属性" -#: source/TortoiseSVN_en.xml:4501(para) -msgid "This is your file as it existed in your working copy before you updated your working copy - that is, without conflict markers. This file has your latest changes in it and nothing else." -msgstr "这是你的文件，在你更新你的工作副本之前存在于你的的工作副本中——也就是说，没有冲突标志。这个文件除了你的最新修改外没有别的东西。" +#: source/TortoiseSVN_en.xml:6667(para) +msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." +msgstr "Subversion 属性是受版本控制的。在你改变或增加属性后必须提交。" -#: source/TortoiseSVN_en.xml:4510(term) -msgid "filename.ext.rOLDREV" -msgstr "filename.ext.rOLDREV" +#: source/TortoiseSVN_en.xml:6673(title) +msgid "Conflicts on properties" +msgstr "属性冲突" -#: source/TortoiseSVN_en.xml:4512(para) -msgid "This is the file that was the BASE revision before you updated your working copy. That is, it the file that you checked out before you made your latest edits." -msgstr "这是在你更新你的工作副本之前的基础版本(BASE revision)文件。也就是说，它是在你做最后修改之前所检出的文件。" +#: source/TortoiseSVN_en.xml:6674(para) +msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." +msgstr "如果因为其他用户已经提交了同样的属性，提交时出现冲突，Subversion 会产生一个 .prej 文件。在你解决冲突后，请删除此文件。" -#: source/TortoiseSVN_en.xml:452(term) -msgid "Directory versioning" -msgstr "目录版本控制" +#: source/TortoiseSVN_en.xml:6682(title) +msgid "Automatic property setting" +msgstr "自动属性设置" -#: source/TortoiseSVN_en.xml:4521(term) -msgid "filename.ext.rNEWREV" -msgstr "filename.ext.rNEWREV" +#: source/TortoiseSVN_en.xml:6683(para) +msgid "You can configure Subversion to set properties automatically on files and folders when they are added to the repository. Read for further information." +msgstr "你可以设置当文件和文件夹加入版本库时，自动设置属性。阅读以获得更多信息。" -#: source/TortoiseSVN_en.xml:4523(para) -msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." -msgstr "这个文件是当你更新你的工作副本时，你的Subversion客户端从服务器接收到的。这个文件对应与版本库中的最新版本。" +#: source/TortoiseSVN_en.xml:6691(title) +msgid "TortoiseSVN Properties" +msgstr "TortoiseSVN 属性" -#: source/TortoiseSVN_en.xml:4533(para) -msgid "You can either launch an external merge tool / conflict editor with TortoiseSVNEdit Conflicts or you can use any other editor to manually resolve the conflict. You should decide what the code should look like, do the necessary changes and save the file." -msgstr "你可以通过TortoiseSVN编辑冲突运行外部合并工具/冲突编辑器，或者你可以使用任何别的编辑器手动解决冲突。你需要冲定哪些代码是需要的，做一些必要的修改然后保存。" +#: source/TortoiseSVN_en.xml:6697(para) +msgid "tsvn:logminsize sets the minimum length of a log message for a commit. If you enter a shorter message than specified here, the commit is disabled. This feature is very useful for reminding you to supply a proper descriptive message for every commit. If this property is not set, or the value is zero, empty log messages are allowed." +msgstr "tsvn:logminsize设置提交日志的最小长度。如果你输入的日志短于预设值，提交会被禁止。这个属性对于提醒你为每次提交提供一个适当的描述信息非常有用。如果不设置这个属性，或者设置为0，那么就允许空提交信息。" -#: source/TortoiseSVN_en.xml:454(para) -msgid "CVS only tracks the history of individual files, but Subversion implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." -msgstr "CVS 只能追踪单个文件的历史，但是 Subversion 实现了一个虚拟文件系统，可以追踪整个目录树的修改，文件和目录都是版本控制的，结果就是可以在客户端对文件和目录执行移动和复制命令。" +#: source/TortoiseSVN_en.xml:6706(para) +msgid "tsvn:lockmsgminsize sets the minimum length of a lock message. If you enter a shorter message than specified here, the lock is disabled. This feature is very useful for reminding you to supply a proper descriptive message for every lock you get. If this property is not set, or the value is zero, empty lock messages are allowed." +msgstr "tsvn:lockmsgminsize设置锁定日志的最小长度。如果你输入的日志短于预设值，加锁会被禁止。这个属性对于提醒你为每次加锁提供一个适当的描述信息非常有用。如果不设置这个属性，或者设置为0，那么就允许空加锁信息。" -#: source/TortoiseSVN_en.xml:4544(para) -msgid "Afterwards execute the command TortoiseSVNResolved and commit your modifications to the repository. Please note that the Resolve command does not really resolve the conflict. It just removes the filename.ext.mine and filename.ext.r* files, to allow you to commit your changes." -msgstr "然后，执行命令TortoiseSVN已解决并提交人的修改到版本库。需要注意的是已解决命令并不是真正的解决了冲突，它只是删除了filename.ext.mine和filename.ext.r*两个文件，允许你提交修改。" +#: source/TortoiseSVN_en.xml:6717(para) +msgid "tsvn:logwidthmarker is used with projects which require log messages to be formatted with some maximum width (typically 80 characters) before a line break. Setting this property to a non-zero will do 2 things in the log message entry dialog: it places a marker to indicate the maximum width, and it disables word wrap in the display, so that you can see whether the text you entered is too long. Note: this feature will only work correctly if you have a fixed-width font selected for log messages." +msgstr "tsvn:logwidthmarker用在要求日志信息被格式化为在最大宽度(典型是80字符)处换行非常有用。设置此属性为大于0的值会在日志消息对话框中做两件事: 放置一个标记指示最大宽度，和禁止自动换行，于是你可以看到输入的信息是否太长。注意: 这个特性仅在你选择的消息使用固定宽度字体时才能正确工作。" -#: source/TortoiseSVN_en.xml:4557(para) -msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." -msgstr "如果你的二进制文件有冲突，Subversion不会试图合并文件。本地文件保持不变(完全是你最后修改时的样子)，但你会看到filename.ext.r*文件。如果你要撤消你的修改，保留版本库中的版本，请使用还原(Revert)命令。如果你要保持你的版本覆盖版本库中的版本，使用已解决命令，然后提交你的版本。" +#: source/TortoiseSVN_en.xml:6730(para) +msgid "tsvn:logtemplate is used with projects which have rules about log message formatting. The property holds a multi-line text string which will be inserted in the commit message box when you start a commit. You can then edit it to include the required information. Note: if you are also using tsvn:logminsize, be sure to set the length longer than the template or you will lose the protection mechanism." +msgstr "tsvn:logtemplate在需要定义日志消息格式化规则的工程中使用。在你开始提交时，这个属性的多行消息会被插入日志消息编辑框。你可以编辑它以便包含需要的信息。注意: 如果你使用了tsvn:logminsize属性，请确认这个长度大于模版的长度，不然就会失去其保护作用。" -#: source/TortoiseSVN_en.xml:4567(para) -msgid "You can use the Resolved command for multiple files if you right click on the parent folder and select TortoiseSVNResolved... This will bring up a dialog listing all conflicted files in that folder, and you can select which ones to mark as resolved." -msgstr "你可以右击父文件夹，选择TortoiseSVN已解决...，使用“已解决”命令来解决多个文件。这个操作会出现一个对话框，列出文件夹下所有有冲突的文件，你可以选择将哪些标记成已解决。" +#: source/TortoiseSVN_en.xml:6741(para) +msgid "In the Commit dialog you have the option to paste in the list of changed files, including the status of each file (added, modified, etc). tsvn:logfilelistenglish defines whether the file status is inserted in english or in the localized language. If the property is not set, the default is true." +msgstr "在提交对话框，你可以复制修改的文件列表，包含每个文件的状态(增加，修改等)。tsvn:logfilelistenglish定义了文件状态用英文插入，还是用本地消息插入。此属性的默认值是真。" -#: source/TortoiseSVN_en.xml:4580(title) -msgid "Getting Status Information" -msgstr "获得状态信息" +#: source/TortoiseSVN_en.xml:6752(para) +msgid "TortoiseSVN can use spell checker modules which are also used by OpenOffice and Mozilla. If you have those installed this property will determine which spell checker to use, i.e. in which language the log messages for your project should be written. tsvn:projectlanguage sets the language module the spell checking engine should use when you enter a log message. You can find the values for your language on this page: MSDN: Language Identifiers." +msgstr "TortoiseSVN可以使用OpenOffice和Mozilla使用的拼写检查模块。如果你安装了这些模块，那么这个属性将检测使用哪个拼写检查模块。也就是，你的工程的日志信息用的语言。tsvn:projectlanguage设置拼写检查引擎应该使用什么语言模块来检查日志信息。你可以在这个叶面找到你的语言的取值: MSDN: 语言标示符。" -#: source/TortoiseSVN_en.xml:4582(primary) -#: source/TortoiseSVN_en.xml:4741(primary) -msgid "status" -msgstr "状态" +#: source/TortoiseSVN_en.xml:6766(para) +msgid "You can enter this value in decimal, or in hexadecimal if prefixed with 0x. For example English (US) can be entered as 0x0409 or 1033." +msgstr "你可以用十进制输入取值，如果用0x前缀的话，也可以用十六进制。例如英语(美国英语)可以输入0x0409或者1033。" -#: source/TortoiseSVN_en.xml:4584(para) -msgid "While you are working on your working copy you often need to know which files you have changed/added/removed or renamed, or even which files got changed and committed by others." -msgstr "当你在你的工作副本上工作时，你时常需要知道哪些文件你已经修改/增加/删除或改名了，或者甚至是哪个文件已经被其他人修改并提交了。" +#: source/TortoiseSVN_en.xml:6774(para) +msgid "When you want to add a new property, you can either pick one from the list in the combo box, or you can enter any property name you like. If your project uses some custom properties, and you want those properties to appear in the list in the combo box (to avoid typos when you enter a property name), you can create a list of your custom properties using tsvn:userfileproperties and tsvn:userdirproperties. Apply these properties to a folder. When you go to edit the properties of any child item, your custom properties will appear in the list of pre-defined property names." +msgstr "当你想增加新属性时，你可以从组合框的下拉列表选取，也可以输入你喜欢的任何属性名称。如果你的项目使用了自定义属性，并且想让这些属性出现在组合框的下拉列表中(避免输入时拼写错误)，你可以使用tsvn:userfileproperties和tsvn:userdirproperties创建自定义属性列表。对目录应用这些属性，当你编辑其任何子项属性时，你自定义的属性将会在预定义属性名称列表中出现。" -#: source/TortoiseSVN_en.xml:4592(primary) -msgid "overlays" -msgstr "重载" +#: source/TortoiseSVN_en.xml:6692(para) +msgid "TortoiseSVN has a few special properties of its own, and these begin with tsvn:. " +msgstr "TortoiseSVN 有自己专用的几个属性，它们都有tsvn:前缀。" -#: source/TortoiseSVN_en.xml:4595(primary) -msgid "icons" -msgstr "图标" +#: source/TortoiseSVN_en.xml:6790(para) source/TortoiseSVN_en.xml:8683(para) +msgid "Some tsvn: properties require a true/false value. TSVN also understands yes as a synonym for true and no as a synonym for false." +msgstr "一些 tsvn: 属性需要 true/false 值。它也理解 yes 是 true 的同义词，no 是 false的同义词。" -#: source/TortoiseSVN_en.xml:4603(para) -msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseSVN is so popular. TortoiseSVN adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." -msgstr "现在你已经从Subversion版本库中检出了一份工作副本，你可以在资源管理器中看一下这些文件的图标有什么变化。这也正是TortoiseSVN这么流行的原因之一。TortoiseSVN加入了被称为重载图标的功能重载了原始的文件图标。根据文件的Subversion状态的不同，重载的图标也不同。" +#: source/TortoiseSVN_en.xml:6797(title) +msgid "Set the tsvn: properties on folders" +msgstr "设置文件夹的 tsvn: 属性" -#: source/TortoiseSVN_en.xml:4611(para) -msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." -msgstr " 一个新检出的工作副本使用绿色的对勾做重载。表示Subversion状态正常." +#: source/TortoiseSVN_en.xml:6798(para) +msgid "These tsvn: properties must be set on folders for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseSVN will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. C:\\) is found. If you can be sure that each user checks out only from e.g trunk/ and not some subfolder, then it is sufficient to set the properties on trunk/. If you can't be sure, you should set the properties recursively on each subfolder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to trunk/)." +msgstr "属性tsvn:只能在文件夹设置。当你提交文件或文件夹时，这些属性从文件夹读取。如果没有发现这些属性，TortoiseSVN会向上级目录搜索，直到未版本控制的文件夹，或到达根目录(例如 C:\\) 。如果你确认每个用户都是从同一个目录检出，例如trunk/，而不是其它子目录，那么只在trunk/设置属性就足够了。如果你不能确定，那么应当递归的设置每个子目录。深层的设置覆盖高层的设置 (靠近 trunk/)。" -#: source/TortoiseSVN_en.xml:4616(para) -msgid " As soon as you start editing a file, the status changes to modified and the icon overlay then changes to a red exclamation mark. That way you can easily see which files were changed since you last updated your working copy and need to be committed." -msgstr "在你开始编辑一个文件后，状态就变成了已修改，而图标重载变成了红色感叹号。通过这种方式，你可以很容易地看出哪些文件从你上次更新工作副本后被修改过，需要被提交。" +#: source/TortoiseSVN_en.xml:6812(para) source/TortoiseSVN_en.xml:8705(para) +#: source/TortoiseSVN_en.xml:8807(para) +msgid "For tsvn: properties only you can use the Recursive checkbox to set the property to all subfolders in the hierarchy, without also setting it on all files." +msgstr "对于tsvn:属性，你只能对于所有子目录使用递归检查框设置属性，不能设置文件的属性。" -#: source/TortoiseSVN_en.xml:4624(para) -msgid " If during an update a conflict occurs then the icon changes to a yellow exclamation mark." -msgstr "如果在提交的过程中出现了冲突图标变成黄色感叹号。" +#: source/TortoiseSVN_en.xml:6819(para) +msgid "TortoiseSVN can integrate with some bugtracking tools. This uses properties, which start with bugtraq:. Read for further information." +msgstr "TortoiseSVN可以与一些问题跟踪工具集成。它使用bugtraq:开始的属性。阅读以便获得更多信息。" -#: source/TortoiseSVN_en.xml:4629(para) -msgid " If you have set the svn:needs-lock property on a file, Subversion makes that file read-only until you get a lock on that file. Read-only files have this overlay to indicate that you have to get a lock first before you can edit that file." -msgstr "如果你给一个文件设置了svn:needs-lock属性，Subversion会让此文件只读，直到你获得文件锁。只读文件具有这个重载图标来表示你必须在编辑之前先得到一个锁。" +#: source/TortoiseSVN_en.xml:6824(para) +msgid "It can also integrate with some web-based repository browsers. Read for further information." +msgstr "它也与一些基于WEB的版本库浏览器集成。阅读以获得更多信息。" -#: source/TortoiseSVN_en.xml:4636(para) -msgid " If you hold a lock on a file, and the Subversion status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." -msgstr "如果你拥有了一个文件的锁，并且Subversion状态是正常，这个重载图标就提醒你如果不使用该文件的话应该释放锁，允许别人提交对该文件的修改。" +#: source/TortoiseSVN_en.xml:6831(title) +msgid "Branching / Tagging" +msgstr "分支/标记" -#: source/TortoiseSVN_en.xml:4643(para) -msgid " This icon shows you that some files or folders inside the current folder have been scheduled to be deleted from version control or a file under version control is missing in a folder." -msgstr "这个图标表示当前文件夹下的某些文件或文件夹已经被计划从版本控制中删除，或是该文件夹下某个受控的文件丢失了。" +#: source/TortoiseSVN_en.xml:6833(primary) +msgid "branch" +msgstr "分支" -#: source/TortoiseSVN_en.xml:4649(para) -msgid " The plus sign tells you that a file or folder has been scheduled to be added to version control." -msgstr "加号告诉你有一个文件或是目录已经被计划加入版本控制。" +#: source/TortoiseSVN_en.xml:6836(primary) +msgid "tag" +msgstr "标记" -#: source/TortoiseSVN_en.xml:4654(para) -msgid "Unlike TortoiseCVS (the CVS shell integration) no overlay icon for unversioned files is shown. We do this because the number of icon overlays are limited system wide and should be used economically." -msgstr "与TortoiseCVS (一个集成的CVS shell)不同，对于未受控的文件没有图标重载。这么做是因为图标重载的数量受到系统的限制，应该要节约使用。" +#: source/TortoiseSVN_en.xml:6842(para) +msgid "One of the features of version control systems is the ability to isolate changes onto a separate line of development. This line is known as a branch. Branches are often used to try out new features without disturbing the main line of development with compiler errors and bugs. As soon as the new feature is stable enough then the development branch is merged back into the main branch (trunk)." +msgstr "版本控制系统的一个特性是能够把各种修改分离出来放在开发品的一个分割线上。这条线被称为分支。分支经常被用来试验新的特性，而不会对开发有编译错误的干扰。当新的特性足够稳定之后，开发品的分支就可以混合回主分支里(主干线)." -#: source/TortoiseSVN_en.xml:4660(para) -msgid "In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is limited to 15. Windows uses 4 of those, and the remaining 11 can be used by other applications. If you are also using TortoiseCVS, then there are not enough overlay slots available, so TortoiseSVN tries to be a Good Citizen (TM) and limits its use of overlays to give other apps a chance." -msgstr "事实上，你会发现并不是所有的图标被使用在你的系统上。这是由于Windows限制图标重载不能超过15个。Windows自己用了4个，剩下11个可被别的应用程序使用。如果你同时使用了TortoiseCVS，就没有足够的空位了，所以TortoiseSVN希望成为一个良好市民(TM)，限制自身的使用，为别的应用留下机会。" +#: source/TortoiseSVN_en.xml:6852(para) +msgid "Another feature of version control systems is the ability to mark particular revisions (e.g. a release version), so you can at any time recreate a certain build or environment. This process is known as tagging." +msgstr "版本控制系统的另一个特性是能够标记特殊的版本(例如某个发布版本)，所以你可以在任何时候重新建立一个特定的构件和环境。这个过程被称作标记。" -#: source/TortoiseSVN_en.xml:467(term) -msgid "Atomic commits" -msgstr "原子提交" +#: source/TortoiseSVN_en.xml:6858(para) +msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." +msgstr "Subversion 没有用于建立分支和标记的特殊命令，但是使用所谓的便宜复制来代替。便宜复制类似于Unix里的硬连接，它意思是代替一个版本库里的完整的复制，创建一个内部的连接，指向一个具体的版本树。结果分支和标记就迅速被创建，并且没有在版本库里占据任何额外的空间。" -#: source/TortoiseSVN_en.xml:4670(para) -msgid "Normal, Modified and Conflicted are always loaded and visible." -msgstr "正常, 已修改和冲突总是被载入，并可见。" +#: source/TortoiseSVN_en.xml:6868(title) +msgid "Creating a Branch or Tag" +msgstr "创建一个分支或标记" -#: source/TortoiseSVN_en.xml:4678(para) -msgid "Deleted is loaded if possible, but falls back to Modified if there are not enough slots." -msgstr "已删除只要有可能的就载入，但如果没有足够的空位，就使用已修改来代替。" +#: source/TortoiseSVN_en.xml:6873(title) +msgid "The Branch/Tag Dialog" +msgstr "分支/标记对话框" -#: source/TortoiseSVN_en.xml:4685(para) -msgid "ReadOnly is loaded if possible, but falls back to Normal if there are not enough slots." -msgstr "只读只要有可能就载入，但如果没有足够的空位就使用正常来代替。" +#: source/TortoiseSVN_en.xml:6869(para) +msgid "If you have imported your project with the recommended directory structure, creating a branch or tag version is very simple: Select the folder in your working copy which you want to copy to a branch or tag, then select the command TortoiseSVNBranch/Tag...." +msgstr "如果你用推荐的目录结构导入了一个工程，那么创建分支或标记就非常简单: 在你当前的工作副本中给你你想要复制的分支或标记选择一个目录，然后选择命令TortoiseSVN分支/标记...。" -#: source/TortoiseSVN_en.xml:469(para) -msgid "A commit either goes into the repository completely, or not at all. This allows developers to construct and commit changes as logical chunks." -msgstr "提交要么完全进入版本库，要么一点都没有，这允许开发者以一个逻辑块提交修改。" +#: source/TortoiseSVN_en.xml:6883(para) +msgid "" +"The default destination URL for the new branch will be the source URL on which your working copy is based. You will need to edit that URL to the new path for your branch/tag. So instead of \n" +" http://svn.collab.net/repos/ProjectName/trunk\n" +" you might now use something like \n" +" http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n" +" If you can't remember the naming convention you used last time, click the button on the right to open the repository browser so you can view the existing repository structure." +msgstr "" +"默认的目标URL将会是你当前工作副本所处的源URL。你必须给你的分支/标记编辑一个新路径。来取代\n" +" http://svn.collab.net/repos/ProjectName/trunk\n" +"你可以使用这样的设置 \n" +" http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n" +"如果你忘记了你上一次使用的命名约定，可以用鼠标右键打开版本库浏览器来察看已经存在的版本库结构。" -#: source/TortoiseSVN_en.xml:4692(para) -msgid "Locked is only loaded if there are fewer than 13 overlays already loaded. It falls back to Normal if there are not enough slots." -msgstr "已锁定只在少于13个重载已经载入的情况下才加载，如果不满足这个条件就使用正常来代替。" +#: source/TortoiseSVN_en.xml:6904(term) +#: source/TortoiseSVN_en.xml:11997(listitem) +msgid "HEAD revision in the repository" +msgstr "版本库中的最新版本" -#: source/TortoiseSVN_en.xml:47(para) -msgid "Have you ever saved a file, and then wanted to revert the changes you made? Have you ever wished you could see what a file looked like some time ago?" -msgstr "是否曾经保存完一个修改，然后又想把个文件恢复到修改以前的状态？是否曾经希望能够看到一个文件以前某个时间点的状态？" +#: source/TortoiseSVN_en.xml:6906(para) +msgid "The new branch is copied directly in the repository from the HEAD revision. No data needs to be transferred from your working copy, and the branch is created very quickly." +msgstr "新分支直接从仓库中的最新版本里复制出来。不需要从你的工作副本中传输任何数据，这个分支的建立是非常快的。" -#: source/TortoiseSVN_en.xml:4700(para) -msgid "Added is only loaded if there are fewer than 14 overlays already loaded. It falls back to Modified if there are not enough slots." -msgstr "已增加只在少于14个重载已经载入的情况下才加载，如果不满足这个条件就使用已修改来代替" +#: source/TortoiseSVN_en.xml:6915(term) +msgid "Specific revision in the repository" +msgstr "在版本库中指定具体的版本" -#: source/TortoiseSVN_en.xml:4710(title) -msgid "TortoiseSVN Columns In Windows Explorer" -msgstr "在 Windows 资源管理器中的 TortoiseSVN 列" +#: source/TortoiseSVN_en.xml:6917(para) +msgid "The new branch is copied directly in the repository but you can choose an older revision. This is useful if you forgot to make a tag when you released your project last week. If you can't remember the revision number, click the button on the right to show the revision log, and select the revision number from there. Again no data is transferred from your working copy, and the branch is created very quickly." +msgstr "在仓库中直接复制建立一个新分支同时你也可以选择一个旧版本。假如在你上周发布了项目时忘记了做标记，这将非常有用。如果你记不起来版本号，通过点击鼠标右键来显示版本日志，同时从这里选取版本号。和上次一样不需要从你的工作副本中传输任何数据，这个分支建立起来是非常快的。" -#: source/TortoiseSVN_en.xml:4712(primary) -msgid "Explorer Columns" -msgstr "资源管理器的列" +#: source/TortoiseSVN_en.xml:6930(term) +#: source/TortoiseSVN_en.xml:11999(listitem) +msgid "Working copy" +msgstr "工作副本" -#: source/TortoiseSVN_en.xml:4714(para) -msgid "The same information which is available from the icon overlays (and much more) can be displayed as additional columns in Windows Explorer's Details View." -msgstr "在Windows资源管理器的详细信息视图中，附加列中可以显示与图标重载所表达相同的信息(还可以显示更多其他信息)。" +#: source/TortoiseSVN_en.xml:6932(para) +msgid "The new branch is an identical copy of your local working copy. If you have updated some files to an older revision in your WC, or if you have made local changes, that is exactly what goes into the copy. Naturally this sort of complex tag may involve transferring data from your WC back to the repository if it does not exist there already." +msgstr "新的分支是一个完全等同于你的本地工作副本的一个副本。如果你更新了一些文件到你的工作副本的某个旧版本里，或者你在本地做出了修改，这些改变将准确无误的进入副本中。自然而然地这种综合的标记会包含正在从工作副本传输到版本库的数据，如果这些数据还不存在的话。" -#: source/TortoiseSVN_en.xml:4719(para) -msgid "Simply right click on one of the headings of a column, choose More... from the context menu displayed. A dialog will appear where you can specify the columns and their order, which is displayed in the \"Detailed View\". Scroll down until the entries starting with SVN come into view. Check the ones you would like to have displayed and close the dialog by pressing OK. The columns will be appended to the right of those currently displayed. You can reorder them by drag and drop, or resize them, so that they fit your needs." -msgstr "右键点击列头，从出现的右键菜单中选择其他...。出现一个对话框，你可以指定在“详细信息视图”中要显示的列及其顺序。滚动对话框中的条目直到SVN开头的条目出现。在你要显示的条目上打勾，然后点击OK按扭关闭对话框。你选择的列就会出现在当前显示的列的右边。你可以通过拖放它们来达到重新排序或是修改列宽度的目的。" +#: source/TortoiseSVN_en.xml:6899(para) +msgid "Now you have to select the source of the copy. Here you have three options: " +msgstr "现在你必须选择要复制的源位置。在这里你有三个设置选项: " -#: source/TortoiseSVN_en.xml:4731(para) -msgid "If you want the current layout to be displayed in all your working copies, you may want to make this the default view." -msgstr "如果你想要当前的布局对你所有的工作副本都有效，你可以考虑把它设成默认视图。" +#: source/TortoiseSVN_en.xml:6945(para) +msgid "If you want your working copy to be switched to the newly created branch automatically, use the Switch working copy to new branch/tag checkbox. But if you do that, first make sure that your working copy does not contain modifications. If it does, those changes will be merged into the branch WC when you switch." +msgstr "如果你想把你的工作副本自动切换到最新创建的分支，使用转换工作副本至新分支/标记 选择框.但是如果你打算这么做，首先要确认你的工作副本没有被修改。如果有修改的话，当你转换后这些修改将会混合进你的工作副本分支里。" -#: source/TortoiseSVN_en.xml:4739(title) -msgid "Local and Remote Status" -msgstr "本地与远程状态" +#: source/TortoiseSVN_en.xml:6953(para) +msgid "Press OK to commit the new copy to the repository. Don't forget to supply a log message. Note that the copy is created inside the repository." +msgstr "按下确认提交新副本到版本库中。别忘了提供一条日志信息。需要注意的是这个副本是在版本库内部创建的。" -#: source/TortoiseSVN_en.xml:4744(primary) -msgid "modifications" -msgstr "修改" +#: source/TortoiseSVN_en.xml:6958(para) +msgid "Note that creating a Branch or Tag does not affect your working copy. Even if you copy your WC, those changes are committed to the new branch, not to the trunk, so your WC may still be marked as modified." +msgstr "需要注意建立一个分支或标记不会影响你的工作副本。即使你复制了你的工作副本，这些修改也会提交到新分支里，而不是到主干里，所以你的工作副本可能仍然标记为已修改状态。" -#: source/TortoiseSVN_en.xml:4746(para) -msgid " It's often very useful to know which files you have changed and also which files got changed and committed by others. That's where the command TortoiseSVNCheck For Modifications... comes in handy. This dialog will show you every file that has changed in any way in your working copy, as well as any unversioned files you may have." -msgstr " 通常知道你修改了哪些文件以及哪些文件已经由另人修改并提交了是很有用的。这就是命令TortoiseSVNCheck For Modifications... 的用武之地了。这个对话框显示了所有你的工作副本中进行了任何形式的修改的的文件，也包括了当前存在的未受控的文件。" +#: source/TortoiseSVN_en.xml:6966(title) +msgid "To Checkout or to Switch..." +msgstr "检出或者切换" -#: source/TortoiseSVN_en.xml:4763(para) -msgid "If you click on the Check Repository then you can also look for changes in the repository. That way you can check before an update if there's a possible conflict. You can also update selected files from the repository without updating the whole folder." -msgstr "如果你点击检查版本库，那你还可以看到版本库里的改动。这样，你就可以在提交之前检查是否有存在冲突的可能。你也可以从版本库中更新选中的文件而用不着更新整个文件夹。" +#: source/TortoiseSVN_en.xml:6969(primary) +msgid "switch" +msgstr "切换" -#: source/TortoiseSVN_en.xml:477(term) -msgid "Versioned metadata" -msgstr "版本控制的元数据" +#: source/TortoiseSVN_en.xml:6971(para) +msgid "...that is (not really) the question. While a checkout checks out everything from the desired branch into your working directory, TortoiseSVNSwitch... only transfers the changed data to your working copy. Good for the network load, good for your patience. :-)" +msgstr "...这是个小问题。当你想从预期的分支检出所有数据到你的工作副本目录时TortoiseSVN切换... 仅仅传输已经被修改的数据到你的工作副本中。这样能减轻你的网络负担，也能减少你的耐心。" -#: source/TortoiseSVN_en.xml:4771(para) -msgid "The dialog uses colour coding to highlight the status. " -msgstr "对话框使用颜色代码来高亮显示状态。" +#: source/TortoiseSVN_en.xml:6987(para) +msgid "TortoiseSVNCheckout to make a fresh checkout in an empty folder. You can check out to any location on your local disk and you can create as many working copies from your repository as you like." +msgstr "TortoiseSVN检出一个最新的项目在一个空目录下。你可以在你的本地磁盘上的任意位置进行检出操作，同时你可以从版本库中按照你的意愿建立出任意数量的副本。" -#: source/TortoiseSVN_en.xml:4777(para) -msgid "Locally modified items." -msgstr "本地被修改过的项" +#: source/TortoiseSVN_en.xml:6999(para) +msgid "Switch your current working copy to the newly created copy in the repository. Again select the top level folder of your project and use TortoiseSVNSwitch... from the context menu." +msgstr "在版本库中从你当前的工作副本切换到最新建立的副本。再一次选择你的项目所处的顶级文件夹然后在菜单中使用TortoiseSVN切换...。" -#: source/TortoiseSVN_en.xml:4785(para) -msgid "Added items. Items which have been added with history have a + sign in the Text status column, and a tooltip shows where the item was copied from." -msgstr "增加的项。那些被加入的项在文本状态列中有个+号表示，工具提示(tooltip shows)显示了该项是从哪里复制来的。 where the item was copied from." +#: source/TortoiseSVN_en.xml:7009(para) +msgid "In the next dialog enter the URL of the branch you just created. Select the Head Revision radio button and click on OK. Your working copy is switched to the new branch/tag." +msgstr "在接下来的对话框中蠕蠕你刚才建立的分支的URL。选择最新版本单选按钮然后确认。你的工作副本就切换到了最新的分支/标记。" -#: source/TortoiseSVN_en.xml:479(para) -msgid "Each file and directory has an invisible set of properties attached. You can invent and store any arbitrary key/value pairs you wish. Properties are versioned over time, just like file contents." -msgstr "每个文件和目录都有一组附加的属性，你可以发明和保存任意的键/值对，属性是版本控制的，就像文件内容。" +#: source/TortoiseSVN_en.xml:7017(para) +msgid "Switch works just like Update in that it never discards your local changes. Any changes you have made to your working copy which have not yet been committed will be merged when you do the Switch. If you do not want this to happen then you must either commit the changes before switching, or revert your working copy to an already-committed revision (typically HEAD)." +msgstr "切换操作起来就象更新，因为它没有丢弃你在本地做的修改。在工作副本里当你进行切换的时候任何没有提交过的修改都会被混合。如果你不想看到这样的结果，那么你可以有两种选择，要么在切换前提交修改，要么把工作副本恢复到一个已经提交过的版本(比如最新版本)。" -#: source/TortoiseSVN_en.xml:4797(para) -msgid "Deleted or missing items." -msgstr "删除的或是丢失的项。" +#: source/TortoiseSVN_en.xml:7028(title) +msgid "The Switch Dialog" +msgstr "切换对话框" -#: source/TortoiseSVN_en.xml:4805(para) -msgid "Items modified locally and in the repository. The changes will be merged on update. These may produce conflicts on update." -msgstr "在本地和版本库中都有被修改过的项。改动将在更新的时候被合并。这种情况很可能在更新的时候产生冲突。" +#: source/TortoiseSVN_en.xml:6982(para) +msgid "To be able to work with your freshly generated copy you have several ways to handle it. You can: " +msgstr "为了能够使用你最新产生的副本你有采用下面几种方法。你可以: " -#: source/TortoiseSVN_en.xml:4815(para) -msgid "Items modified locally and deleted in repository, or modified in repository and deleted locally. These will produce conflicts on update." -msgstr "在本地被修改过但在版本库中已经被删除的项，或者在版本库中被修改但在本地被删除的项。这种情况必将在更新时产生冲突。" +#: source/TortoiseSVN_en.xml:7037(para) +msgid "Tags are typically used to create a static snapshot of the project at a particular stage. As such they not normally used for development - that's what branches are for, which is the reason we recommended the /trunk /branches /tags repository structure in the first place. Working on a tag revision is not a good idea, but because your local files are not write protected there is nothing to stop you doing this by mistake. However, if you try to commit to a path in the repository which contains /tags/, TortoiseSVN will warn you." +msgstr "在某个特殊的阶段标记被用来建立一个项目的静态映像。同样地标记和分支应该被独特地应用于开发品。这就是我们首选推荐 /trunk /branches /tags这样的版本库结构的原因。使用标记的版本并不是一个好想法，因为你的本地文件没有写保护，你这样做容易犯错误。不管怎样如果你试着提交(修改)到一个包含/标记/的版本库路径下，TortoiseSVN 会给你警告。" -#: source/TortoiseSVN_en.xml:4825(para) -msgid "Unchanged and unversioned items." -msgstr "未修改和未受控的项。" +#: source/TortoiseSVN_en.xml:7053(para) +msgid "It may be that you need to make further changes to a release which you have already tagged. The correct way to handle this is to create a new branch from the tag first and commit the branch. Do your Changes on this branch and then create a new tag from this new branch, e.g. Version_1.0.1." +msgstr "如果你想要在一个已经标记的发布版上做更多的修改。正确的操作方法是先从标记处建立一个新分支然后提交这个分支。在这个分支的基础上进行修改后再从这个新分支上建立一个新标记，例如 Version_1.0.1。" -#: source/TortoiseSVN_en.xml:4843(para) -msgid "From the context menu of the dialog you can show a diff of the changes. Check the local changes you made using Context MenuCompare with Base. Check the changes in the repository made by others using Context MenuShow Differences as Unified Diff." -msgstr "在对话框的上下文菜单中你可以显示改变的差异。使用 上下文菜单与基础版本比较检查你所作的本地修改。使用上下文菜单使用标准差异格式显示差异检查版本库中别人作的修改。" +#: source/TortoiseSVN_en.xml:7063(para) +msgid "If you modify a working copy created from a branch and commit, then all changes go to the new branch and not the trunk. Only the modifications are stored. The rest remains a cheap copy." +msgstr "如果你修改了一个从分支建立的工作副本然后又提交了这个副本，那么所有的修改会转到一个新分支里而不是 主干。仅仅是存储了修改的数据。其余的数据还是便宜复制。" -#: source/TortoiseSVN_en.xml:4856(para) -msgid "You can also revert changes in individual files. If you have deleted a file accidentally, it will show up as Missing and you can use Revert to recover it." -msgstr "你还可以对单个文件进行还原(revert)。如果你不小心删除了一个文件，在对话框中会显示为丢失你可以使用还原来恢复它。" +#: source/TortoiseSVN_en.xml:7032(para) +msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " +msgstr "尽管Subversion本身不区分标记和分支，它们的使用方法还是有些不同。" -#: source/TortoiseSVN_en.xml:4861(para) -msgid "Unversioned and ignored files can be sent to the recycle bin from here using Context MenuDelete. If you want to delete files permanently (bypassing the recycle bin) hold the Shift key while clicking on Delete." -msgstr "可以使用邮件菜单删除将未版本控制的或忽略的文件丢到垃圾箱。如果你想彻底删除(不使用垃圾箱)，在点击删除时，请按着Shift键。" +#: source/TortoiseSVN_en.xml:7076(title) +msgid "Merging" +msgstr "正在合并" -#: source/TortoiseSVN_en.xml:4870(para) -msgid "If you want to examine a file in detail, you can drag it from here into another application such as a text editor or IDE." -msgstr "如果你要查询一个文件的详细情况，你可以把它从这里拖到另一个应用程序，比如一个文本编辑器或是IDE中。" +#: source/TortoiseSVN_en.xml:7079(primary) +msgid "merge" +msgstr "合并" -#: source/TortoiseSVN_en.xml:4874(para) -msgid "The columns are customizable. If you right click on any column header you will see a context menu allowing you to select which columns are displayed. You can also change column width by using the drag handle which appears when you move the mouse over a column boundary. These customizations are preserved, so you will see the same headings next time." -msgstr "这些列是可定制的。如果你右击任何一列的头部，你就会看到一个上下文菜单，允许你选择哪一列要显示。还可以在鼠标移动到列边界时通过拖动把手来改变列的宽度。这些定制的内容都会被保留下来，下一次你会见到相同的头部。" +#: source/TortoiseSVN_en.xml:7081(para) +msgid "Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa." +msgstr "分支用来维护独立的开发支线，在一些阶段，你可能需要将分支上的修改合并到最新版本，或者将最新版本的修改合并到分支。" -#: source/TortoiseSVN_en.xml:4883(para) -msgid "If you are working on several unrelated tasks at once, you can also group files together into changelists. Read for more information." -msgstr "如果你同时做几个不相关的任务，也可以在修改列表中分组文件。阅读以获得更多信息。" +#: source/TortoiseSVN_en.xml:7086(para) +msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." +msgstr "因为分支与合并很复杂，所以在你开始使用之前，请先理解它是怎么工作的。强烈建议你阅读《使用 Subversion 进行版本管理》的分支与合并章节，它给出了全面的描述，和许多使用举例。" -#: source/TortoiseSVN_en.xml:4888(para) -msgid "At the bottom of the dialog you can see a summary of the range of repository revisions in use in your working copy. These are the commit revisions, not the update revisions; they represent the range of revisions where these files were last committed, not the revisions to which they have been updated. Note that the revision range shown applies only to the items displayed, not to the entire working copy. If you want to see that information for the whole working copy you must check the Show unmodified files checkbox." -msgstr "" +#: source/TortoiseSVN_en.xml:7096(para) +msgid "An important point to remember is that Merge is closely related to Diff. The merge process works by generating a list of differences between two points in the repository, and applying those differences to your working copy. For example if you want to merge the changes made in revision N then you have to compare revision N with revision (N-1). Novices often ask Why do I have to subtract 1 from the start revision. Think of the underlying Diff process and it will become clearer. TO make this easier, when you use Show Log to select a range of revisions to merge, TortoiseSVN makes this adjustment for you automatically." +msgstr "十分关键之处是Subversion的合并与差异关系很密切。合并工作的基础是在版本库对两个分支产生一个差异列表，然后对你的工作副本应用这些差异。举例说明，如果你需要合并版本N的修改，那么你要与版本N-1比较。新手经常问为什么我需要从开始版本减一。考虑底层的差异处理，这个问题就会清楚了。为了容易操作，当你使用显示日志选择一个版本范围合并的时候，TortoiseSVN 自动为你做这个调整。" -#: source/TortoiseSVN_en.xml:489(term) -msgid "Choice of network layers" -msgstr "可选的网络层" +#: source/TortoiseSVN_en.xml:7109(para) +msgid "In general it is a good idea to perform a merge into an unmodified working copy. If you have made other changes in your WC, commit those first. If the merge does not go as you expect, you may want to revert the changes, and the Revert command will discard all changes including any you made before the merge." +msgstr "通常来说，在没有修改的工作副本上执行合并是一个好想法。如果你在工作副本上做了修改，请先提交。如果合并没有按照你的想法执行，你可能需要撤销这些修改，命令恢复 会丢弃包含你执行合并之前的所有修改。" -#: source/TortoiseSVN_en.xml:4899(para) -msgid "If you want a flat view of your working copy, i.e. showing all files and folders at every level of the folder hierarchy, then the Check for Modifications dialog is the easiest way to achieve that. Just check the Show unmodified files checkbox to show all files in your working copy." -msgstr "如果你需要工作目录的全面视图，也就是所有文件和文件夹都同时显示，以便方便的使用检查修改对话框。只要选择现实未修改文件检查栏，显示工作目录中的所有文件即可。" +#: source/TortoiseSVN_en.xml:7116(para) +msgid "There are two common use cases for merging which are handled in slightly different ways, as described below." +msgstr "这里有两个处理稍微不同的用例，如下所述。" -#: source/TortoiseSVN_en.xml:491(para) -msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." -msgstr "Subversion 在版本库访问方面有一个抽象概念，利于人们去实现新的网络机制，Subversion 的高级服务器是 Apache 网络服务器的一个模块，使用 HTTP 的变种协议 WebDAV/DeltaV 通讯，这给了 Subversion 在稳定性和交互性方面很大的好处，可以直接使用服务器的特性，例如认证、授权、传输压缩和版本库浏览等等。也有一个轻型的，单独运行的 Subversion 服务器，这个服务器使用自己的协议，可以轻松的用 SSH 封装。" +#: source/TortoiseSVN_en.xml:7121(title) +msgid "Merging a Range of Revisions" +msgstr "合并指定版本范围" -#: source/TortoiseSVN_en.xml:4925(title) -msgid "Viewing Diffs" -msgstr "查看差别" +#: source/TortoiseSVN_en.xml:7122(para) +msgid "This method covers the case when you have made one or more revisions to a branch (or to the trunk) and you want to port those changes across to a different branch." +msgstr "这个方法覆盖了你已经在分支(或者最新版本)上做出了一个或多个修改，并且你想将这些修改应用到不同分支的情况。" -#: source/TortoiseSVN_en.xml:4927(primary) -msgid "diffing" -msgstr "比较" +#: source/TortoiseSVN_en.xml:7129(title) +msgid "The Merge Dialog" +msgstr "合并对话框" -#: source/TortoiseSVN_en.xml:4929(para) -msgid "Often you want to look inside your files, to have a look at what you've changed. You can accomplish this by selecting a file which has changed, and selecting Diff from TortoiseSVN's context menu. This starts the external diff-viewer, which will then compare the current file with the pristine copy (BASE revision), which was stored after the last checkout or update." -msgstr "通常你想要深入文件中了解你修改了什么。要达到这个目的，你可以选中这个文件，然后在TortoiseSVN的右键菜单中选择比较。这个操作会启动一个外部的差别检查程序，由它来比较当前文件与上一次检出或更新后的原始的副本(基础版本)。" +#: source/TortoiseSVN_en.xml:7142(para) +msgid "In the From: field enter the full folder url of the branch or tag containing the changes you want to port into your working copy. You may also click ... to browse the repository and find the desired branch. If you have merged from this branch before, then just use the drop down list which shows a history of previously used URLs." +msgstr "在从:域输入文件夹在分支或标记中的完整URL，它包含了你想应用到工作副本的修改。你也可以点击...浏览版本库，找到渴望的分支。如果你以前已经从这个分支合并过，可以直接从包含历史的下拉列表选择以前使用的URL。" -#: source/TortoiseSVN_en.xml:4939(para) -msgid "Even when not inside a working copy or when you have multiple versions of the file lying around, you can still display diffs:" -msgstr "即使你不是在一个工作副本中工作或者你有多个版本的文件，你都可以按以下方法来进行比较: " +#: source/TortoiseSVN_en.xml:7155(para) +msgid "Because you are porting a range of revisions from the same branch into your working copy, make sure the Use \"From:\" URL checkbox is checked." +msgstr "因为你要将同一分支的版本范围合并到工作副本，所以要确保使用 \"从:\" URL 检查框选中。" -#: source/TortoiseSVN_en.xml:4943(para) -msgid "Select the two files you want to compare in explorer (e.g. using Ctrl and the mouse) and choose Diff from TortoiseSVN's context menu. The file clicked last (the one with the focus, i.e. the dotted rectangle) will be regarded as the later one." -msgstr "选择你要比较的两个文件(比如，你可以使用Ctrl 键加鼠标)，然后从TortoiseSVN的右键菜单中选择比较。最后一个被鼠标点中的文件(具有焦点的文件，比如有虚线框的文件具有焦点)，将作为被比较文件的后一个。" +#: source/TortoiseSVN_en.xml:7163(para) +msgid "" +"In the From Revision field enter the start revision number. This is the revision before the changes you want to merge. Remember that Subversion will create a diff file in order to perform the merge, so the start point has to be just before the first change you are interested in. For example, your log messages may look something like this: \n" +"Rev Comments\n" +"39. Working on MyBranch\n" +"38. Working on trunk\n" +"37. Working on MyBranch\n" +"36. Create branch MyBranch\n" +"35. Working on trunk\n" +"34. Working on trunk\n" +" ...\n" +" If you now want to merge all the changes from MyBranch into the trunk you have to choose 36 as the From Revision, not 37 as you might think. If you select revision 37 as the start point, then the difference engine compares the end point with revision 37, and will miss the changes made in revision 37 itself. If that sounds complicated, don't worry, there is an easier way in TortoiseSVN ..." +msgstr "" +"在从版本域输入开始版本号。它是在你要执行合并的修改之前的版本号。切记为了合并，Subversion将会创建一个差异，所以开始点务必准确。 例如，你的日志象这样: \n" +"版本 注释\n" +"39. Working on MyBranch\n" +"38. Working on trunk\n" +"37. Working on MyBranch\n" +"36. Create branch MyBranch\n" +"35. Working on trunk\n" +"34. Working on trunk\n" +" ...\n" +"如果你要将 MyBranch 的修改合并到 trunk，应该选择36作为开始版本，而不是象你想的是37。如果你选择37作为开始点，那么差异引擎将会比较结束点与版本37比较，这就丢失了版本37做的修改。如果这听起来很复杂，不要担心，在TortoiseSVN中有更简单的方法 ..." -#: source/TortoiseSVN_en.xml:4955(title) -msgid "Revision Log Dialog" -msgstr "版本日志对话框" +#: source/TortoiseSVN_en.xml:7191(para) +msgid "The easiest way to select the range of revisions you need is to click on Show Log, as this will list recent changes with their log comments. If you want to merge the changes from a single revision, just select that revision. If you want to merge changes from several revisions, then select that range (using the usual Shift-modifier). Click on OK and the revision numbers of the From revision and To revision in the Merge dialog will both be filled in for you." +msgstr "选择版本范围最简单的方法是，点击显示日志，列出最近的修改和日志。如果你要合并单个版本的修改，直接选取那个版本。如果你要合并多个版本，就选择范围(使用通常的Shift-键)。点击确认，就会为你填写合并对话框的全部域，开始版本和结束版本。" -#: source/TortoiseSVN_en.xml:4957(primary) -msgid "log" -msgstr "日志" +#: source/TortoiseSVN_en.xml:7204(para) +msgid "When the Use \"From:\" URL checkbox is checked, only one Show Log button is enabled. This is because the Show Log dialog sets both From: and To: revisions, so you need to use the multiple selection method outlined above." +msgstr "当选择了检查框 使用 \"开始:\" URL，只有按钮显示日志可用。这是因为显示日志对话框设置了全部开始:和结束:版本。所以你只用上面说的多项选择方法即可。" -#: source/TortoiseSVN_en.xml:4960(primary) -msgid "history" -msgstr "历史" +#: source/TortoiseSVN_en.xml:7212(para) +msgid "If you have already merged some changes from this branch, hopefully you will have made a note of the last revision merged in the log message when you committed the change. In that case, you can use Show Log for the Working Copy to trace that log message. Use the end point of the last merge as the start point for this merge. For example, if you have merged revisions 37 to 39 last time, then the start point for this merge should be revision 39." +msgstr "如果你已经从这个分支合并了一些修改，希望你在提交日志中注明最后一个合并的版本号。这时，你可以在工作服本上使用显示日志对话框跟踪日志。使用最后合并的版本号作为本次合并的开始版本。例如，你已经合并了版本37到39，那么本次合并你应该从版本39开始。" -#: source/TortoiseSVN_en.xml:4963(para) -msgid "For every change you make and commit, you should provide a log message for that change. That way you can later find out what changes you made and why, and you have a detailed log for your development process." -msgstr "对于每次进行修改和提交，你应该有针对性地留下日志信息。这样，你就可以在以后方便地看到你都做了什么，为什么这么做。当然这么做还是你拥有了开发过程的详细日志。" +#: source/TortoiseSVN_en.xml:7225(para) +msgid "If you have not used Show Log to select the revision range, then you will need to set the To Revision manually. Enter the last revision number in the range you want to merge. Often this will be the HEAD revision, although it doesn't need to be - you may just want to merge a single revision." +msgstr "如果你没有使用显示日志对话框显示版本范围，那么你需要手工设置结束版本。在范围中输入你想合并的最后一个版本号。这经常是最新版本，尽管它不必是 - 你只想合并单个版本。" -#: source/TortoiseSVN_en.xml:4969(para) -msgid "The Revision Log Dialog retrieves all those log messages and shows them to you. The display is divided into 3 panes. But it does much more than that - it provides context menu commands which you can use to get even more information about the project history." -msgstr "版本日志对话框可以获取所有的日志信息，并将其显示出来。对话框的视图分成3个面板。当然，对话框的作用不止于此——它提供了右键菜单，通过它可以获取更多的项目历史信息。" +#: source/TortoiseSVN_en.xml:7233(para) +msgid "If other people may be committing changes then be careful about using the HEAD revision. It may not refer to the revision you think it does if someone else made a commit after your last update." +msgstr "如果其他用户可能提交，那么要小心使用最新版本。如果有人在你最近更新之后提交了，它指代的版本可能就不是你想的那样了。" -#: source/TortoiseSVN_en.xml:4975(para) -msgid "The top pane shows a list of revisions where changes to the file/folder have been committed. This summary includes the date and time, the person who committed the revision and the start of the log message." -msgstr "最上方的面板显示了版本的列表。这其中包含了日期和时间，以及提交的用户和日志信息开头的部分内容。" +#: source/TortoiseSVN_en.xml:7241(para) source/TortoiseSVN_en.xml:7345(para) +#: source/TortoiseSVN_en.xml:10791(para) +msgid "Click OK to complete the merge." +msgstr "点击合并按钮完成合并。" -#: source/TortoiseSVN_en.xml:4981(para) -msgid "Lines shown in blue indicate that something has been copied to this development line (perhaps from a branch)." -msgstr "以蓝色显示的行表示某些内容被复制到该开发版本中(可能是从一个分支中复制而来)。" +#: source/TortoiseSVN_en.xml:7127(para) +msgid " To merge revisions you need to go to a working copy of the branch in which you want to receive the changes, often the trunk. Select TortoiseSVNMerge... from the context menu. The merge is now complete. It's a good idea to have a look at the merge and see if it's as expected. Merging is usually quite complicated. Conflicts often arise if the branch has drifted far from the trunk." +msgstr " 为了合并版本，你需要进入接收修改的分支的工作副本，经常是trunk。选择右键菜单TortoiseSVN合并...。 现在合并结束。察看合并，看看它是否如预期那样工作，是个好想法。合并通常很复杂，如果分支与最新版本差别很大，合并经常会出现冲突。" -#: source/TortoiseSVN_en.xml:4987(para) -msgid "The middle pane shows the full log message for the selected revision." -msgstr "中间的面板显示了被选中的版本的完整的日志信息。" +#: source/TortoiseSVN_en.xml:7250(para) +msgid "When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. Unfortunately merge information is not stored by Subversion. For more information about this, refer to Best Practices for Merging in the Subversion book." +msgstr "当你已经测试了修改，准备提交时，日志信息应当总是包含这次合并的版本信息。如果你以后需要执行合并，就需要知道已经合并了什么，因为你不想多次合并同一修改。不幸的是，合并信息不会存储在Subversion版本库中。阅读《使用 Subversion 进行版本管理》中的合并的最佳实践章节以获得更多信息。" -#: source/TortoiseSVN_en.xml:4993(para) -msgid "The bottom pane shows a list of all files and folders that were changed as part of the selected revision." -msgstr "最下面的面板显示了被选中版本中都对哪里文件和文件夹进行了修改。" +#: source/TortoiseSVN_en.xml:7263(para) +msgid "Branch management is important. If you want to keep this branch up to date with the trunk, you should be sure to merge often so that the branch and trunk do not drift too far apart. Of course, you should still avoid repeated merging of changes, as explained above." +msgstr "分支管理很重要。如果你要保持这个分支与最新版本同步，你应当经常合并，这样分支和最新版本的差别就不会太大。当然，你仍旧应该遵循上面的说明，避免重复合并修改。" -#: source/TortoiseSVN_en.xml:5(subtitle) -msgid "A Subversion client for Windows" -msgstr "Windows下的一种Subversion客户端" +#: source/TortoiseSVN_en.xml:7270(para) +msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder url for the merge." +msgstr "Subversion不能进行文件与文件夹的合并，反之亦然 - 只能文件夹对文件夹，文件对文件。如果选择了文件，打开合并对话框，那么你必须在对话框中给出文件的路径。如果你选择了文件夹，打开合并对话框，那么你必须给出文件夹的对话框。" -#: source/TortoiseSVN_en.xml:5004(title) -msgid "Invoking the Revision Log Dialog" -msgstr "调用版本日志对话框" +#: source/TortoiseSVN_en.xml:7280(title) +msgid "Merging Two Different Trees" +msgstr "合并两个不同的目录树" -#: source/TortoiseSVN_en.xml:5005(para) -msgid " There are several places from where you can show the Log dialog: " -msgstr "有几种途径可以调出日志对话框: " +#: source/TortoiseSVN_en.xml:7281(para) +msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes. So in this special case, you would merge by comparing the branch with the trunk." +msgstr "这个用例覆盖了这种情况，当你象《Subversion手册》里讨论的那样，创建了一个新特性分支。所有最新版本的修改都要每周一次合并到新特性分支，等新特性完成后，你向将它合并到最新版本。因为你已经保持了新特性分支和最新版本同步，所以除了你在分支做的修改，其它部分在分支和最新版本应该是相同的。于是在这种情况下，你应当用比较分支和最新版本的方法来合并。" -#: source/TortoiseSVN_en.xml:5007(title) -msgid "The Revision Log Dialog" -msgstr "版本日志对话框" +#: source/TortoiseSVN_en.xml:7302(para) +msgid "In the From: field enter the full folder url of the trunk. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes. You may also click ... to browse the repository." +msgstr "在开始:域输入trunk文件夹的全路径。这听起来好象是错误的，但是切记 trunk 是你想增加分支修改的开始点。也可以点击 ...浏览版本库。" -#: source/TortoiseSVN_en.xml:5013(para) -msgid "From the TortoiseSVN context submenu" -msgstr "从右键菜单的TortoiseSVN子菜单中调用" +#: source/TortoiseSVN_en.xml:7313(para) +msgid "Because you are comparing two different trees, make sure the Use \"From:\" URL checkbox is not checked." +msgstr "因为你在比较两个不同的树，确认没有选择使用 \"开始:\" 路径检查框。" -#: source/TortoiseSVN_en.xml:5018(para) -msgid "From the property page" -msgstr "从属性页中调用" +#: source/TortoiseSVN_en.xml:7320(para) +msgid "In the To: field enter the full folder url of the feature branch." +msgstr "在结束:域输入关注的分支中文件夹的全路径。" -#: source/TortoiseSVN_en.xml:5023(para) -msgid "From the Progress dialog after an update has finished. Then the Log dialog only shows those revisions which were changed since your last update" -msgstr "在更新结束后，从进度对话框中调用。在这里，日志对话框只显示你上一次更新以来的版本变化。" +#: source/TortoiseSVN_en.xml:7326(para) +msgid "In both the From Revision field and the To Revision field, enter the last revision number at which the two trees were synchronized. If you are sure no-one else is making commits you can use the HEAD revision in both cases. If there is a chance that someone else may have made a commit since that synchronization, use the specific revision number to avoid losing more recent commits." +msgstr "在开始版本和结束版本 域，输入两个树被同步的最后一个版本号。如果你确信没有其他人提交，两个都可是输入 HEAD。如果在同步时可能有人提交的话，使用清楚的版本号以便面丢失最新提交。" -#: source/TortoiseSVN_en.xml:5033(title) -msgid "Getting Additional Information" -msgstr "获得更多信息" +#: source/TortoiseSVN_en.xml:7336(para) +msgid "You can also use Show Log to select the revision. Note that in this case you are not selecting a range of revisions, so the revision you select there is what will actually appear in the Revision field." +msgstr "你也可以使用显示日志选择版本。注意这种情况下，你不能选择版本范围，所以此时你选择的版本会实际出现在版本域。" -#: source/TortoiseSVN_en.xml:5034(para) -msgid " The top pane of the Log dialog has a context menu that allows you to " -msgstr "日志对话框的顶底面板右键菜单功能如下: " +#: source/TortoiseSVN_en.xml:7291(para) +msgid "To merge the feature branch back into the trunk you need to go to a working copy of the trunk. Select TortoiseSVNMerge... from the context menu. " +msgstr "为了将新特性从分支合并到最新版本，你需要进入最新版本的工作副本。在右键菜单选择 TortoiseSVN合并... " -#: source/TortoiseSVN_en.xml:5036(title) -msgid "The Revision Log Dialog Top Pane with Context Menu" -msgstr "版本日志对话框的顶部面板的右键菜单" +#: source/TortoiseSVN_en.xml:7351(para) +msgid "In this case you will not need the feature branch again because the new feature is now integrated into the trunk. The feature branch is redundant and can be deleted from the repository if required." +msgstr "这种情况下，因为新特性已经集成到最新版本，你不再需要这个新特性分支。新特性分支变成多余的，如果需要可以从版本库删除它。" -#: source/TortoiseSVN_en.xml:5042(para) -msgid "Compare the selected revision with your working copy. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseSVN. If the log dialog is for a folder, this will show you a list of changed files, and allow you to review the changes made to each file individually." -msgstr "将你的工作版本与选中的版本进行比较。默认的比较工具是与TortoiseSNV一同发布的TortoiseMerge，如果日志对话框是针对文件夹的，那么就会出现一个被修改的文件的列表，你可以单独地查看每个文件所做的修改。" +#: source/TortoiseSVN_en.xml:7359(title) +msgid "Previewing Merge Results" +msgstr "预览合并结果" -#: source/TortoiseSVN_en.xml:5052(para) -msgid "View the changes made in the selected revision as a Unified-Diff file (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all file changes together in a compact format." -msgstr "将选中的版本作为单一差异文件(GNU补丁格式)查看。相对于可视化的文件比较器，它更难阅读，但它将所有的变化显示在一个格式更为紧凑的文件中。" +#: source/TortoiseSVN_en.xml:7360(para) +msgid "If you are uncertain about the merge operation, you may want to preview what will happen do before you allow it to change your working copy. There are three additional buttons to help you." +msgstr "如果你不信任合并操作，可以在允许它修改你的工作副本之前预览效果。有三个额外的按钮可以帮着你预览。" -#: source/TortoiseSVN_en.xml:5061(para) -msgid "Compare the selected revision with the previous revision. This works in a similar manner to comparing with your working copy." -msgstr "比较选择的版本和以前版本。它与你比较工作副本类似。" +#: source/TortoiseSVN_en.xml:7365(para) +msgid "Unified Diff creates the diff file (remember that merge is based on diff) and shows you which lines will be changed in your working copy files. As this is a unified diff (patch) file it is not always easy to read out of context, but for small scale changes it can be helpful as it shows all the changes in one hit." +msgstr "统一差异创建差异文件(切记合并基于差异)，显示你的工作目录哪些行将要被修改。因为这是统一差异(补丁)文件，所以离开上下文，它经常很难读。但是对于小的修改，由于它将所有修改在一起显示，因此很有用。" -#: source/TortoiseSVN_en.xml:5068(para) -msgid "Blame the selected revision, and the file in your working BASE and compare the results using a visual diff tool. Read for more detail." -msgstr "评审选中的版本，和你的工作基础文件，使用可视化差异工具显示结果。参阅 以获得更多信息。" +#: source/TortoiseSVN_en.xml:7372(para) +msgid "Diff shows you a list of changed files. Double click on any of the listed files to start the diff viewer. Unlike the unified diff, this shows you the changes in their full contextual detail. As with the unified diff, the changes you see here are the changes between the From: and To: revisions. It does not show how your working copy will be affected by applying that change." +msgstr "差异显示修改文件列表。双击任一文件启动差异察看器。不像统一差异，它显示具有前后关系的详细修改信息。象统一差异那样，你看到的是开始版本: 和 结束版本:之间的差异。它不显示应用此改变之后，你的工作版本如何改变。" -#: source/TortoiseSVN_en.xml:5075(para) -msgid "Blame the selected revision, and the previous revision, and compare the results using a visual diff tool." -msgstr "追溯选中的版本和旧版本，用可视化差异工具比较结果。" +#: source/TortoiseSVN_en.xml:7381(para) +msgid "Dry Run performs the merge operation, but does not modify the working copy at all. It shows you a list of the files that will be changed by a real merge, and notes those areas where conflicts will occur." +msgstr "演习运行执行合并操作，但是根本不 修改工作副本。它显示在真实的合并中要修改的文件列表，还告诉你哪里会出现冲突。" -#: source/TortoiseSVN_en.xml:508(term) -msgid "Consistent data handling" -msgstr "一致的数据处理" +#: source/TortoiseSVN_en.xml:7389(title) +msgid "Ignoring Ancestry" +msgstr "忽略祖先" -#: source/TortoiseSVN_en.xml:5081(para) -msgid "Save the selected revision to a file so you have an older version of that file. This option is only available when you access the log for a file, and it saves a version of that one file only." -msgstr "将选中的版本保存成文件，这样你就获得了该文件的一个旧的版本。这个选项只在你查看一个文件的日志时才可用，它只保存那一个文件的一个版本。" +#: source/TortoiseSVN_en.xml:7390(para) +msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" +msgstr "大部分时候，你要合并文件的历史，所以要相对于公共祖先合并。有时你需要合并或许是有关系的文件，但是不在你的版本库中。例如，你已经将一个第三方库的版本1和2导入到两个单独目录。尽管它们逻辑相关，因为Subversion只看到你导入的文件，所以它不知道这些关系。如果你试图合并这两个树的修改，将会看到完全的删除和增加。让Subversion只使用路径差异，不关心历史差异，选中忽略祖先检查框。你可以在《使用 Subversion 进行版本管理》的关心或忽略祖先中阅读此主题的更多信息。" -#: source/TortoiseSVN_en.xml:5089(para) -msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose. This option is only available when you access the log for a file." -msgstr "用默认查看器，或用你指定的程序，打开选中文件。这个选项仅在存取文件日志是可用。" +#: source/TortoiseSVN_en.xml:7410(title) +msgid "Locking" +msgstr "锁" -#: source/TortoiseSVN_en.xml:5096(para) -msgid "Open the repository browser to examine the selected folder. This option is only available when you access the log for a directory." -msgstr "打开版本库浏览器，可以查看选中的目录。这个选项只在你查看一个目录的日志时可用。" +#: source/TortoiseSVN_en.xml:7412(primary) +msgid "locking" +msgstr "加锁" -#: source/TortoiseSVN_en.xml:510(para) -msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." -msgstr "Subversion 使用二进制文件差异算法展现文件的区别，对于文本(人类可读)和二进制(人类不可读)文件具备一致的操作方式，两种类型的文件都压缩存放在版本库中，差异在网络上双向传递。" +#: source/TortoiseSVN_en.xml:7422(para) +msgid "You are using unmergeable files, for example, graphics files. If two people change the same file, merging is not possible, so one of you will lose their changes." +msgstr "例如，你使用图形文件等不能合并的文件。如果两个人修改同一个这样的文件，合并是不可能的，所以你丢失其中一个的修改。" -#: source/TortoiseSVN_en.xml:5103(para) -msgid "Create a branch/tag from a selected revision. This is useful e.g. if you forgot to create a tag and already committed some changes which weren't supposed to get into that release." -msgstr "从选中的版本建立一个分支/标记。这个选项很有用。比如: 如果你提交了某些你不想使其进入发行版的修改，却忘记了为此建立标记。" +#: source/TortoiseSVN_en.xml:7430(para) +msgid "Your company has always used a locking VCS in the past and there has been a management decision that locking is best." +msgstr "你的公司过去经常使用VCS锁定，这是个管理决定，锁定是最好的。" -#: source/TortoiseSVN_en.xml:5111(para) -msgid "Update your working copy to the selected revision. Useful if you want to have your working copy reflect a time in the past. It is best to update a whole directory in your working copy, not just one file, otherwise your working copy will be inconsistent and you will be unable to commit any changes." -msgstr "将你的工作副本更新到选中的版本。如果你想要你的工作副本折返到过去的某个时间，那这个功能就很好用。你最好是更新工作副本的整个目录而不是单一某个文件，因为如果只更新某个文件，你的工作副本就可能不一致，从而导致你无法提交任何修改。" +#: source/TortoiseSVN_en.xml:7414(para) +msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " +msgstr "使用之前在中描述的复制-修改-合并 的方法，Subversion通常不需要锁就可以很好的工作。但是，在某些情况下你可能需要制定某种锁定策略。" -#: source/TortoiseSVN_en.xml:5121(para) -msgid "Revert changes from which were made in the selected revision. The changes are reverted in your working copy so this operation does not affect the repository at all! Note that this will undo the changes made in that revision only. It does not replace your working copy with the entire file at the earlier revision. This is very useful for undoing an earlier change when other unrelated changes have been made since. If you have made local changes, this command will merge these changes into your working copy." -msgstr "还原选中版本所做的修改。还原的内容只在你的工作副本中，所以此操作完全不会影响版本库！要注意的是，这个操作仅仅还原该版本中的修改。不是将整个文件替换成选中的那个版本。它对于已经做过其它无关修改的还原早期修改非常有用。如果你做了本地修改，此命令将会合并修改到工作副本。" +#: source/TortoiseSVN_en.xml:7438(para) +msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:/// access, then of course only your client needs to be updated." +msgstr "首先，你需要确保你的Subversion服务器更新到至少1.2版本。早期的版本不支持锁定。如果你使用file:///进行访问，那么当然只要更新你的客户端就可以了。" -#: source/TortoiseSVN_en.xml:5135(para) -msgid "Revert to an earlier revision. If you have made several changes, and then decide that you really want to go back to how things were in revision N, this is the command you need. Again, the changes are reverted in your working copy so this operation does not affect the repository until you commit the changes. Note that this will undo all changes made after the selected revision, replacing the file/folder with the earlier version. If you have made local changes, this command will merge these changes into your working copy." -msgstr "恢复到某个以前的版本。如果你做了多处修改，然后决定要返回到版本 N，你就可以使用这个命令。再次说明，恢复的修改位于你的工作副本，在你提交之前，并不会影响版本库。注意，这将会丢弃从那个版本以来的所有修改，使用选中的版本来替换文件/文件夹。" +#: source/TortoiseSVN_en.xml:7445(title) +msgid "How Locking Works in Subversion" +msgstr "锁定在Subverion中是如何工作的" -#: source/TortoiseSVN_en.xml:5149(para) -msgid "Make a fresh checkout of the selected folder at the selected revision. This brings up a dialog for you to confirm the URL and revision, and select a location for the checkout." -msgstr "检出你选择的目录的选中版本，创建一个全新副本。它弹出对话框，让你确认URL和版本，并且选择保存的位置。" +#: source/TortoiseSVN_en.xml:7446(para) +msgid "By default, nothing is locked and anyone who has commit access can commit changes to any file at any time. Others will update their working copies periodically and changes in the repository will be merged with local changes." +msgstr "默认情况下，所有的东西都没有锁定，只要有提交权限的人都可以在任何时候提交任何的文件。其他人会定时更新他们的工作副本，在库中的改变的东西都会与本地合并。" -#: source/TortoiseSVN_en.xml:5156(para) -msgid "Export the selected file/folder at the selected revision. This brings up a dialog for you to confirm the URL and revision, and select a location for the export." -msgstr "导出选择的文件/目录的选中版本。它弹出对话框，让你确认URL和版本，选择导出位置。" +#: source/TortoiseSVN_en.xml:7452(para) +msgid "If you Get a Lock on a file, then only you can commit that file. Commits by all other users will be blocked until you release the lock. A locked file cannot be modified in any way in the repository, so it cannot be deleted or renamed either, except by the lock owner." +msgstr "如果你对一个文件 取得锁定，那么只有你可以提交这个文件。其他用户的提交都会被拒绝，直到你释放了这个锁。一个被锁定的文件不能在库中进行任何形式的合并。所以它不能除锁的拥用者之外的人删除或更名。" -#: source/TortoiseSVN_en.xml:5163(para) -msgid "Edit the log message or author attached to a previous commit. Read to find out how this works." -msgstr "编辑之前提交时的日志信息或是作者。请阅读，了解其工作原理。" +#: source/TortoiseSVN_en.xml:7459(para) +msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseSVN to indicate that you need to acquire a lock before editing." +msgstr "但是，其他用户不必知道你已经增加了锁定，除非他们定期地检查锁定的状态。这其实没什么意义，因为他们发现提交失败的时候就可以知道锁定了。为了更容易管理锁，而设置了一个新的Subversion属性 svn:needs-lock。当一个文件的这个属性被设置(成任意值)的时候，每当该文件检出或更新时，本地的副本都被设成只读，除非该工作副本就是拥有锁的那个用户的。这么做是为了能警告你，你不应该修改这个文件，除非你申请到了锁定。受控只读的文件在TortoiseSVN中用一个特殊的图标来表示你需要在编辑前取得锁定。" -#: source/TortoiseSVN_en.xml:5170(para) -msgid "Copy the log details of the selected revisions to the clipboard. This will copy the revision number, author, date, log message and the list of changed items for each revision." -msgstr "将选中版本的详细日志信息复制到剪贴板。它会复制版本号，作者，日期，日志信息，以及每个版本的改变项目列表。" +#: source/TortoiseSVN_en.xml:7475(para) +msgid "Locks are recorded by working copy location as well as by owner. If you have several working copies (at home, at work) then you can only hold a lock in one of those working copies." +msgstr "锁除了按所有者记录外，还在工作副本中记录。如果你有多个工作副本(在家，在单位)，那么在这些工作副本中，只允许对其中一份拥有锁。" -#: source/TortoiseSVN_en.xml:5177(para) -msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." -msgstr "在日志信息中搜索你输入的的文字。这个操作搜索日志信息，也搜索由Subversion建立的提交行为总结(最底部的面板中的内容)。搜索大小写无关。" +#: source/TortoiseSVN_en.xml:7481(para) +msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." +msgstr "如果你的合作者之一请求一个锁，但却外出旅游去了，你怎么办？Subversion提供了一种强制锁。释放别人拥有的锁被称为破坏锁定，强制获得别人拥有的锁称为窃取锁定。当然，如果你想要与你的合作者保持良好的关系，轻易不要这么做。" -#: source/TortoiseSVN_en.xml:5186(para) -msgid " If you select two revisions at once (using the usual Ctrl-modifier), the context menu changes and gives you fewer options: " -msgstr "如果你使用Ctrl组合键一次选中了两个版本，右键菜单有所改变: " +#: source/TortoiseSVN_en.xml:7491(para) +msgid "Locks are recorded in the repository, and a lock token is created in your local working copy. If there is a discrepancy, for example if someone else has broken the lock, the local lock token becomes invalid. The repository is always the definitive reference." +msgstr "锁在库中进行记录，一个锁定令牌建立在你的本地工作副本中。如果有矛盾，比如某人破坏了锁下，那么本地的锁定令牌将不可用。库中的记录将是最权威的参考。" -#: source/TortoiseSVN_en.xml:5188(title) -msgid "Top Pane Context Menu for 2 Selected Revisions" -msgstr "选种两个版本的顶部面板的右键菜单" +#: source/TortoiseSVN_en.xml:7500(title) +msgid "Getting a Lock" +msgstr "取得锁定" -#: source/TortoiseSVN_en.xml:5196(para) -msgid "Compare the two selected revisions using a visual difference tool. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseSVN." -msgstr "使用可视化差异比较工作比较两个选中的版本。默认的比较工作是与TortoiseSVN一起提供的TortoiseMerge。" +#: source/TortoiseSVN_en.xml:7509(title) +msgid "The Locking Dialog" +msgstr "锁定对话框" -#: source/TortoiseSVN_en.xml:5201(para) -msgid "If you select this option for a folder, a further dialog pops up listing the changed files and offering you further diff options. Read more about the Compare Revisions dialog in ." -msgstr "如果你是针对文件夹选中这个选项，则会弹出一个对话框列出修改过的文件，提供了更多的差异比较选项。请参考比较版本对话框获得详情: 。" +#: source/TortoiseSVN_en.xml:7501(para) +msgid "Select the file(s) in your working copy for which you want to acquire a lock, then select the command TortoiseSVNGet Lock.... A dialog appears, allowing you to enter a comment, so others can see why you have locked the file. The comment is optional and currently only used with Svnserve based repositories. If (and only if) you need to steal the lock from someone else, check the Steal lock box, then click on OK." +msgstr "选择工作副本中你想要获取锁定的文件，然后选择命令TortoiseSVN取得锁定.... 出现一个对话框，允许你输入注释，这样别人可以知道你为什么锁定这个文件。注释是可选的，并且只用于基于Svnserve的库。当(且仅当)你需要窃取别人的锁的时候，勾选偷取此锁定复选框，然后点击确定。" -#: source/TortoiseSVN_en.xml:5209(para) -msgid "Blame the two revisions and compare the results using a visual difference tool. Read for more detail." -msgstr "评审两个版本，并使用差异比较工作比较结果。详情请参考 。" +#: source/TortoiseSVN_en.xml:7521(para) +msgid "If you select a folder and then use TortoiseSVNGet Lock... the lock dialog will open with every file in every subfolder selected for locking. If you really want to lock an entire hierarchy, that is the way to do it, but you could become very unpopular with your co-workers if you lock them out of the whole project. Use with care ..." +msgstr "如果你选择一个文件夹，使用TortoiseSVN获取锁定...锁定对话框将显示所有子文件夹中的所有文件 。如果你真的要锁定整个目录，就这么做，但如果你这么做，可能会很不受你的合作者的欢迎。小心使用..." -#: source/TortoiseSVN_en.xml:521(term) -msgid "Efficient branching and tagging" -msgstr "高效的分支和标签" +#: source/TortoiseSVN_en.xml:7535(title) +msgid "Releasing a Lock" +msgstr "释放锁定" -#: source/TortoiseSVN_en.xml:5216(para) -msgid "View the differences between the two selected revisions as a Unified-Diff file. This works for files and folders." -msgstr "使用单一差异文件显示差异。这对文件和文件夹都有效。" +#: source/TortoiseSVN_en.xml:7536(para) +msgid "To make sure you don't forget to release a lock you don't need any more, locked files are shown in the commit dialog and selected by default. If you continue with the commit, locks you hold on the selected files are removed, even if the files haven't been modified. If you don't want to release a lock on certain files, you can uncheck them (if they're not modified). If you want to keep a lock on a file you've modified, you have to enable the Keep locks checkbox before you commit your changes." +msgstr "为了确保你不会忘记释放锁，你不需要做别的事，在提交对话框中，总是会显示锁定的文件，并总是默认被选中。如果你继续提交，选中的文件中的锁就被移除了，就算你从没有修改过。如果你不希望释放某文件的锁，你可以取消选中它(如果你没有修改过)。如果你希望保持一个修改过的文件的锁，你需要在提交之前选中保持锁定复选框。" -#: source/TortoiseSVN_en.xml:5222(para) -msgid "Copy log messages to clipboard as described above." -msgstr "如前所述将日志消息复制到剪贴板。" +#: source/TortoiseSVN_en.xml:7547(para) +msgid "To release a lock manually, select the file(s) in your working copy for which you want to release the lock, then select the command TortoiseSVNRelease Lock There is nothing further to enter so TortoiseSVN will contact the repository and release the locks. You can also use this command on a folder to release all locks recursively." +msgstr "要手动释放锁定，选中工作副本中要释放的文件，选择命令TortoiseSVN释放锁定。不需要输入什么 TortoiseSVN会联系版本库并释放锁。你可以对一个文件夹来使用这个命令释放其中的所有锁定项。" -#: source/TortoiseSVN_en.xml:5227(para) -msgid "Search log messages as described above." -msgstr "如前所述可以搜索日志消息。" +#: source/TortoiseSVN_en.xml:7560(title) +msgid "Checking Lock Status" +msgstr "检查锁定状态" -#: source/TortoiseSVN_en.xml:523(para) -msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." -msgstr "分支与标签的代价不与工程的大小成比例，Subversion 建立分支与标签时只是复制项目，使用了一种类似于硬链接的机制，因而这类操作通常只会花费很少并且相对固定的时间，以及很小的版本库空间。" +#: source/TortoiseSVN_en.xml:7563(title) +msgid "The Check for Modifications Dialog" +msgstr "检查修改对话框" -#: source/TortoiseSVN_en.xml:5233(para) -msgid "If you select multiple consecutive revisions (using the usual Ctrl or Shift modifiers), the context menu will include an entry to Revert all changes which were made in that range of revisions. This is the easiest way to rollback a group of revisions in one go." -msgstr "如果你用Ctrl或Shift组合键选择了多个连续的版本，右键菜单将有一个选项，可以让你还原这些版本中的修改。这是一次性还原多个版本中修改的最简方法。" +#: source/TortoiseSVN_en.xml:7561(para) +msgid " To see what locks you and others hold, you can use TortoiseSVNCheck for Modifications.... Locally held lock tokens show up immediately. To check for locks held by others (and to see if any of your locks are broken or stolen) you need to click on Check Repository." +msgstr "要查看你和他人所拥有的锁，你可以使用TortoiseSVN检查更新...命令。本地的锁定令牌会立即显示出来，要查看别人拥用的锁定(或是检查你的锁是否被破坏或窃取)你需要点击检查版本库。" -#: source/TortoiseSVN_en.xml:5240(para) -msgid " The bottom pane of the Log dialog also has a context menu that allows you to " -msgstr " 日志对话框的底部面板也有右键菜单，你可以: " +#: source/TortoiseSVN_en.xml:7576(para) +msgid "From the context menu here, you can also get and release locks, as well as breaking and stealing locks held by others." +msgstr "从此处的右键菜单中，你可以获取锁或是释放锁，也可以破坏或是窃取别人的锁。" -#: source/TortoiseSVN_en.xml:5242(title) -msgid "The Log Dialog Bottom Pane with Context Menu" -msgstr "日志对话框的底部面板的右键菜单" +#: source/TortoiseSVN_en.xml:7581(title) +msgid "Avoid Breaking and Stealing Locks" +msgstr "避免破坏和窃取锁定" -#: source/TortoiseSVN_en.xml:5248(para) -msgid "Show differences made in the selected revision for the selected file. This context menu is only available for files shown as Modified." -msgstr "显示选中版本中的选中文件的差异。这个操作只对显示为已修改的文件有效。" +#: source/TortoiseSVN_en.xml:7582(para) +msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." +msgstr "如果你在破坏或是窃取某人的锁的时候没有告诉他，你可能会丢掉工作。如果你正在写一个不可合并的文件类型，并且你窃取了某人的锁，一旦你释放了锁，他们就可以随意检入他们的修改以覆盖你的。Subversion并不会丢弃数据，但你却失去了锁带来的对团队工作的保护。" -#: source/TortoiseSVN_en.xml:5255(para) -msgid "Blame the selected revision and the previous revision for the selected file, and show the differences using a visual diff tool. Read for more detail." -msgstr "评审选中文件的选中版本与前一个版本，使用可视化差异工具显示差异。详情请参阅 。" +#: source/TortoiseSVN_en.xml:7594(title) +msgid "Making Non-locked Files Read-Only" +msgstr "让非锁定的文件变成只读" -#: source/TortoiseSVN_en.xml:5262(para) source/TortoiseSVN_en.xml:8004(para) -msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose." -msgstr "用默认查看器或你指定的程序打开选中文件的选中版本。" +#: source/TortoiseSVN_en.xml:7595(para) +msgid "As mentioned above, the most effective way to use locking is to set the svn:needs-lock property on files. Refer to for instructions on how to set properties. Files with this property set will always be checked out and updated with the read-only flag set unless your working copy holds a lock. As a reminder, TortoiseSVN uses a special overlay to indicate this." +msgstr "正如上面提到的，最有效的使用锁的方式是对一个文件设置svn:needs-lock属性。参考如何设置属性。带有此属性的文件将总被按只读的方式检出和更新(除非你的工作副本拥有锁定)。作为提醒的方式之一，TortoiseSVN使用一个特殊的图标表示。" -#: source/TortoiseSVN_en.xml:5268(para) -msgid "Revert the changes made to the selected file in that revision." -msgstr "还原选中文件的选中版本所作的变更。" +#: source/TortoiseSVN_en.xml:7605(para) +msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." +msgstr "如果你管理的策略要求每个文件都必须被锁定，那么你会发现使用Subversion的auto-props功能，在你每次加入新文件的时候，自动设置属性是很方便的。请阅读。" -#: source/TortoiseSVN_en.xml:5273(para) -msgid "View the Subversion properties for the selected item." -msgstr "查看选中项的Subversion属性。" +#: source/TortoiseSVN_en.xml:7613(title) +msgid "The Locking Hook Scripts" +msgstr "锁定钩子脚本" -#: source/TortoiseSVN_en.xml:5278(para) -msgid "Show the revision log for the selected single file." -msgstr "显示选中的单个文件的版本日志。" +#: source/TortoiseSVN_en.xml:7614(para) +msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." +msgstr "当你使用Suversion1.2或更新的版本建立新的版本库的时候，建立了四个钩子模板在版本库中的hooks目录下。这些钩子模板在取得/释放一个锁定之前和之后会被分别调用。" -#: source/TortoiseSVN_en.xml:5283(para) -msgid "Save the selected revision to a file so you have an older version of that file." -msgstr "将选中的版本保存成文件，你可以得到一份该文件的旧版本。" +#: source/TortoiseSVN_en.xml:7620(para) +msgid "It is a good idea to install a post-lock and post-unlock hook script on the server which sends out an email indicating the file which has been locked. With such a script in place, all your users can be notified if someone locks/unlocks a file. You can find an example hook script hooks/post-lock.tmpl in your repository folder." +msgstr "安装一个 post-lock和post-unlock钩子，在钩子中为锁定和解锁事件发送邮件，是个好主意 。有了这种脚本，你的所有用户都会在一个文件被锁定/解锁的时候被通知。在你的版本库文件夹下，你可以找到一个示例钩子脚本hooks/post-lock.tmpl。" -#: source/TortoiseSVN_en.xml:5292(title) -msgid "Getting more log messages" -msgstr "获取更多的日志信息" +#: source/TortoiseSVN_en.xml:7628(para) +msgid "You might also use hooks to disallow breaking or stealing of locks, or perhaps limit it to a named administrator. Or maybe you want to email the owner when one of their locks is broken or stolen." +msgstr "你可能也使用hooks来拒绝破坏或是窃取锁定，或是限制只有管理员可以，或是当一个用户破坏或窃取锁定时通知原来的锁定拥有者。" -#: source/TortoiseSVN_en.xml:5293(para) -msgid "The Log dialog does not always show all changes ever made for a number of reasons: " -msgstr "日志对话框并不总是显示所有曾经的修改，日志不显示的可能原因如下: " +#: source/TortoiseSVN_en.xml:7634(para) +msgid "Read to find out more." +msgstr "更多内容请参考 " -#: source/TortoiseSVN_en.xml:5298(para) -msgid "For a large repository there may be hundreds or even thousands of changes and fetching them all could take a long time. Normally you are only interested in the more recent changes. By default, the number of log messages fetched is limited to 100, but you can change this value in TortoiseSVNSettings ()," -msgstr "对于一个大的库，可能存在几百上千个改动，全部得到它们可能要花上很久的时间。通常你只关心最近的修改。默认情况下，日志消息限制只获取100条，但你可以在TortoiseSVN设置中修改这个值 ()，" +#: source/TortoiseSVN_en.xml:7640(title) +msgid "Creating and Applying Patches" +msgstr "创建并应用补丁" -#: source/TortoiseSVN_en.xml:5313(para) -msgid "When the Stop on copy/rename box is checked, Show Log will stop at the point that the selected file or folder was copied from somewhere else within the repository. This can be useful when looking at branches (or tags) as it stops at the root of that branch, and gives a quick indication of changes made in that branch only." -msgstr "当复制/重命名时停止复选框被选中时， 如果选中的文件或文件夹是从版本库中的其他地方复制而来的，显示日志将停止在该点。这对于查看分支(或标记)时很有用，因为它会停在分支的根节点上，可以快速查看该分支的修改。" +#: source/TortoiseSVN_en.xml:7642(primary) +msgid "patch" +msgstr "补丁" -#: source/TortoiseSVN_en.xml:5322(para) -msgid "Normally you will want to leave this option unchecked. TortoiseSVN remembers the state of the checkbox, so it will respect your preference." -msgstr "一般情况下你可以不要勾选它。 TortoiseSVN会记住它的状态，以改进性能。" +#: source/TortoiseSVN_en.xml:7646(para) +msgid "For open source projects (like this one) everyone has read access to the repository, and anyone can make a contribution to the project. So how are those contributions controlled? If just anyone could commit changes, the project would be permanently unstable and probably permanently broken. In this situation the change is managed by submitting a patch file to the development team, who do have write access. They can review the patch first, and then either submit it to the repository or reject it back to the author." +msgstr "对开源工程(比如本工程)来说，每个人对仓库都有读访问权，并且任何人都可以对该工程做出修改。那么如何控制这些修改呢？如果任何人都可以提交自己的修改，那么这个工程可能永远都会处于不稳定状态，而且很有可能永远的瘫痪下去。在这种情况下，修改需要以补丁文件的形式先递交到有写访问权限的开发组。开发组可以先对该补丁文件进行审查，然后决定将其提交到仓库里或者是退还给作者。" -#: source/TortoiseSVN_en.xml:5327(para) -msgid "When the Show Log dialog is invoked from within the Merge dialog, the box is always checked by default. This is because merging is most often looking at changes on branches, and going back beyond the root of the branch does not make sense in that instance." -msgstr "如果你在从合并对话框中调用的显示日志对话框，那么这个复选框默认将总是选中的。这是由于合并通常都是查看分支中的修改， 获取分支的根之前的日志在这种情况下通常没有什么意义。" +#: source/TortoiseSVN_en.xml:7657(para) +msgid "Patch files are simply Unified-Diff files showing the differences between your working copy and the base revision." +msgstr "补丁文件只是简单地用统一的差异描述文件显示出你的工作副本和基础版本的不同点。" -#: source/TortoiseSVN_en.xml:5334(para) -msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." -msgstr "注意，Subversion当前是用复制/删除来实现重命名的，所以重命名一个文件或文件夹也会造成日志显示停止(如果选择了复制/重命名时停止)在该点。" +#: source/TortoiseSVN_en.xml:7662(title) +msgid "Creating a Patch File" +msgstr "创建一个补丁文件" -#: source/TortoiseSVN_en.xml:534(term) -msgid "Hackability" -msgstr "良好的维护能力" +#: source/TortoiseSVN_en.xml:7663(para) +msgid "First you need to make and test your changes. Then instead of using TortoiseSVNCommit... on the parent folder, you select TortoiseSVNCreate Patch..." +msgstr "首先你需要做出修改并测试这个修改的内容。然后在父目录上使用TortoiseSVN创建补丁...代替TortoiseSVN提交...。" -#: source/TortoiseSVN_en.xml:5343(para) -msgid "If you want to see more log messages, click the Next 100 to retrieve the next 100 log messages. You can repeat this as many times as needed." -msgstr "如果你要查看更多的日志信息，点击下100个，以获取下100个日志信息。如果有需要你可以多次重复这个操作。" +#: source/TortoiseSVN_en.xml:7677(title) +msgid "The Create Patch dialog" +msgstr "创建补丁的对话框" -#: source/TortoiseSVN_en.xml:5348(para) -msgid "Next to this button there is a multi-function button which remembers the last option you used it for. Click on the arrow to see the other options offered." -msgstr "这个按钮旁边的是一个多功能按钮，它可以记住上一次你要它进行的操作。点击它上面的箭头，可以看到更多的选项。" +#: source/TortoiseSVN_en.xml:7680(para) +msgid "you can now select the files you want included in the patch, just as you would with a full commit. This will produce a single file containing a summary of all the changes you have made to the selected files since the last update from the repository." +msgstr "现在你可以选择要包含在补丁中的文件了，就像你要做一个完整的提交一样。这样会产生一个单一的文件，该文件包括一份自从最后一次从仓库更新后你对所选择文件做的全部修改的摘要。" -#: source/TortoiseSVN_en.xml:5353(para) -msgid "Use Show Range ... if you want to view a specific range of revisions. A dialog will then prompt you to enter the start and end revision." -msgstr "如果你要查询指定范围的版本，使用显示范围 ...。这会出现一个对话框，要求输入开始和结束的版本。" +#: source/TortoiseSVN_en.xml:7691(para) +msgid "You can produce separate patches containing changes to different sets of files. Of course, if you create a patch file, make some more changes to the same files and then create another patch, the second patch file will include both sets of changes." +msgstr "你可以创建包含对不同文件集合修改的相互独立的补丁。当然如果你创建了一个补丁文件，对于同一份文件的更多修改会创建另外一个补丁文件，第二份补丁文件包含了全部的修改。" -#: source/TortoiseSVN_en.xml:5358(para) -msgid "Use Show All if you want to see all log messages from HEAD right back to revision 1." -msgstr "如果你要查询从最新版本直到版本1的所有的日志消息，使用显示所有。" +#: source/TortoiseSVN_en.xml:7697(para) +msgid "Just save the file using a filename of your choice. Patch files can have any extension you like, but by convention they should use the .patch or .diff extension. You are now ready to submit your patch file." +msgstr "你可以用一个自己选择的文件名来保存这个补丁文件，补丁文件可以有任意的扩展名，但是按人一般习惯，人们都是用.patch或者.diff作扩展名，你现在已经做好提交你的补丁文件的准备了。" -#: source/TortoiseSVN_en.xml:536(para) -msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." -msgstr "Subversion 没有历史负担，它由一系列良好的共享 C 库实现，具有定义良好的 API，这使 Subversion 非常容易维护，可以轻易的被其他语言和程序使用。" +#: source/TortoiseSVN_en.xml:7704(para) +msgid "You can also save the patch to the clipboard instead of to a file. You might want to do this so that you can paste it into an email for review by others. Or if you have two working copies on one machine and you want to transfer changes from one to the other, a patch on the clipboard is a convenient way of doing this." +msgstr "你也可以将补丁保存到剪贴板，而不是文件。这样你可以粘贴到电子邮件中，让他人审核。或者你在机器上有两个工作副本，想将修改传递到另外的副本。在剪贴板上的补丁就是为这些操作提供便利。" -#: source/TortoiseSVN_en.xml:5364(title) -msgid "Changing the Log Message and Author" -msgstr "修改日志消息和作者" +#: source/TortoiseSVN_en.xml:7713(title) +msgid "Applying a Patch File" +msgstr "应用一个补丁文件" -#: source/TortoiseSVN_en.xml:5366(primary) -msgid "edit log/author" -msgstr "编辑日志/作者" +#: source/TortoiseSVN_en.xml:7714(para) +msgid "Patch files are applied to your working copy. This should be done from the same folder level as was used to create the patch. If you are not sure what this is, just look at the first line of the patch file. For example, if the first file being worked on was doc/source/english/chapter1.xml and the first line in the patchfile is Index: english/chapter1.xml then you need to apply the patch to the english folder. However, provided you are in the correct working copy, if you pick the wrong folder level, TSVN will notice and suggest the correct level." +msgstr "当你对你的工作副本打补丁的时候，你应当在与创建补丁文件时相同的目录层次上。如果你不能确定在那个目录层次上，就看一下补丁文件的第一行。例如，如果补丁第一个要处理的文件是doc/source/english/chapter1.xml 并且补丁文件的第一行是Index: english/chapter1.xml说明你必须要对english目录应用这个补丁文件。尽管如此，倘若你在正确的工作副本上工作，如果你选择了一个错误的目录层次，TSVN会察觉到这个错误，并给出正确的建议。" -#: source/TortoiseSVN_en.xml:5368(para) -msgid "Sometimes you might want to change a log message you once entered, maybe because there's a spelling error in it or you want to improve the message or change it for other reasons. Or you want to change the author of the commit because you forgot to set up authentication or..." -msgstr "有时你可能想要修改你曾经输入的日志消息，也许是因为有拼写错误或是你想改进消息内容，或是其他别的原因。偶尔你还想修改提交者，可能是你忘了设置认证等原因。" +#: source/TortoiseSVN_en.xml:7728(para) +msgid "In order to apply a patch file to your working copy, you need to have at least read access to the repository. The reason for this is that the merge program must reference the changes back to the revision against which they were made by the remote developer." +msgstr "为了给你的工作副本打补丁，你至少需要对代码库的读权限。因为合并程序必须要参考修订版本中其他开发人员做的修改。" + +#: source/TortoiseSVN_en.xml:7735(para) +msgid "From the context menu for that folder, click on TortoiseSVNApply Patch... This will bring up a file open dialog allowing you to select the patch file to apply. By default only .patch or .diff files are shown, but you can opt for \"All files\". If you previously saved a patch to the clipboard, you can use Open from clipboard... in the file open dialog." +msgstr "从那个目录的上下文菜单，点击TortoiseSVN应用补丁... 系统会弹出一个打开文件的对话框，让你选择要应用的补丁文件。默认情况下只显示.patch或者.diff文件，但是你可以选择\"所有文件\"。如果你以前将补丁保存到了剪贴板，可以使用打开文件对话框的从剪贴板打开... " -#: source/TortoiseSVN_en.xml:5375(para) -msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." -msgstr "Subversion允许你在任何时候修改日志消息和作者。但这种改变不可还原(不在版本控制之下)，正因如此，这些功能默认是不可用的，如果要开启它，必须设置一个pre-revprop-change钩子。具体如何做，请参考《使用 Subversion 进行版本管理》的相关章节钩子脚本。在Windows机器上实现钩子的注意事项请阅读。" +#: source/TortoiseSVN_en.xml:7749(para) +msgid "Alternatively, if the patch file has a .patch or .diff extension, you can right click on it directly and select TortoiseSVNApply Patch.... In this case you will be prompted to enter a working copy location." +msgstr "如果补丁文件以.patch 或者 .diff 为扩展名的话，你可以选择直接右键点击该补丁文件，选择TortoiseSVN应用补丁... 在这种情况下，系统会提示你输入工作副本的位置。" -#: source/TortoiseSVN_en.xml:5388(para) -msgid "Once you've set up your server with the required hooks, you can change both author and log message of any revision, using the context menu from the top pane of the Log dialog." -msgstr "一旦你按需要为服务器设置了钩子，你就可以使用日志对话框顶部面板的右键菜单来修改任意版本的作者和日志信息了。" +#: source/TortoiseSVN_en.xml:7759(para) +msgid "These two methods just offer different ways of doing the same thing. With the first method you select the WC and browse to the patch file. With the second you select the patch file and browse to the WC." +msgstr "这两种方法只是提供了做同一件事的不同方式。第一种方法，你先选择工作副本，然后浏览补丁文件。第二种方法，你先选择补丁文件，然后浏览工作副本。" -#: source/TortoiseSVN_en.xml:5394(para) -msgid "Because Subversion's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." -msgstr "由于Subversion的版本属性不受版本控制，对于这种属性的修改(如 svn:log提交信息属性将永久覆盖该属性之前的值。" +#: source/TortoiseSVN_en.xml:7764(para) +msgid "Once you have selected the patch file and working copy location, TortoiseMerge runs to merge the changes from the patch file with your working copy. A small window lists the files which have been changed. Double click on each one in turn, review the changes and save the merged files." +msgstr "一旦你选定了补丁文件和工作副本的位置，TortoiseMerge就会把布丁文件合并到你的工作副本中。系统会弹出一个小窗口列出所有被更改了的文件。依次双击每一个文件，检查所做的改变，然后保存合并后的文件。远程开发者的补丁现在已经应用到了你的工作副本上，你需要提交它以使每一个人都可以从代码库访问到这些修改。" -#: source/TortoiseSVN_en.xml:54(para) -msgid "Have you ever found a bug in your project and wanted to know when that bug got into your files?" -msgstr "是否曾经在项目中发现了一个 BUG，然后想调查它是什么时候产生的？" +#: source/TortoiseSVN_en.xml:7771(para) +msgid "The remote developer's patch has now been applied to your working copy, so you need to commit to allow everyone else to access the changes from the repository." +msgstr "远程开发者的补丁现在已经应用到了你的工作副本上，你需要提交它以使每一个人都可以从代码库访问到这些修改。" -#: source/TortoiseSVN_en.xml:5404(title) -msgid "Filtering Log Messages" -msgstr "过滤日志信息" +#: source/TortoiseSVN_en.xml:7779(title) +msgid "Who Changed Which Line?" +msgstr "谁修改了哪一行？" -#: source/TortoiseSVN_en.xml:5406(primary) -msgid "filter" -msgstr "过滤器" +#: source/TortoiseSVN_en.xml:7781(primary) +msgid "blame" +msgstr "追溯" -#: source/TortoiseSVN_en.xml:5408(para) -msgid "If you want to restrict the log messages to show only those you are interested in rather than scrolling through a list of hundreds, you can use the filter controls at the top of the Log Dialog. The start and end date controls allow you to restrict the output to a known date range. The search box allows you to show only messages which contain a particular phrase." -msgstr "如果你只想要显示上千条日志中你所感兴趣的日志，你可以使用日志对话框顶部的过滤器控件。开始和结束日期控件允许你查看指定日期范围内的输出。查找框帮你查出含有指定内容的信息。" +#: source/TortoiseSVN_en.xml:7784(primary) +msgid "annotate" +msgstr "评注" -#: source/TortoiseSVN_en.xml:5417(para) -msgid "Note that these filters act on the messages already retrieved. They do not control downloading of messages from the repository." -msgstr "要注意的是，这些过滤器只对已经获取的信息有效。它们并不从版本库中下载信息。" +#: source/TortoiseSVN_en.xml:7787(primary) +msgid "praise" +msgstr "称赞" -#: source/TortoiseSVN_en.xml:5421(para) -msgid "You can also filter the path names in the bottom pane using the Hide unrelated changed paths checkbox. Related paths are those which contain the path used to display the log. If you fetch the log for a folder, that means anything in that folder or below it. For a file it means just that one file. The checkbox is tri-state: you can show all paths, grey out the unrelated ones, or hide the unrelated paths completely." -msgstr "你还可以使用隐藏无关的修改路径 复选框来过滤底部面板中的路径名称。所谓相关路径，是指那些与日志相关的路径。对于一个文件夹的日志来说，相关路径就是该文件夹以其下的所有内容。对于一个文件的日志来说，相关路径就是与该文件的路径。该复选框是3态的: 可以显示所有的路径，将无关的内容灰色显示，或是完全隐藏无关路径。" +#: source/TortoiseSVN_en.xml:7790(para) +msgid "Sometimes you need to know not only what lines have changed, but also who exactly changed specific lines in a file. That's when the TortoiseSVNBlame... command, sometimes also referred to as annotate command comes in handy." +msgstr "有时你不仅要知道哪一行做了修改，还要精确地知道谁修改了一个文件中的哪一行。这就是TortoiseSVN追溯...命令，有时候也叫做 评注 命令派上用场的时候了。" -#: source/TortoiseSVN_en.xml:5433(title) -msgid "Statistical Information" -msgstr "统计信息" +#: source/TortoiseSVN_en.xml:7800(para) +msgid "This command lists, for every line in a file, the author and the revision the line was changed." +msgstr "对一个文件中的每一行，这个命令列出了作者和该行修改时的版本。" -#: source/TortoiseSVN_en.xml:5435(primary) -msgid "statistics" -msgstr "统计" +#: source/TortoiseSVN_en.xml:7805(title) +msgid "Blame for Files" +msgstr "追溯文件" -#: source/TortoiseSVN_en.xml:5437(para) -msgid "The Statistics button brings up a box showing some interesting information about the revisions shown in the Log dialog. This shows how many authors have been at work, how many commits they have made, progress by week, and much more. Now you can see at a glance who has been working hardest and who is slacking ;-)" -msgstr "统计按扭，可以显示一些你感兴趣的关于日志对话框中版本的信息。可以显示已经有几个作者做了工作，他们各提交了几次，按周的统计，等等。现在，你可以发现一个大概情况: 谁最勤快，谁偷懒。;-)" +#: source/TortoiseSVN_en.xml:7808(title) +msgid "The Annotate / Blame Dialog" +msgstr "评注/追溯对话框" -#: source/TortoiseSVN_en.xml:5446(title) -msgid "Statistics Page" -msgstr "统计页" +#: source/TortoiseSVN_en.xml:7806(para) +msgid " If you're not interested in changes from earlier revisions you can set the revision from which the blame should start. Set this to 1, if you want the blame for every revision." +msgstr "如果对早期版本的修改不感兴趣，你可以设置从哪个版本开始追溯。如果你想追溯每一个版本，你可以把那个数值设置为1。" -#: source/TortoiseSVN_en.xml:5447(para) -msgid "This page gives you all the numbers you can think of, in particular the period and number of revisions covered, and some min/max/average values." -msgstr "此页可以提供所有你可以想到的数据，特别是周期和包括的版本数，还有一些最大/最小/平均值。" +#: source/TortoiseSVN_en.xml:7815(para) +msgid "By default the blame file is viewed using TortoiseBlame, which highlights the different revisions to make it easier to read. If you wish to print or edit the blame file, select Use Text viewer to view blames" +msgstr "默认情况下，追溯文件使用TortoiseBlame,这个工具可以高亮显示不同版本从而使阅读更加容易。如果想打印或者编辑追溯文件，复选使用文字编辑器查看追溯信息。" -#: source/TortoiseSVN_en.xml:5454(title) -msgid "Commits by Author Page" -msgstr "作者提交次数统计页" +#: source/TortoiseSVN_en.xml:7821(para) +msgid "Once you press OK TortoiseSVN starts retrieving the data to create the blame file. Please note: This can take several minutes to finish, depending on how much the file has changed and of course your network connection to the repository. Once the blame process has finished the result is written into a temporary file and you can view the results." +msgstr "一旦你按了 OK 按钮，TortoiseSVN就开始从版本库获取数据创建追溯文件。注意: 视修改的文件的多少和你的网络连接情况，可能会花掉几分钟到几十分钟不等。追溯过程完成后，其结果将会写到一个临时文件中，你可以读到这个结果文件。" -#: source/TortoiseSVN_en.xml:5455(para) -msgid " This graph shows you which authors have been active on the project as a simple histogram, stacked histogram or pie chart. " -msgstr "此图用简单柱状图、叠加柱状图或饼图显示了哪些作者已经在项目中活跃了。" +#: source/TortoiseSVN_en.xml:7831(title) +msgid "TortoiseBlame" +msgstr "TortoiseBlame" -#: source/TortoiseSVN_en.xml:5457(title) -msgid "Commits-by-Author Histogram" -msgstr "作者提交次数统计柱状图" +#: source/TortoiseSVN_en.xml:7829(para) +msgid " TortoiseBlame, which is included with TortoiseSVN, makes the blame file easier to read. When you hover the mouse over a line in the blame info column, all lines with the same revision are shown with a darker background. Lines from other revisions which were changed by the same author are shown with a light background. The colouring may not work as clearly if you have your display set to 256 colour mode." +msgstr " TortoiseBlame,包含在TortoiseSVN中,使得追溯文件更加容易阅读。当你的鼠标在追溯信息列的某一行上盘旋时，所有和该列具有相同版本号的行都会用一个比较暗的背景色显示。同一作者修改的其他版本的行会用一个亮一些的背景色显示。如果你的显示设置为256色模式，那么颜色显示的可能不会很清楚。" -#: source/TortoiseSVN_en.xml:5464(title) -msgid "Commits-by-Author Pie Chart" -msgstr "作者提交次数统计饼图" +#: source/TortoiseSVN_en.xml:7842(para) +msgid "If you left click on a line, all lines with the same revision are highlighted, and lines from other revisions by the same author are highlighted in a lighter colour. This highlighting is sticky, allowing you to move the mouse without losing the highlights. Click on that revision again to turn off highlighting." +msgstr "如果在某一行上左击，具有同一版本号的所有行都会高亮显示，同一作者的其他版本的行会用一个更亮的颜色高亮显示。这个高亮具有粘性，也就是说允许你移动鼠标但原先高亮的地方仍然保持高亮。再次点击该版本将关闭高亮显示。" -#: source/TortoiseSVN_en.xml:5468(para) -msgid "Where there are a few major authors and many minor contributors, the number of tiny segments can make the graph more difficult to read. The slider at the bottom allows you to set a threshold (as a per centage of total commits) below which any activity is grouped into an Others category." -msgstr "其中有几个主要作者和许多辅助的作者。由于太小的部分会导致图形难于阅读，所以在底部有个滑动条，可以设置一个范围(占所有提交的百分比)，在这个范围下的所有行为都整合成其他类。" +#: source/TortoiseSVN_en.xml:7849(para) +msgid "The revision comments (log message) are shown in a hint box whenever the mouse hovers over the blame info column. If you want to copy the log message for that revision, use the context menu which appears when you right click on the blame info column." +msgstr "只要鼠标逗留在追溯信息列，版本注释(日志信息)就会作为提示出现。如果你想复制此版本的日志信息，使用在追溯信息列显示的右键菜单。" -#: source/TortoiseSVN_en.xml:5477(title) -msgid "Commits by date Page" -msgstr "按日期提交统计页" +#: source/TortoiseSVN_en.xml:7855(para) +msgid "You can search within the Blame report using EditFind.... This allows you to search for revision numbers, authors and the content of the file itself. Log messages are not included in the search - you should use the Log Dialog to search those." +msgstr "你可以在追溯报告里用编辑查找...来搜索想要的内容。它允许你搜索版本号，作者还有文件的内容。这个搜索不包含日志信息－你可以在日志对话框里搜索日志信息。" -#: source/TortoiseSVN_en.xml:5478(para) -msgid " This page gives you a graphical representation of project activity in terms of number of commits and author. This gives some idea of when a project is being worked on, and who was working at which time." -msgstr "本页图示了以提交次数和作者作为条件的项目行为统计。这里可以看出项目什么时候有人在工作，以及什么人在什么时候进行了工作。" +#: source/TortoiseSVN_en.xml:7865(para) +msgid "You can also jump to a specific line number using EditGo To Line...." +msgstr "你也可以使用 编辑转到行 ... 来跳到指定行。" -#: source/TortoiseSVN_en.xml:5480(title) -msgid "Commits-by-date Graph" -msgstr "按日期提交统计图" +#: source/TortoiseSVN_en.xml:7872(para) +msgid "When the mouse is over the blame info columns, a context menu is available which helps with comparing revisions and examining history, using the revision number of the line under the mouse as a reference. Context menuBlame previous revision generates a blame report for the same file, but using the previous revision as the upper limit. This gives you the blame report for the state of the file just before the line you are looking at was last changed. Context menuShow changes starts your diff viewer, showing you what changed in the referenced revision. Context menuShow log displays the revision log dialog starting with the referenced revision." +msgstr "" -#: source/TortoiseSVN_en.xml:5488(para) -msgid "When there are several authors, you will get many lines on the graph. There are two views available here: normal, where each author's activity is relative to the base line, and stacked, where each author's activity is relative to the line underneath. The latter option avoids the lines crossing over, which can make the graph easier to read, but less easy to see one author's output." -msgstr "如果有多个作者，你就会在图中看到多行。有两种视图可用正常，在这里，每个作者的行为都相对于基线；叠加，在这里每个作者的行为是相对于他的下面那条线。后一种视图避免了线的交叉，对于图来说更明了，但对查看一个作者的输出比较不直观。" +#: source/TortoiseSVN_en.xml:7894(para) +msgid "Although TortoiseBlame has no settings dialog of its own, it uses the same font as TortoiseMerge, so if you want to change it, start TortoiseMerge and use the settings dialog there." +msgstr "" -#: source/TortoiseSVN_en.xml:5498(para) -msgid "By default the analysis is case-sensitive, so users PeterEgan and PeteRegan are treated as different authors. However, in many cases usernames are not case-sensitive, and are sometimes entered inconsistently, so you may want DavidMorgan and davidmorgan to be treated as the same person. Use the Authors case insensitive checkbox to control how this is handled." -msgstr "默认统计是区别大小写的，也就是说用户PeterEgan与PeteRegan被认为是两个不同的作者。但在多数时候用户名并不区别大小写，有时会存在不一致，所以你可能希望PeterEgan和PeteRegan能被当成是同一个作者。使用作者不区分大小写复选框来控制。" +#: source/TortoiseSVN_en.xml:7901(title) source/TortoiseSVN_en.xml:7926(term) +msgid "Blame Differences" +msgstr "追溯不同点" -#: source/TortoiseSVN_en.xml:550(title) -msgid "Installing TortoiseSVN" -msgstr "安装 TortoiseSVN" +#: source/TortoiseSVN_en.xml:7902(para) +msgid "One of the limitations of the Blame report is that it only shows the file as it was in a particular revision, and shows the last person to change each line. Sometimes you want to know what change was made, as well as who made it. What you need here is a combination of the diff and blame reports." +msgstr "追溯报告的一个局限性就是它仅仅象显示一个特殊版本一样显示文件，并显示出修改每一行的最后一个人。有时候你想知道谁做了什么修改。你所需要的就是把差异和追溯报告结合起来。" -#: source/TortoiseSVN_en.xml:5508(para) -msgid "Note that the statistics cover the same period as the Log dialog. If that is only displaying one revision then the statistics will not tell you very much." -msgstr "注意，统计只包括了日志对话框中的那段时期。如果日志对话框中只显示一个版本，那么统计就没有什么意义了。" +#: source/TortoiseSVN_en.xml:7912(term) +msgid "Blame Revisions" +msgstr "追溯版本" -#: source/TortoiseSVN_en.xml:5516(title) -msgid "Viewing Differences" -msgstr "查看差异" +#: source/TortoiseSVN_en.xml:7914(para) +msgid "In the top pane, select 2 revisions, then select Context menuBlame revisions. This will fetch the blame data for the 2 revisions, then use the diff viewer to compare the two blame files." +msgstr "在顶部窗口，选择两个版本，然后选择上下文菜单追溯版本。它将取出两个版本的追溯数据，然后使用差异察看器比较这两个追溯文件。" -#: source/TortoiseSVN_en.xml:5518(primary) -msgid "diff" -msgstr "比较" +#: source/TortoiseSVN_en.xml:7928(para) +msgid "Select one revision in the top pane, then pick one file in the bottom pane and select Context menuBlame differences. This will fetch the blame data for the selected revision and the previous revision, then use the diff viewer to compare the two blame files." +msgstr "在上面的面板里选择一个版本，然后在下面的面板选择一个文件然后选择上下文菜单追溯差异。这会为选定版本及其上一个版本获取追溯数据，然后用差异阅读器比较两份追溯文件。" -#: source/TortoiseSVN_en.xml:552(title) -msgid "System requirements" -msgstr "系统要求" +#: source/TortoiseSVN_en.xml:7942(term) +msgid "Compare and Blame with Working BASE" +msgstr "与工作副本比较并追溯" -#: source/TortoiseSVN_en.xml:5520(para) -msgid "One of the commonest requirements in project development is to see what has changed. You might want to look at the differences between two revisions of the same file, or the differences between two separate files. TortoiseSVN provides a builtin tool named TortoiseMerge for viewing differences of text files. For viewing differences of image files, TortoiseSVN also has a tool named TortoiseIDiff. Of course, you can use your own favourite diff program if you like." -msgstr "在项目开发中，有一个很常用的要求就是查看更改。可能是你要求查看同一文件的两个版本之间的差异，或者是查看两个独立的文件的差异。TortoiseSVN自带了一个工具叫TortoiseMerge用来查看文本文件的差异。也有一个叫TortoiseIDiff的工具来比较图像文件的差异。当然，你可以根据你自己的喜好来选择比较差异的工具。" +#: source/TortoiseSVN_en.xml:7944(para) +msgid "Show the log for a single file, and in the top pane, select a single revision, then select Context menuCompare and Blame with Working BASE. This will fetch the blame data for the selected revision, and for the file in the working BASE, then use the diff viewer to compare the two blame files." +msgstr "为一个单一文件显示日志，在上面的面板选择一个版本，然后选择上下文菜单与工作副本比较并追溯。这会为文件的选择版本和工作副本获取追溯数据，然后使用差异阅读器比较两份追溯文件。" -#: source/TortoiseSVN_en.xml:553(para) -msgid "TortoiseSVN runs on Win2k SP2, WinXP or higher. Windows 98, Windows ME and Windows NT4 are no longer supported since TortoiseSVN 1.2.0, but you can still download the older versions if you really need them." -msgstr "TortoiseSVN 可以运行在 Win2k SP2，WinXP 或更高的版本，TortoiseSVN 1.2.0 以后不再支持 Windows 98, Windows ME 和Windows NT4，但是如果需要的话，你仍旧可以下载以前的版本。" +#: source/TortoiseSVN_en.xml:7908(para) +msgid "The revision log dialog includes several options which allow you to do this. " +msgstr "在版本日志对话框里包含了以下几个选项支持你做这样的操作。" -#: source/TortoiseSVN_en.xml:5533(title) -msgid "File Differences" -msgstr "文件差异" +#: source/TortoiseSVN_en.xml:7962(title) source/TortoiseSVN_en.xml:7980(title) +msgid "The Repository Browser" +msgstr "版本库浏览器" -#: source/TortoiseSVN_en.xml:5536(term) -msgid "Local changes" -msgstr "本地更改" +#: source/TortoiseSVN_en.xml:7964(primary) +msgid "repobrowser" +msgstr "版本库浏览器" -#: source/TortoiseSVN_en.xml:5538(para) -msgid "If you want to see what changes you have made in your working copy, just use the explorer context menu and select TortoiseSVNDiff." -msgstr "如果你想看到你的本地副本有哪些更加，只用在资源管理器中右键菜单下选TortoiseSVN比较差异。" +#: source/TortoiseSVN_en.xml:7967(primary) +msgid "server-side actions" +msgstr "服务器端动作" -#: source/TortoiseSVN_en.xml:5550(term) -msgid "Difference to another branch/tag" -msgstr "与另外一个分支/标签之间的差异" +#: source/TortoiseSVN_en.xml:7973(para) +msgid "Sometimes you need to work directly on the repository, without having a working copy. That's what the Repository Browser is for. Just as the explorer and the icon overlays allow you to view your working copy, so the Repository Browser allows you to view the structure and status of the repository. With the Repository Browser you can execute commands like copy, move, rename, ... directly on the repository." +msgstr "有时候我们需要在版本库中直接进行操作，而不是在工作副本中。这就是我们的版本库浏览器可以做到的。正如资源管理器和能浏览你的工作副本一样，版本库浏览器允许你浏览版本库的结构和状态。 在版本库浏览器中你可以执行比如复制，转移，重命名、、、直接操作在版本库上。" -#: source/TortoiseSVN_en.xml:5552(para) -msgid "If you want to see what has changed on trunk (if you are working on a branch) or on a specific branch (if you are working on trunk), you can use the explorer context menu. Just hold down the Shift key while you right click on the file. Then select TortoiseSVNDiff with URL. In the following dialog, specify the URL in the repository with which you want to compare your local file to." -msgstr "如果你想查看主干程序(假如你在分支上开发)有哪些修改或者是某一分支(假如你在主干上开发)有哪些修改，你可以使用右键菜单。在你点击文件的同时按住Shift键，然后选择TortoiseSVN URL比较。在弹出的对话框中，将特别显示将与你本地版本做比较的版本的URL地址。" +#: source/TortoiseSVN_en.xml:7986(para) +msgid "The repository browser looks very similar to the Windows explorer, except that it is showing the content of the repository at a particular revision rather than files on your computer. In the left pane you can see a directory tree, and in the right pane are the contents of the selected directory. At the top of the Repository Browser Window you can enter the URL of the repository and the revision you want to browse." +msgstr "" -#: source/TortoiseSVN_en.xml:5565(para) -msgid "You can also use the repository browser and select two trees to diff, perhaps two tags, or a branch/tag and trunk. The context menu there allows you to compare them using Compare revisions. Read more in ." -msgstr "你还可以使用版本库浏览器，选择两个目录树比较，也许是两个标记，或者是分支/标记和最新版本。邮件菜单允许你使用比较版本来比较它们。阅读以便获得更多信息。" +#: source/TortoiseSVN_en.xml:7995(para) +msgid "Just like Windows explorer, you can click on the column headings in the right pane if you want to set the sort order. And as in explorer there are context menus available in both panes." +msgstr "" -#: source/TortoiseSVN_en.xml:5575(term) -msgid "Difference from a previous revision" -msgstr "与历史版本的比较差异" +#: source/TortoiseSVN_en.xml:8010(para) +msgid "Save an unversioned copy of the file to your hard drive." +msgstr "在你的硬盘上保存此文件的一个未版本控制的副本。" -#: source/TortoiseSVN_en.xml:5577(para) -msgid "If you want to see the difference between a particular revision and your working copy, use the Revision Log dialog, select the revision of interest, then select Compare with working copy from the context menu." -msgstr "如果你想查看某一特定版本与本地副本之间的差异，使用显示日志对话框，选择要比较的版本，然后选择在右键菜单中选与本地副本比较差异" +#: source/TortoiseSVN_en.xml:8015(para) +msgid "Show the revision log for that file, or show a graph of all revisions so you can see where the file came from." +msgstr "" -#: source/TortoiseSVN_en.xml:5587(term) -msgid "Difference between two previous revisions" -msgstr "两个历史版本的比较" +#: source/TortoiseSVN_en.xml:8021(para) +msgid "Blame the file, to see who changed which line and when." +msgstr "追溯这个文件，查看是谁在何时修改哪些行。" -#: source/TortoiseSVN_en.xml:5589(para) -msgid "If you want to see the difference between two revisions which are already committed, use the Revision Log dialog and select the two revisions you want to compare (using the usual Ctrl-modifier). Then select Compare revisions from the context menu." -msgstr "如果你要查看任意已提交的两个历史版本之间的差异，在版本日志对话框中选择你要比较的两个版本(一般使用 Ctrl-更改)，然后在右键菜单中选比较版本差异" +#: source/TortoiseSVN_en.xml:8026(para) +msgid "Delete or rename the file." +msgstr "删除或改名文件。" -#: source/TortoiseSVN_en.xml:559(para) -msgid "If you encounter any problems during or after installing TortoiseSVN please refer to first." -msgstr "如果在安装 TortoiseSVN 时发现了任何问题，请首先参考。" +#: source/TortoiseSVN_en.xml:8031(para) +msgid "Make a copy of the file, either to a different part of the repository, or to a working copy rooted in the same repository." +msgstr "" + +#: source/TortoiseSVN_en.xml:8037(para) +msgid "View the file's properties (you cannot edit properties directly in the repository)." +msgstr "查看文件的属性(你不能直接在版本库编辑属性)。" -#: source/TortoiseSVN_en.xml:5597(para) -msgid "If you did this from the revision log for a folder, a Compare Revisions dialog appears, showing a list of changed files in that folder. Read more in ." -msgstr "如果你在文件夹的版本日志中这样做，就会出现一个比较版本对话框，显示此文件夹的文件修改列表。阅读以便获得更多信息。" +#: source/TortoiseSVN_en.xml:8000(para) +msgid "The context menu for a file allows you to: " +msgstr "" -#: source/TortoiseSVN_en.xml:5606(term) -msgid "All changes made in a commit" -msgstr "提交所有修改" +#: source/TortoiseSVN_en.xml:8048(para) +msgid "Show the revision log for that folder, or show a graph of all revisions so you can see where the folder came from." +msgstr "" -#: source/TortoiseSVN_en.xml:5608(para) -msgid "If you want to see the changes made to all files in a particular revision in one view, you can use Unified-Diff output (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all the changes together. From the Revision Log dialog select the revision of interest, then select Show Differences as Unified-Diff from the context menu." -msgstr "如果你要在一个视窗中查看某一版本的所有更改，你可以使用统一显示所有比较 (GNU 片段整理)。它将显示所有修改中的部分内容。它很难显示一个全面清晰的比较，但是会将所有更改都集中显示出来。在版本日志对话框中选择某一版本，然后在右键菜单中选择统一显示所有比较。" +#: source/TortoiseSVN_en.xml:8054(para) +msgid "Export the folder to a local unversioned copy on your hard drive." +msgstr "" -#: source/TortoiseSVN_en.xml:5622(term) -msgid "Difference between files" -msgstr "文件差异" +#: source/TortoiseSVN_en.xml:8059(para) +msgid "Checkout the folder to produce a local working copy on your hard drive." +msgstr "" -#: source/TortoiseSVN_en.xml:5624(para) -msgid "If you want to see the differences between two different files, you can do that directly in explorer by selecting both files (using the usual Ctrl-modifier). Then from the explorer context menu select TortoiseSVNDiff." -msgstr "如果你要查看两个不同文件之间的差异，你可以直接在资源管理器中选择这两个文件(一般使用 Ctrl-modifier)，然后右键菜单中选TortoiseSVN比较差异。" +#: source/TortoiseSVN_en.xml:8064(para) +msgid "Create a new folder in the repository." +msgstr "在版本库创建新目录。" -#: source/TortoiseSVN_en.xml:5637(term) -msgid "Difference between WC file/folder and a URL" -msgstr "WC文件/文件夹与URL之间的比较差异" +#: source/TortoiseSVN_en.xml:8069(para) +msgid "Add files or folders directly to the repository." +msgstr "直接向版本库增加文件或目录。" -#: source/TortoiseSVN_en.xml:5639(para) -msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseSVNDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patchfile - a list of changed files which you can view one at a time." -msgstr "如果你要查看你本地副本中的任一文件与版本库中任一文件之间差异，" +#: source/TortoiseSVN_en.xml:8074(para) +msgid "Delete or rename the folder." +msgstr "删除或改名文件夹。" -#: source/TortoiseSVN_en.xml:5657(term) -msgid "Difference with blame information" -msgstr "谴责信息之间的比较差异" +#: source/TortoiseSVN_en.xml:8079(para) +msgid "Make a copy of the folder, either to a different part of the repository, or to a working copy rooted in the same repository." +msgstr "" -#: source/TortoiseSVN_en.xml:5659(para) -msgid "If you want to see not only the differences but also the author, revision and date that changes were made, you can combine the diff and blame reports from within the revision log dialog. Read for more detail." -msgstr "如果你要查看的不仅是比较差异而且包括修改该版本的作者，版本号和日期，你可以在版本日志对话框中综合比较差异和谴责信息。这里有更多详细介绍。" +#: source/TortoiseSVN_en.xml:8085(para) +msgid "View the folder's properties (you cannot edit properties directly in the repository)." +msgstr "查看文件夹的属性(你不能直接在版本库编辑属性)。" -#: source/TortoiseSVN_en.xml:5668(term) -msgid "Difference between folders" -msgstr "比较文件夹差异" +#: source/TortoiseSVN_en.xml:8091(para) +msgid "Mark the folder for comparison. A marked folder is shown in bold." +msgstr "" -#: source/TortoiseSVN_en.xml:567(title) -msgid "Installation" -msgstr "安装" +#: source/TortoiseSVN_en.xml:8096(para) +msgid "Compare the folder with a previously marked folder, either as a unified diff, or as a list of changed files which can then be visually diffed using the default diff tool. This can be particularly useful for comparing two tags, or trunk and branch to see what changed." +msgstr "将此文件夹与以前标记的文件夹比较，用统一差异，或者是一个可以用默认比较工具可视化显示差异的文件改变列表。它对于比较两个标签，或者最新版本与分支，查看修改详情时尤其有用。" -#: source/TortoiseSVN_en.xml:5670(para) -msgid "The builtin tools supplied with TortoiseSVN do not support viewing differences between directory hierarchies. But if you have an external tool which does support that feature, you can use that instead. In we tell you about some tools which we have used." -msgstr "TortoiseSVN 自带的内置工具不支持查看多级目录之间的差异，但你可以使用支持该功能的外置工具来替代。在这里 我们可以介绍一些我们使用过的工具。" +#: source/TortoiseSVN_en.xml:8044(para) +msgid "The context menu for a folder allows you to: " +msgstr "" -#: source/TortoiseSVN_en.xml:5682(title) -msgid "Comparing Folders" -msgstr "比较文件夹" +#: source/TortoiseSVN_en.xml:8105(para) +msgid "If you select two folders in the right pane, you can view the differences either as a unified-diff, or as a list of files which can be visually diffed using the default diff tool." +msgstr "如果你在右窗格选择两个文件夹，你可以用统一差异，或者是一个可以用默认比较工具可视化显示差异的文件改变列表来查看其区别。" -#: source/TortoiseSVN_en.xml:5684(primary) -msgid "compare revisions" -msgstr "比较两个修订版本" +#: source/TortoiseSVN_en.xml:8110(para) +msgid "If you select multiple folders in the right pane, you can checkout all of them at once into a common parent folder." +msgstr "" -#: source/TortoiseSVN_en.xml:5687(primary) -msgid "export changes" -msgstr "导出修改" +#: source/TortoiseSVN_en.xml:8114(para) +msgid "If you select 2 tags which are copied from the same root (typically /trunk/), you can use Context MenuShow Log... to view the list of revisions between the two tag points." +msgstr "如果你选择两个拥有相同历史的标签(特别是/主干/)，你可以使用右键菜单显示日志...来查看" -#: source/TortoiseSVN_en.xml:5689(para) -msgid " When you select two trees within the repository browser, or when you select two revisions of a folder in the log dialog, you can Context menuCompare revisions." -msgstr " 当你在版本库浏览器中选择了两个树，或者在日志对话框中选择了一个文件夹的两个版本，就可以使用上下文菜单比较版本。" +#: source/TortoiseSVN_en.xml:8123(para) +msgid "You can use F5 to refresh the view as usual. This will refresh everything which is currently displayed. If you want to pre-fetch or refresh the information for nodes which have not been opened yet, use CTRL-F5. After that, expanding any node will happen instantly without a network delay while the information is fetched." +msgstr "" -#: source/TortoiseSVN_en.xml:569(primary) -msgid "install" -msgstr "安装" +#: source/TortoiseSVN_en.xml:8130(para) +msgid "You can also use the repository browser for drag-and-drop operations. If you drag a folder from explorer into the repo browser, it will be imported into the repository. Note that if you drag multiple items, they will be imported in separate commits." +msgstr "你也可以在版本库浏览器中使用拖拽的操作。如果你把一个文件夹从资源管理器中拖拽到版本库浏览器中，那就实现该文件夹的导入功能。有一点要注意，在导入多个文件时，必须分开一个一个地拖进去。" -#: source/TortoiseSVN_en.xml:5691(title) -msgid "The Compare Revisions Dialog" -msgstr "修订版本版本比较对话框" +#: source/TortoiseSVN_en.xml:8136(para) +msgid "If you want to move an item within the repository, just left drag it to the new location. If you want to create a copy rather than moving the item, Ctrl left drag instead. When copying, the cursor has a plus symbol on it, just as it does in Explorer." +msgstr "如果要在版本库浏览器中移动一个文件，只用左键拖到它要去的位置。如果你更愿意去复制该文件的话，使用这个按住左键拖 。操作就像在资源管理器中一样，复制时指针加 来标记。" -#: source/TortoiseSVN_en.xml:5701(para) -msgid "This dialog shows a list of all files which have changed and allows you to compare or blame them individually using context menu." -msgstr "这个对话框显示一个所有已经修改的文件列表，允许你使用邮件菜单单独的比较或回溯它们。" +#: source/TortoiseSVN_en.xml:8142(para) +msgid "If you want to copy/move a file or folder to another location and also give it a new name at the same time, you can right drag or ctrl right drag the item instead of using left drag. In that case, a rename dialog is shown where you can enter a new name for the file or folder." +msgstr "如果你要复制/移动一个文件或文件夹到一个新的位置并重命名，你可以右键拖 或者 按住右键拖这个文件，而不用左键拖。这样，就会显示对话框来为该文件或文件夹重命名。" -#: source/TortoiseSVN_en.xml:5705(para) -msgid "You can also export the list of changed files to a text file, or you can export the changed files themselves to a folder. This operation works on the selected files only, so you need to select the files of interest - usually that means all of them." -msgstr "你也可以将已经修改的文件列表导出到一个文本文件中，或者将修改的文件导出到一个目录。这个操作只在选择的文件上工作，所以你需要选择感兴趣的文件 - 通常是所有文件。" +#: source/TortoiseSVN_en.xml:8149(para) +msgid "Whenever you make changes in the repository using one of these methods, you will be presented with a log message entry dialog. If you dragged something by mistake, this is also your chance to cancel the action." +msgstr "无论什么时候对版本库的任意操作，都要求加入它的操作日志。这为你操作失误提供了返回的机会。" -#: source/TortoiseSVN_en.xml:571(para) -msgid "TortoiseSVN comes with an easy to use installer. Doubleclick on the installer file and follow the instructions. The installer will take care of the rest. If you want to install TortoiseSVN for all users then you must have administrator rights on your system. If you don't have those rights, TortoiseSVN will automatically install for the current user only." -msgstr "TortoiseSVN 有一个简单易用的安装程序，双击安装文件，根据指导，安装程序会完成剩下的工作，如果你希望为所有用户安装 TortoiseSVN，你必须有系统的管理员权限，如果你没有那些权限，TortoiseSVN 只会为当前用户安装。" +#: source/TortoiseSVN_en.xml:8154(para) +msgid "Sometimes when you try to open a path you will get an error message in place of the item details. This might happen if you specified an invalid URL, or if you don't have access permission, or if there is some other server problem. If you need to copy this message to include it in an email, just right click on it and use Context MenuCopy error message to clipboard, or simply use CTRL+C." +msgstr "有时候当你访问一个路径时，会跳出一个错误信息。也许是不可用的URL，也许是你没有访问权限，或者其他的一些原因，如果你要把这些信息发送出去，只用点击它然后右键复制错误信息到剪贴板，或者简单地用CTRL+C。" -#: source/TortoiseSVN_en.xml:5711(para) -msgid "If you want to export the list of files and the actions (modified, added, deleted) as well, you can do that using the keyboard shortcuts Ctrl-A to select all entries and Ctrl-C to copy the detailed list to the clipboard." -msgstr "如果你需要导出文件列表和和动作(修改，增加，删除)，你可以使用快捷键Ctrl-A选择所有项，用Ctrl-C将详细列表复制到剪贴板。" +#: source/TortoiseSVN_en.xml:8169(title) +msgid "Revision Graphs" +msgstr "版本分支图" -#: source/TortoiseSVN_en.xml:5717(para) -msgid "The button at the top allows you to change the direction of comparison. You can show the changes need to get from A to B, or if you prefer, from B to A." -msgstr "顶部的按钮允许你改变比较的方向。你可以显示从A到B的修改，或者如果你喜欢，显示从B到A的修改。" +#: source/TortoiseSVN_en.xml:8174(primary) +msgid "graph" +msgstr "分支" -#: source/TortoiseSVN_en.xml:5722(para) -msgid "The buttons with the revision numbers on can be used to change to a different revision range. When you change the range, the list of items which differ between the two revisions will be updated automatically." -msgstr "有版本数字的按钮可以用来改变版本范围。当你改变范围时，两个版本不同的项目列表会自动更新。" +#: source/TortoiseSVN_en.xml:8178(title) +msgid "A Revision Graph" +msgstr "一个版本分支" -#: source/TortoiseSVN_en.xml:5729(title) -msgid "Diffing Images Using TortoiseIDiff" -msgstr "使用 TortoiseIDiff 进行比较的图像" +#: source/TortoiseSVN_en.xml:8176(para) +msgid " Sometimes you need to know where branches and tags were taken from the trunk, and the ideal way to view this sort of information is as a graph or tree structure. That's when you need to use TortoiseSVNRevision Graph..." +msgstr "有时候，我们需要知道从哪开始有了分支和标签，同时想知道这条支路是单独的分支还是树型结构。如果需要你可以使用TortoiseSVN版本分支图...。" -#: source/TortoiseSVN_en.xml:5731(primary) -msgid "image diff" -msgstr "图像比较" +#: source/TortoiseSVN_en.xml:8189(para) +msgid "This command analyses the revision history and attempts to create a tree showing the points at which copies were taken, and when branches/tags were deleted." +msgstr "这个版本历史分析图能够显示分支/标签从什么地方开始创建，以及什么时候删除。" -#: source/TortoiseSVN_en.xml:5734(primary) -msgid "TortoiseIDiff" -msgstr "TortoiseIDiff" +#: source/TortoiseSVN_en.xml:8195(para) +msgid "In order to generate the graph, TortoiseSVN must fetch all log messages from the repository root. Needless to say this can take several minutes even with a repository of a few thousand revisions, depending on server speed, network bandwidth, etc. If you try this with something like the Apache project which currently has over 300,000 revisions you could be waiting for some time." +msgstr "要实现版本分支图，TortoiseSVN必须从版本库中获取所有的日志信息。一个有上千版本号的版本库会需要几分钟的时间，这个主要有服务器速度，网络带宽等因素决定。如果你使用的是Apache的方式而且版本号超过300，000的话估计要等上比较长的时间了。" -#: source/TortoiseSVN_en.xml:5736(para) -msgid "There are many tools available for diffing text files, including our own TortoiseMerge, but we often find ourselves wanting to see how an image file has changed too. That's why we created TortoiseIDiff." -msgstr "我们有许多有用的比较文本文件的工具，包括我们自带的TortoiseMerge，但是我们也需要查看图像文件的更改。这就是我们设计TortoiseIDiff的原因。" +#: source/TortoiseSVN_en.xml:8208(term) +msgid "Added file/folder" +msgstr "增加文件/文件夹" -#: source/TortoiseSVN_en.xml:5741(para) -#, fuzzy -msgid "TortoiseSVNDiff for any of the common image file formats will start TortoiseIDiff to show image differences. By default the images are displayed side-by-side but you can use the View menu or toolbar to switch to a top-bottom view instead, or if you prefer, you can overlay the images and pretend you are using a lightbox." -msgstr "TortoiseSVN比较差异TortoiseIDiff可以显示同种格式的图像差异。一般情况下是左右对称地显示两个图像，但你也可以通过调整视图滑动条转变为上下显示的模式，如果你愿意，这里支持使用透明框进行图像覆盖的方式，在顶端的滑动条可以调整图像之间的吻合程度(alpha blend)，你也可以使用Ctrl-Shift-Wheel来调整这种程度。" +#: source/TortoiseSVN_en.xml:8210(para) +msgid "Items which have been added, or created by copying another file/folder are shown using a rounded rectangle." +msgstr "已增加或通过复制生成的文件/文件夹以圆圈的方式标记。" -#: source/TortoiseSVN_en.xml:5743(title) -msgid "The image difference viewer" -msgstr "差异察看器截图" +#: source/TortoiseSVN_en.xml:8217(term) +msgid "Deleted file/folder" +msgstr "已删除文件/文件夹" -#: source/TortoiseSVN_en.xml:5756(para) -msgid "Naturally you can also zoom in and out and pan around the image. You can also pan the image simply by left-dragging it. If you select the Link images together option, then the pan controls (scrollbars, wheelmouse) on both images are linked." -msgstr "当然你也可以放大和缩小，或者拉伸图像。你也可以简单的通过左拖组合图像。如果你选择连接图像，则被选择(滑动条，鼠标)的两个图像就被关联起来。" +#: source/TortoiseSVN_en.xml:8219(para) +msgid "Deleted items eg. a branch which is no longer required, are shown using an octagon (rectangle with corners cut off)." +msgstr "已删除文件，比如说一个不在需要的分支，将显示octagon(rectangle with corners cut off)。" -#: source/TortoiseSVN_en.xml:5762(para) -msgid "In image info box shows details about the image file, such as the size in pixels, resolution and colour depth. If this box gets in the way, use ViewImage Info to hide it." -msgstr "在图像信息框中显示了图像的基本信息，比如像素的大小，颜色的深度。如果觉得这个框碍眼可以选择视图图像信息来隐藏它" +#: source/TortoiseSVN_en.xml:8226(term) +msgid "Branch tip revision" +msgstr "分支最新版本" -#: source/TortoiseSVN_en.xml:5772(para) -msgid "When the images are overlaid, the relative intensity of the images (alpha blend) is controlled by a slider control at the left side. You can click anywhere in the slider to set the blend directly, or you can drag the slider to change the blend interactively. Ctrl-Shift-Wheel to change the blend." -msgstr "" +#: source/TortoiseSVN_en.xml:8228(para) +msgid "Where a branch (or trunk or tag) has been modified since the last branch node, this is shown using an ellipse. This means that the latest revision on every branch is always shown on the graph." +msgstr "当一个分支(或者主干或者标签)从最新的节点开始以来有了新的更改，将有一个插件显示出来。也就是说，任意分支的最新版本都会显示在分支图上。" -#: source/TortoiseSVN_en.xml:5779(para) -msgid "The button above the slider toggles between two preset blends, indicated by the markers on either side of the blend slider. By default one is at the top and the other at the bottom, so the toggle button just switches between one image and the other. You can move the markers to choose the two blend values that the toggle button will use." -msgstr "" +#: source/TortoiseSVN_en.xml:8237(term) +msgid "Normal file/folder" +msgstr "一般的文件/文件夹" -#: source/TortoiseSVN_en.xml:5788(title) -msgid "External Diff/Merge Tools" -msgstr "其他的比较/合并工具" +#: source/TortoiseSVN_en.xml:8239(para) +msgid "All other items are shown using a plain rectangle." +msgstr "其他一般的文件用plain rectangle标示。" -#: source/TortoiseSVN_en.xml:5790(primary) -msgid "diff tools" -msgstr "差异比较工具" +#: source/TortoiseSVN_en.xml:8204(para) +msgid "The revision graph shows several types of node: Note that by default the graph only shows the points at which items were added or deleted. Showing every revision of a project will generate a very large graph for non-trivial cases. If you really want to see all revisions where changes were made, there is an option to do this in the View menu and on the toolbar." +msgstr "版本分支图将显示以下内容: 默认的分支信息只会显示那些有增加或删除文件的节点。要显示一个项目的所有版本将会产生一个庞大的毫无价值的版本图。如果你呀看到所有的版本，在视图工具栏里可以找到实现该功能的选项。" -#: source/TortoiseSVN_en.xml:5793(primary) -msgid "merge tools" -msgstr "合并工具" +#: source/TortoiseSVN_en.xml:8251(para) +msgid "There is also an option to arrange the graph by path. This attempts to sort the branches from the tags. Paths which contain no modifications after copying are assumed to be tags and are stacked in a single column. Branches (which contain modifications after creation) each have their own column, so you can see how the branch develops." +msgstr "这也有一个功能来排列版本分支旁支。它根据日志来对分支排序。如果分支从副本创建后都没有修改过一般被认为是一个标签而独立保存起来。每个分支(创建后有过修改的)会有它们自己的列，所以你可以看到分支延展到什么情况了。" -#: source/TortoiseSVN_en.xml:5795(para) -msgid "If the tools we provide don't do what you need, try one of the many open-source or commercial programs available. Everyone has their own favourites, and this list is by no means complete, but here are a few that you might consider:" -msgstr "如果我们提供的这些工具不是你所需要的，可以尝试使用一些其他开源的或者商业的软件。每个人都有不同喜好，下面列表虽不完全，或许有些你也会认可的: " +#: source/TortoiseSVN_en.xml:8258(para) +msgid "Sometimes the revision graph contains more detail than you want to see. ViewFilter opens a dialog which allows you to restrict the range of revisions displayed, and to hide particular paths by name." +msgstr "有时候版本图包含的信息比你想看到的多。视图过滤器打开对话框，允许你限制显示的版本范围，隐藏指定的路径名称模式。" -#: source/TortoiseSVN_en.xml:5803(term) -msgid "WinMerge" -msgstr "WinMerge" +#: source/TortoiseSVN_en.xml:8267(para) +msgid "To make it easier to navigate a large graph, use the overview window. This shows the entire graph in a small window, with the currently displayed portion highlighted. You can drag the highlighted area to change the displayed region." +msgstr "" -#: source/TortoiseSVN_en.xml:5805(para) -msgid "WinMerge is a great open-source diff tool which can also handle directories." -msgstr "WinMergeWinMerge也是一款很好的能处理目录的开源软件。" +#: source/TortoiseSVN_en.xml:8273(para) +msgid "The revision date, author and comments are shown in a hint box whenever the mouse hovers over a revision box." +msgstr "任何时候只要鼠标在版本框上滑过，都会显示该版本的日期、作者和备注信息。" -#: source/TortoiseSVN_en.xml:581(para) -msgid "If you don't have the latest C-runtime and MFC libraries installed, you still must have Administrator privileges to install TortoiseSVN. But once those libraries are installed, you can update or install TortoiseSVN without those privileges." -msgstr "如果你没有安装最新的 C 运行库和 MFC 库，你仍然必须拥有管理员权限才能安装 TortoiseSVN，一旦安装了那些库，你可以在没有特权的情况下更新或安装TortoiseSVN。" +#: source/TortoiseSVN_en.xml:8277(para) +msgid "If you select two revisions (Use Ctrl left click), you can use the context menu to show the differences between these revisions. You can choose to show differences as at the branch creation points, but usually you will want to show the differences at the branch end points, i.e. at the HEAD revision." +msgstr "选择两个版本(用ctrl+左击)，你可以在右键菜单下查看这两个版本的差异。你可以在分支的起始点查看差异，但一般你会在一个分支的结束点来查看，比如，在最新版本。" -#: source/TortoiseSVN_en.xml:5815(term) -msgid "Perforce Merge" -msgstr "Perforce Merge" +#: source/TortoiseSVN_en.xml:8284(para) +msgid "You can view the differences as a Unified-Diff file, which shows all differences in a single file with minimal context. If you opt to Context MenuCompare Revisions you will be presented with a list of changed files. Double click on a file name to fetch both revisions of the file and compare them using the visual difference tool." +msgstr "你可以用查看单一差异文件的方式来查看差异，它在单一的文件中显示差异。如果你选右键菜单比较版本所有修改过的文件都会呈现在列表中。双击一个文件名可以返回文件版本号和他们差异。" -#: source/TortoiseSVN_en.xml:5817(para) -msgid "Perforce is a commercial RCS, but you can download the diff/merge tool for free. Get more information from Perforce." -msgstr "Perforce 是一款商业 RCS，但是你也可以免费下载到。可以从Perforce获得更多信息。" +#: source/TortoiseSVN_en.xml:8295(para) +msgid "If you right click on a revision you can use Context MenuShow Log to view the history." +msgstr "如果右击一个版本你可以使用右键菜单显示日志 来查看它的历史。" -#: source/TortoiseSVN_en.xml:5827(term) -msgid "KDiff3" -msgstr "KDiff3" +#: source/TortoiseSVN_en.xml:8304(para) +msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." +msgstr "因为Subversion不能支持提供所有请求的信息，在有大量请求信息时，有时它能提供强大的返回信息。但无论如何，主干都会产生有用的输出。" -#: source/TortoiseSVN_en.xml:5829(para) -msgid "KDiff3 is a free diff tool which can also handle directories. You can download it from here." -msgstr "KDiff3也是一款能处理目录的免费比较工具。你可以从here下载。" +#: source/TortoiseSVN_en.xml:8313(title) +msgid "Exporting a Subversion Working Copy" +msgstr "导出一个Subversion工作副本" -#: source/TortoiseSVN_en.xml:5839(term) -msgid "ExamDiff" -msgstr "ExamDiff" +#: source/TortoiseSVN_en.xml:8315(primary) +msgid "export" +msgstr "导出" -#: source/TortoiseSVN_en.xml:5841(para) -msgid "ExamDiff Standard is freeware. It can handle files but not directories. ExamDiff Pro is shareware and adds a number of goodies including directory diff and editing capability. In both flavours, version 3.2 and above can handle unicode. You can download them from PrestoSoft." -msgstr "ExamDiff Standard是免费软件。它能处理文件但不能处理目录。ExamDiff Pro是共享软件，拥有一系列的功能包括目录比较和编辑的能力。对于以上体验，3.2及以上版本能处理二进制。你可以从PrestoSoft下载它们。" +#: source/TortoiseSVN_en.xml:8317(para) +msgid "Sometimes you may want a copy of your working tree without any of those .svn directories, e.g. to create a zipped tarball of your source, or to export to a web server. Instead of making a copy and then deleting all those .svn directories manually, TortoiseSVN offers the command TortoiseSVNExport.... Exporting from a URL and exporting from a working copy are treated slightly differently." +msgstr "有时候你需要一个没有.svn目录的工作目录树，例如，创建一份源代码的压缩文件，或者导出一份用作WEB服务器。不用先复制，然后手工删除所有.svn目录。TortoiseSVN提供命令TortoiseSVN导出...。如果你要用这个功能操作拥有一份工作副本，将会在要求你保存一份干净的文件。从URL或工作副本导出有少许不同。" -#: source/TortoiseSVN_en.xml:5856(term) -msgid "Beyond Compare" -msgstr "Beyond Compare" +#: source/TortoiseSVN_en.xml:8332(title) +msgid "The Export-from-URL Dialog" +msgstr "从 URL 导出对话框" -#: source/TortoiseSVN_en.xml:5858(para) -msgid "Similar to ExamDiff Pro, this is an excellent shareware diff tool which can handle directory diffs and unicode. Download it from Scooter Software." -msgstr "和ExamDiff Pro一样，这也是一款很不错的共享软件，同样也能进行目录比较和二进制处理。下载地址Scooter Software。" +#: source/TortoiseSVN_en.xml:8330(para) +msgid " If you execute this command on an unversioned folder, TortoiseSVN will assume that the selected folder is the target, and open a dialog for you to enter the URL and revision to export from. This dialog has options to export only the top level folder, to omit external references, and to override the line end style for files which have the svn:eol-style property set." +msgstr " 如果你在未版本控制的目录执行此命令，TortoiseSVN会假定此目录是目标，弹出对话框让你输入要导出的URL和版本。这个对话框有只导出顶级目录，省略外部引用，以及不管svn:eol-style的取值，重新设置行结束样式等选项。" -#: source/TortoiseSVN_en.xml:5869(term) -msgid "Araxis Merge" -msgstr "Araxis Merge" +#: source/TortoiseSVN_en.xml:8342(para) +msgid "Of course you can export directly from the repository too. Use the Repository Browser to navigate to the relevant subtree in your repository, then use Context MenuExport. You will get the Export from URL dialog described above." +msgstr "当然，你也可以直接从版本库导出。使用版本库浏览器浏览有关子树，然后使用右键菜单导出。就会出现上面所说的从URL导出对话框。" -#: source/TortoiseSVN_en.xml:5871(para) -msgid "Araxis Merge is a useful commercial tool for diff and merging both files and folders. It does three-way comparision in merges and has synchronization links to use if you've changed the order of functions. Download it from Araxis." -msgstr "Araxis Merge是一款能对文件和文件夹进行比较和合并的商业软件。它从三条比较路径进行合并，而且在你修改的同时进行及时有效的链接。可以从这里下载Araxis。" +#: source/TortoiseSVN_en.xml:8352(para) +msgid "If you execute this command on your working copy you'll be asked for a place to save the clean working copy without the .svn folders. By default, only the versioned files are exported, but you can use the Export unversioned files too checkbox to include any other unversioned files which exist in your WC and not in the repository. External references using svn:externals can be omitted if required." +msgstr "如果你要用这个功能操作工作副本，将会询问你要保存干净而没有.svn目录的副本到何处。默认情况下，只导出被版本控制的文件，但你可以使用同时导出未受版本控制的文件来将版本库中没有但在你的本地副本中存在的文件导出来。另外可以使用svn:externals来忽略外部引用。" -#: source/TortoiseSVN_en.xml:5883(term) -msgid "SciTE" -msgstr "SciTE" +#: source/TortoiseSVN_en.xml:8362(para) +msgid "Another way to export from a working copy is to right drag the working copy folder to another location and choose Context MenuSVN Export here or Context MenuSVN Export all here. The second option includes the unversioned files as well." +msgstr "另外一个导出的方法是 右键拖工作副本到另外的保存位置，然后选择右键菜单SVN导出到这儿或者右键菜单SVN 导出全部到这儿。后者可以把未受版本控制的文件也导出。" -#: source/TortoiseSVN_en.xml:5885(para) -msgid "This text editor includes syntax colouring for unified diffs, making them much easier to read. Download it from Scintilla." -msgstr "这款文本编译器在统一比较时提供语法显示，读起来更加容易。可以从这里下载Scintilla。" +#: source/TortoiseSVN_en.xml:8376(para) +msgid "When exporting from a working copy, if the target folder already contains a folder of the same name as the one you are exporting, you will be given the option to overwrite the existing content, or to create a new folder with an automatically generated name, eg. Target (1)." +msgstr "导出工作副本时，如果目标目录包含了和你导出的名称相同的目录，你需要使用此选项重写已经存在的内容，或者使用自动生成的名称，例如目标 (1)。" -#: source/TortoiseSVN_en.xml:5895(term) -msgid "Notepad2" -msgstr "Notepad2" +#: source/TortoiseSVN_en.xml:8385(title) +msgid "Relocating a working copy" +msgstr "重新定位工作副本" -#: source/TortoiseSVN_en.xml:5897(para) -msgid "Notepad2 is designed as a replacement for the standard Windows Notepad program, and is based on the Scintilla open-source edit control. As well as being good for viewing unified diffs, it is much better than the Windows notepad for most jobs. Download it for free here." -msgstr "Notepad2的设计旨在替代 Windows自带的记事本的功能，它以开源编译控制为基础。在查看统一比较时，它能实现比Windows自带的记事本更多功能。免费下载here。" +#: source/TortoiseSVN_en.xml:8387(primary) +msgid "relocate" +msgstr "重新定位" -#: source/TortoiseSVN_en.xml:590(title) -msgid "Language Packs" -msgstr "语言包" +#: source/TortoiseSVN_en.xml:8392(title) +msgid "The Relocate Dialog" +msgstr "重定位对话框" -#: source/TortoiseSVN_en.xml:5910(para) -msgid "Read for information on how to set up TortoiseSVN to use these tools." -msgstr "这里可以了解到怎样起用TortoiseSVN来使用这些工具。" +#: source/TortoiseSVN_en.xml:8390(para) +msgid " If your repository has for some reason changed it's location (IP/URL). Maybe you're even stuck and can't commit and you don't want to checkout your working copy again from the new location and to move all your changed data back into the new working copy, TortoiseSVNRelocate is the command you are looking for. It basically does very little: it scans all \"entries\" files in the .svn folder and changes the URL of the entries to the new value." +msgstr "如果你的版本库因为某些原因而重定位了(IP/URL).也许你不能进行操作，不能提交，不能从新的定位检出副本，也不能将修改的数据提交到新位置的版本库中，TortoiseSVN重新定位也许正是你需要的。它的做法很简单: 查找所有 .svn 文件的接口然后把URL值改为新的版本库地址。" -#: source/TortoiseSVN_en.xml:5917(title) -msgid "Adding New Files And Directories" -msgstr "添加新文件和目录" +#: source/TortoiseSVN_en.xml:8416(para) +msgid "The IP address of the server has changed." +msgstr "服务器的IP地址已更改。" -#: source/TortoiseSVN_en.xml:5919(primary) -msgid "add" -msgstr "增加" +#: source/TortoiseSVN_en.xml:8419(para) +msgid "The protocol has changed (e.g. http:// to https://)." +msgstr "协议已更改(比如从http://改为 https://)。" -#: source/TortoiseSVN_en.xml:592(primary) -msgid "language packs" -msgstr "语言包" +#: source/TortoiseSVN_en.xml:8422(para) +msgid "The repository root path in the server setup has changed." +msgstr "版本库在服务器的路径已更改。" -#: source/TortoiseSVN_en.xml:5922(para) -msgid " If you created new files and/or directories during your development process then you need to add them to source control too. Select the file(s) and/or directory and use TortoiseSVNAdd." -msgstr "如果在你的开发过程中你创建了新的文件或目录，那么你需要把他们加入你的版本控制中。选择那个文件或目录并使用TortoiseSVN添加(Add)." +#: source/TortoiseSVN_en.xml:8410(para) +msgid "This is a very infrequently used operation. The relocate command is only used if the URL of the repository root has changed. Possible reasons are: Put another way, you need to relocate when your working copy is referring to the same location in the same repository, but the repository itself has moved." +msgstr "这是一个极少使用的操作.重定位只能 在版本库路径更改时使用。可能的原因是: 换种说法，如果你要重定位，只有当你的工作副本仍然还在同一个版本库中定位，但版本库本身已经没有了。" -#: source/TortoiseSVN_en.xml:5924(title) source/TortoiseSVN_en.xml:6000(title) -msgid "Explorer context menu for unversioned files" -msgstr "未受版本控制的文件之资源管理器上下文菜单" +#: source/TortoiseSVN_en.xml:8433(para) +msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." +msgstr "你要移到一个完全不同的版本库。这种情况下，你必须从新的版本库里执行一次干净的检出。" -#: source/TortoiseSVN_en.xml:5936(para) -msgid "After you added the files/directories to source control the file appears with a added icon overlay which means you first have to commit your working copy to make those files/directories available to other developers. Adding a file/directory does not affect the repository!" -msgstr "当你添加了指定的文件/目录到版本控制系统之后，这个文件上会出现一个added标志，这意味着你得先提交你的工作副本使该文件/目录对其他开发者来说成为有效的。添加一个文件/目录不会not影响版本库" +#: source/TortoiseSVN_en.xml:8439(para) +msgid "You want to switch to a different branch or directory within the same repository. To do that you should use TortoiseSVNSwitch.... Read for more information." +msgstr "你要在同一个版本库中切换一个分支或目录。这么做你可以用TortoiseSVN切换.... " -#: source/TortoiseSVN_en.xml:5945(title) -msgid "Many Adds" -msgstr "更多" +#: source/TortoiseSVN_en.xml:8429(para) +msgid "It does not apply if: " +msgstr "以下情况不支持: " -#: source/TortoiseSVN_en.xml:5946(para) -msgid "You can also use the Add command on already versioned folders. In that case, the add dialog will show you all unversioned files inside that versioned folder. This helps if you have many new files and need them to add at once." -msgstr "你也可以在已经版本控制的目录上使用Add命令。那样的话，添加对话框会显示该版本控制目录下所有未版本控制的文件。如果你有许多新文件需要一起添加的话，这是很有帮助的。" +#: source/TortoiseSVN_en.xml:8451(para) +msgid "If you use relocate in either of the cases above, it will corrupt your working copy and you will get many unexplainable error messages while updating, committing, etc. Once that has happened, the only fix is a fresh checkout." +msgstr "如果你使用以上任意一种重定位方式，它将破坏你的工作副本，在你更新、提交等操作时会提示一些令人费解的错误信息。一旦发生这种情况，唯一的办法就是检出最新版本。" -#: source/TortoiseSVN_en.xml:595(primary) -msgid "translations" -msgstr "翻译" +#: source/TortoiseSVN_en.xml:8460(title) +msgid "Integration with Bugtracking Systems / Issue trackers" +msgstr "与 BUG 跟踪系统/问题跟踪集成" -#: source/TortoiseSVN_en.xml:5954(para) -msgid "To add files from outside your working copy you can use the drag-and-drop handler: " -msgstr "你可以使用鼠标拖拽的方式从你的工作副本外部添加进文件。" +#: source/TortoiseSVN_en.xml:8462(primary) +msgid "bugtracking" +msgstr "BUG 跟踪" -#: source/TortoiseSVN_en.xml:5959(para) -msgid "select the files you want to add" -msgstr "选择你要添加的文件" +#: source/TortoiseSVN_en.xml:8465(primary) +msgid "bugtracker" +msgstr "BUG 跟踪者" -#: source/TortoiseSVN_en.xml:5964(para) source/TortoiseSVN_en.xml:6240(para) -msgid "right-drag them to the new location inside the working copy" -msgstr "拖拽(right-drag)他们到新的工作副本下，" +#: source/TortoiseSVN_en.xml:8468(primary) +msgid "issuetracker" +msgstr "问题跟踪者" -#: source/TortoiseSVN_en.xml:597(para) -msgid "The TortoiseSVN user interface has been translated into many different languages, so you may be able to download a language pack to suit your needs. You can find the language packs on our translation status page. And if there is no language pack available yet, why not join the team and submit your own translation ;-)" -msgstr "TortoiseSVN 的界面已经翻译成了许多种语言，所以你可以下载符合你要求的语言包。你可以在我们的翻译状态页里看到语言包。如果没有你需要的，为什么不加入我们的团队并且提交你的翻译呢？-)" +#: source/TortoiseSVN_en.xml:8470(para) +msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." +msgstr "在软件开发中，修改依赖于一个bug或问题编号是很常见的。bug跟踪系统的用户(问题跟踪者)喜欢在问题跟踪中将Subversion的修改与一个指定编号联系起来。因此很多问题跟踪者提供了一个预提交钩子脚本，分析日志，查找提交相关的bug编号。这稍微有些不可靠，因为它依赖于用户写完全的日志，预提交钩子才能正确分析。" -#: source/TortoiseSVN_en.xml:5970(para) source/TortoiseSVN_en.xml:6246(para) -msgid "release the right mouse button" -msgstr "松开鼠标右键" +#: source/TortoiseSVN_en.xml:8483(para) +msgid "When the user enters a log message, a well defined line including the issue number associated with the commit can be added automatically. This reduces the risk that the user enters the issue number in a way the bug tracking tools can't parse correctly." +msgstr "当用户输入日志信息时，一个定义良好，包含问题编号，与此提交相关的的行，会自动增加。这样减少了用户输入的问题编号不能比bug跟踪系统正确分析的风险。" -#: source/TortoiseSVN_en.xml:5975(para) -msgid "select Context MenuSVN Add files to this WC. The files will then be copied to the working copy and added to version control." -msgstr "选择上下文菜单SVN 增加文件到工作副本。这些文件会被复制到工作副本，加入版本控制。" +#: source/TortoiseSVN_en.xml:8489(para) +msgid "Or TortoiseSVN can highlight the part of the entered log message which is recognized by the issue tracker. That way the user knows that the log message can be parsed correctly." +msgstr "或者TortoiseSVN高亮显示日志消息中能被问题跟踪者识别的部分。这样，用户就知道日志消息能被正确解析。" -#: source/TortoiseSVN_en.xml:5987(para) -msgid "You can also add files within a working copy simply by left-dragging and dropping them onto the commit dialog." -msgstr "你可以在工作副本中通过左拖，将文件放到提交对话框中，来增加文件。" +#: source/TortoiseSVN_en.xml:8496(para) +msgid "When the user browses the log messages, TortoiseSVN creates a link out of each bug ID in the log message which fires up the browser to the issue mentioned." +msgstr "当用户浏览日志信息，TortoiseSVN在日志信息中创建指向每个bug标示的链接，它可以用浏览器打开。" -#: source/TortoiseSVN_en.xml:5993(title) -msgid "Ignoring Files And Directories" -msgstr "忽略文件和目录" +#: source/TortoiseSVN_en.xml:8479(para) +msgid "TortoiseSVN can help the user in two ways: " +msgstr "TortoiseSVN可以在两个方面帮助用户: " -#: source/TortoiseSVN_en.xml:5995(primary) -msgid "ignore" -msgstr "忽略" +#: source/TortoiseSVN_en.xml:8504(para) +msgid "You can integrate a Bugtracking Tool of your choice in TortoiseSVN. To do this, you have to define some properties, which start with bugtraq:. They must be set on Folders: ()" +msgstr "你可以在TortoiseSVN中集成bug跟踪工具。为了使用这个特性，你要定义一些以bugtraq:开始的属性，它们只能在文件夹上设置 ()。" -#: source/TortoiseSVN_en.xml:5998(para) -msgid " In most projects you will have files and folders that should not be subject to version control. These might include files created by the compiler, *.obj, *.lst, maybe an output folder used to store the executable. Whenever you commit changes, TSVN shows your unversioned files, which fills up the file list in the commit dialog. Of course you can turn off this display, but then you might forget to add a new source file." -msgstr "在多数项目中你总会有文件和目录不需要进行版本控制。这可能包括一些由编译器生成的文件，*.obj,*.lst。或许是一个外部的用于存放可执行程序的目录。只要你提交变更，TSVN就会在提交对话框的文件列表中列表显示出你的未版本控制文件。当然你可以关闭这个显示，不过你可能会忘记添加新的版本文件。" +#: source/TortoiseSVN_en.xml:8516(term) +msgid "bugtraq:url" +msgstr "bugtraq:url" -#: source/TortoiseSVN_en.xml:6011(para) -msgid "The best way to avoid these problems is to add the derived files to the project's ignore list. That way they will never show up in the commit dialog, but genuine unversioned source files will still be flagged up." -msgstr "最好的避免类似问题的方法是添加参考文件到该项目的忽略列表。这样他们就永远不会出现在提交对话框中，而真正的未版本控制文件则仍然列出。" +#: source/TortoiseSVN_en.xml:8518(para) +msgid "Set this property to the url of your bugtracking tool. It must be properly URI encoded and it has to contain %BUGID%. %BUGID% is replaced with the Issuenumber you entered. This allows TortoiseSVN to display a link in the log dialog, so when you are looking at the revision log you can jump directly to your bugtracking tool. You do not have to provide this property, but then TortoiseSVN shows only the issuenumber and not the link to it. e.g the TortoiseSVN project is using http://issues.tortoisesvn.net/?do=details&id=%BUGID%" +msgstr "将这个属性设置为你的bug跟踪工具的地址。它必须编码并且包含%BUGID%。%BUGID%用你输入的问题编号替换。它允许TortoiseSVN 在日志对话框中显示链接，于是你可以在察看版本日志时直接进入bug跟踪工具。你可以不提供这个属性，但是这样TortoiseSVN就不能显示链接了，只能显示问题编号。例如TortoiseSVN 使用http://issues.tortoisesvn.net/?do=details&id=%BUGID%。" -#: source/TortoiseSVN_en.xml:6017(para) -msgid "If you right click on a single unversioned file, and select the command TortoiseSVNAdd to Ignore List from the context menu, a submenu appears allowing you to select just that file, or all files with the same extension. If you select multiple files, there is no submenu and you can only add those specific files/folders." -msgstr "如果你右键一个单独的未版本控制文件，并从菜单栏选择TortoiseSVN(加入忽略列表)Add to Ignore List，会出现一个子菜单允许你仅选择该文件，或者所有具有相同后缀的文件。如果你选择多种文件，那么就没有子菜单了，你仅能添加这些特定的文件/目录。" +#: source/TortoiseSVN_en.xml:8536(term) +msgid "bugtraq:warnifnoissue" +msgstr "bugtraq:warnifnoissue" -#: source/TortoiseSVN_en.xml:6029(para) -msgid "If you want to remove one or more items from the ignore list, right click on those items and select TortoiseSVNRemove from Ignore List You can also access a folder's svn:ignore property directly. That allows you to specify more general patterns using filename globbing, described in the section below. Read for more information on setting properties directly. Please be aware that each ignore pattern has to be placed on a separate line. Separating them by spaces does not work." -msgstr "如果你想从忽略列表中移除一个或多个条目，右击这些条目，选择TortoiseSVN从忽略列表删除。你也可以直接存取目录的svn:ignore属性。它允许你使用文件匹配来指定多个模式，这在下面的章节叙述，阅读获得更多关于直接设置属性的信息。请注意每个忽略模式占一行，不支持使用空格分割。" +#: source/TortoiseSVN_en.xml:8538(para) +msgid "Set this to true, if you want TortoiseSVN to warn you because of an empty issuenumber textfield. Valid values are true/false. If not defined, false is assumed. " +msgstr "如果你想TortoiseSVN给出空问题编号的警告，就设置为 真。有效取值是 真/假。如果没有定义，那么假定为 假。" -#: source/TortoiseSVN_en.xml:6044(title) -msgid "The Global Ignore List" -msgstr "全局忽略列表" +#: source/TortoiseSVN_en.xml:8510(para) +msgid "There are two ways to integrate TortoiseSVN with issue trackers. One is based on simple strings, the other is based on regular expressions. The properties used by both approaches are: " +msgstr "有两个方法集成TortoiseSVN 和问题跟踪。一个基于简单字符串，另一个基于正则表达式。它们的用法是: " -#: source/TortoiseSVN_en.xml:6045(para) -msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Subversion projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." -msgstr "另一个忽略文件的方法是添加这些文件到global ignore list .他们最大的不同是全局忽略列表是一个客户端特性。它会作用到 所有的(all)subversion 项目。但只能在pc客户端使用。在全局尽可能更好的使用svn:ignore特性，因为他能够应用到特殊的项目区域，并却他作用于所有检出该项目的人。阅读获得更多信息。" +#: source/TortoiseSVN_en.xml:8557(term) +msgid "bugtraq:message" +msgstr "bugtraq:message" -#: source/TortoiseSVN_en.xml:6058(title) -msgid "Ignoring Versioned Items" -msgstr "忽略已版本控制的条目" +#: source/TortoiseSVN_en.xml:8559(para) +msgid " This property activates the Bugtracking System in Input field mode. If this property is set, then TortoiseSVN will prompt you to enter an issue number when you commit your changes. It's used to add a line at the end of the logmessage. It must contain %BUGID%, which is replaced with the issuenumber on commit. This ensures that your commit log contains a reference to the issuenumber which is always in a consistent format and can be parsed by your Bugtracking tool to associate the issuenumber with a particular commit. e.g the TortoiseSVN project is using Issue : %BUGID%, but this depends on your Tool." +msgstr "这个属性将问题追踪系统激活为输入框模式。 如果设置了这个属性，在拟提交时，TortoiseSVN会提示你输入问题单号码。它通常会在日志信息后面添加一行。必须包含%BUGID%，在提交时会被替换为问题单号。这确保了你的提交日志包含了问题单号，保证了单号可以被问题追踪工具解析，从而与提交关联。例如TortoiseSVN项目使用Issue : %BUGID%，但是这依赖于你的工具。" -#: source/TortoiseSVN_en.xml:6059(para) -msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." -msgstr "已版本控制的文件或目录不能够忽略，这是subversion的一个特性。如果你错误的版本控制了一个文件，阅读介绍怎样取消版本控制(unversion)。" +#: source/TortoiseSVN_en.xml:8580(term) +msgid "bugtraq:append" +msgstr "bugtraq:append" -#: source/TortoiseSVN_en.xml:6067(title) -msgid "Pattern Matching in Ignore Lists" -msgstr "忽略列表中的模式匹配" +#: source/TortoiseSVN_en.xml:8582(para) +msgid "This property defines if the bug-ID is appended (true) to the end of the log message or inserted (false) at the start of the log message. Valid values are true/false. If not defined, true is assumed, so that existing projects don't break. " +msgstr "这个属性定义了bug-ID。是追加到(true)日志信息的末尾，还是插入到(false)日志信息的开始。有效的值包括true/false，如果没有定义，默认是true ，所以现存的项目不会被打破。" -#: source/TortoiseSVN_en.xml:6069(primary) -msgid "globbing" -msgstr "globbing" +#: source/TortoiseSVN_en.xml:8595(term) +msgid "bugtraq:label" +msgstr "bugtraq:label" + +#: source/TortoiseSVN_en.xml:8597(para) +msgid "This text is shown by TortoiseSVN on the commit dialog to label the edit box where you enter the issuenumber. If it's not set, Bug-ID / Issue-Nr: will be displayed. Keep in mind though that the window will not be resized to fit this label, so keep the size of the label below 20-25 characters." +msgstr "是TortoiseSVN的提交对话框中用来输入问题单号码的输入项，如果没有设置，将会显示Bug-ID / Issue-Nr:，要记住窗口不会为适应标签而改变大小，所以请保持标签的小于20-25个字符。" -#: source/TortoiseSVN_en.xml:6072(primary) -msgid "pattern matching" -msgstr "模式匹配" +#: source/TortoiseSVN_en.xml:8609(term) +msgid "bugtraq:number" +msgstr "bugtraq:number" -#: source/TortoiseSVN_en.xml:6074(para) -msgid "Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " -msgstr "Subversion 的忽略模式使用了文件匹配，一种原先在Unix系统中使用meta字符作为通配符的技术。下面的字符有着特殊的意思: " +#: source/TortoiseSVN_en.xml:8611(para) +msgid "If set to true only numbers are allowed in the issuenumber textfield. An exception is the comma, so you can comma separate several numbers. Valid values are true/false. If not defined, true is assumed. " +msgstr "如果设置为true，问题单号文本框只能输入数字，一个例外是逗号，所以你可以使用逗号分割输入的多个号码。合法的值包括true/false， 如果没有设置，默认是true。" -#: source/TortoiseSVN_en.xml:608(para) -msgid "Each language pack is packaged as a .exe installer. Just run the install program and follow the instructions. Next time you restart, the translation will be available." -msgstr "每一种语言包都是一个 .exe 安装程序，只要根据向导运行安装程序，当你下一次启动程序时，翻译就会生效。" +#: source/TortoiseSVN_en.xml:8551(para) +msgid "In the simple approach, TortoiseSVN shows the user a separate input field where a bug ID can be entered. Then a separate line is appended/prepended to the log message the user entered. " +msgstr "在最简单的方法里，TortoiseSVN为用户显示了一个单独的bug ID输入字段，然后后面预计会追加一个用户输入日志信息的行。" -#: source/TortoiseSVN_en.xml:6081(term) -msgid "*" -msgstr "*" +#: source/TortoiseSVN_en.xml:8633(term) +msgid "bugtraq:logregex" +msgstr "bugtraq:logregex" -#: source/TortoiseSVN_en.xml:6083(para) -msgid "Matches any string of characters, including the empty string (no characters)." -msgstr "匹配任何字符串，包括空串(没有字符)" +#: source/TortoiseSVN_en.xml:8635(para) +msgid " This property activates the Bugtracking System in Regex mode. It contains one or two regular expressions, separated by a newline." +msgstr "这个属性会以正则表达式模式激活问题追踪系统。它会包含一个或两个正则表达式，以新行作为分割。" -#: source/TortoiseSVN_en.xml:6090(term) -msgid "?" -msgstr "?" +#: source/TortoiseSVN_en.xml:8642(para) +msgid "If only one expression is set, then the bare bug ID's must be matched in the groups of the regex string. Example: [Ii]ssue(?:s)? #?(\\d+)" +msgstr "如果只是设置了一个表达式，然后bug ID必须匹配正则表达式的组，例如[Ii]ssue(?:s)? #?(\\d+)。" -#: source/TortoiseSVN_en.xml:6092(para) -msgid "Matches any single character." -msgstr "匹配任何单字符" +#: source/TortoiseSVN_en.xml:8647(para) +msgid "If two expressions are set, then the first expression is used to find a string which relates to the bug ID but may contain more than just the bug ID (e.g. \"Issue #123\" or \"resolves issue 123\"). The second expression is then used to extract the bare bug ID from the string extracted with the first expression. An example:" +msgstr "如果设置了两个表达式，则第一个表达式用来用来查找bug ID相关的字符串，可能会不仅仅包含bug ID(例如\"Issue #123\" or \"resolves issue 123\")。第二个表达式则用来从第一个表达式抽取的字符串中抽取bug的ID，例如: " -#: source/TortoiseSVN_en.xml:6098(term) -msgid "[...]" -msgstr "[...]" +#: source/TortoiseSVN_en.xml:8655(para) +msgid "If you want to catch every pattern \"issue #XXX\" and \"issue #890, #789\" inside a log message you could use the following regex strings: [Ii]ssue #?(\\d+)(,? ?#(\\d+))* and the second expression as (\\d+)" +msgstr "如果你希望捕获日志中所有形式为\"issue #XXX\"和\"issue #890, #789\"字符串，你可以使用如下的正则表达式: [Ii]ssue #?(\\d+)(,? ?#(\\d+))*，而第二个表达式为(\\d+)。" -#: source/TortoiseSVN_en.xml:61(para) -msgid "If you answered yes to one of these questions, then TortoiseSVN is for you! Just read on to find out how TortoiseSVN can help you in your work. It's not that difficult." -msgstr "如果这些问题中的任何一个回答是的话，那么 TortoiseSVN 就是为你准备的！请继续读下去，你就能知道怎样让 TortoiseSVN 对你的工作起到帮助，这其实并不困难。" +#: source/TortoiseSVN_en.xml:8661(para) +msgid "If you are unfamiliar with regular expressions, take a look at the online documentation and tutorial at http://www.regular-expressions.info/." +msgstr "如果你不熟悉正则表达式，可以看一下http://www.regular-expressions.info/上的在线文档和教程。" -#: source/TortoiseSVN_en.xml:6100(para) -msgid "Matches any one of the characters enclosed in the square brackets. Within the brackets, a pair of characters separated by - matches any character lexically between the two. For example [AGm-p] matches any one of A, G, m, n, o or p." -msgstr "匹配任何单在方括号[]内的单字符，在方括号内，一对字符被-分隔，匹配任何词汇表(lexically)上在他们中间的字符。例如[AGm-p]匹配任何但个的A,G,m,n,o或者p。" +#: source/TortoiseSVN_en.xml:8624(para) +msgid "In the approach with regular expressions, TortoiseSVN doesn't show a separate input field but marks the part of the log message the user enters which is recognized by the issue tracker. This is done while the user writes the log message. This also means that the bug ID can be anywhere inside a log message! This method is much more flexible, and is the one used by the TortoiseSVN project itself. " +msgstr "在使用正则表达式的方法中，TortoiseSVN不会显示一个单独的输入框，而是标记用户输入的日志信息，认为这些标志可以被问题追踪工具识别。这是在用户编写日志信息的时候完成的，这也意味着bug ID可以出现在日志信息的任何位置！这种方法非常灵活，也是TortoiseSVN项目本身使用的方法。" -#: source/TortoiseSVN_en.xml:6114(para) -msgid "Subversion uses the / as the path delimiter in all internal pathnames, and all pattern matching is done against this style of path names. If you want to use a path delimiter in your ignore pattern, be sure to use /, and not the Windows backslash." -msgstr "Subversion 在所有内部路径名称中使用 / 作为路径分割符，所有模式匹配都使用这种路径名称风格。如果你想在忽略模式中使用路径分割符，确认使用 /, 而不是 Windows 的反斜线符号。" +#: source/TortoiseSVN_en.xml:8672(para) +msgid "If both the bugtraq:message and bugtraq:logregex properties are set, logregex takes precedence." +msgstr "如果同时设置了bugtraq:message和bugtraq:logregex属性，日志正则表达式会优先使用。" -#: source/TortoiseSVN_en.xml:6120(para) -msgid "Pattern matching is case sensitive, which can cause problems on Windows. You can force case insensitivity the hard way by pairing characters, eg. to ignore *.tmp regardless of case, you could use a pattern like *.[Tt][Mm][Pp]." -msgstr "模式匹配是大小写敏感的，这在windows平台下会出问题。你可以要比较的字符硬性的强制忽略大小写。例如，忽略不记*.tmp的大小写。那么你可以使用像*.[Tt][Mm][Pp]这样的模式。" +#: source/TortoiseSVN_en.xml:8677(para) +msgid "Even if you don't have an issue tracker with a pre-commit hook parsing your log messages, you still can use this to turn the issues mentioned in your log messages into links!" +msgstr "即使你的问题追踪工具没有pre-commit钩子来解析日志信息，你仍然可以使用这个功能将日志信息中的问题单转化为链接！" -#: source/TortoiseSVN_en.xml:6127(para) -msgid "Subversion uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename." -msgstr "Subversion 对每个路径使用这种匹配模式。这些路径通常相对于执行导入，增加，提交等动作的目录。因此，此匹配模式考虑在文件名称之前可能有，也可能没有路径组件这个事实。" +#: source/TortoiseSVN_en.xml:8690(title) source/TortoiseSVN_en.xml:8792(title) +msgid "Set the Properties on Folders" +msgstr "设置文件夹的属性" -#: source/TortoiseSVN_en.xml:6134(para) -msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern Fred.* will match Fred.c but not subdir/Fred.c. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Subversion compares them with the ignore pattern." -msgstr "如果目录名称在路径中，匹配算法不会删除它们，所以模式Fred.*匹配Fred.c，但是不匹配subdir/Fred.c。这对于你添加一个包含你想忽略的一些文件的目录来说是非常有意义的，因为在 Subversion 处理忽略模式时，这些文件名的优先级高于目录名。" +#: source/TortoiseSVN_en.xml:8691(para) source/TortoiseSVN_en.xml:8793(para) +msgid "These properties must be set on folders for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseSVN will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. C:\\) is found. If you can be sure that each user checks out only from e.g trunk/ and not some subfolder, then it's enough if you set the properties on trunk/. If you can't be sure, you should set the properties recursively on each subfolder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to trunk/)." +msgstr "为了系统能够工作，这个属性必须设置到文件夹上。当你提交文件或文件夹，属性会从文件夹上读取。如果没有发现属性，TortoiseSVN会向上级查找，直到发现一个没有版本控制的文件夹或根目录(例如C:\\)才会停止，如果你能够确定每个用户只从trunk/检出，而不是其他目录，你可以直接在trunk/上使用这个属性，而不必每个子目录都设置。如果你不能确定，你必须为每个子目录设置这些属性。一个深级目录的设置会覆盖高级目录(离trunk/更近的)。" -#: source/TortoiseSVN_en.xml:6143(para) -msgid "The / character is not treated in any special way for pattern matching purposes, so the pattern abc*xyz would match abcdxyz but also abcdir/subdir/anything/morexyz." -msgstr "在模式匹配中，/ 字符不会做任何特别处理，所以模式 abc*xyz 匹配 abcdxyz，但是不匹配 abcdir/subdir/anything/morexyz。" +#: source/TortoiseSVN_en.xml:8712(para) +msgid "This issue tracker integration is not restricted to TortoiseSVN; it can be used with any Subversion client. For more information, read the full Issuetracker Integration Specification." +msgstr "问题追踪集成并没有限制在TortoiseSVN，可以用于所有的Subversion客户端，更多信息可以看Issuetracker Integration Specification。" -#: source/TortoiseSVN_en.xml:6149(para) -msgid "To ignore all CVS folders you should either specify a pattern of *CVS or better, the pair CVS */CVS. The first option works, but would also exclude something called ThisIsNotCVS. Using */CVS alone will not work on an immediate child CVS folder, and CVS alone will not work on subfolders." -msgstr "你应该指定一个*CVS或者更好的CVS */CVS模式中的任意一个来忽略所有的CVS目录。执行第一个选择也将会排斥一些像ThisIsNotCVS这样的命令。而单独使用*/CVS又不能作用在一个紧跟着CVS的子目录上，而且单独的CVS 不能作用在子目录上。" +#: source/TortoiseSVN_en.xml:8721(title) +msgid "Integration with Web-based Repository Viewers" +msgstr "与基于 WEB 的版本库浏览器集成" -#: source/TortoiseSVN_en.xml:615(title) -msgid "Spellchecker" -msgstr "拼写检查器" +#: source/TortoiseSVN_en.xml:8723(primary) +msgid "webview" +msgstr "webview" -#: source/TortoiseSVN_en.xml:6158(para) -msgid "If you want an official definition for globbing, you can find it in the IEEE specifications for the shell command language Pattern Matching Notation." -msgstr "如果你想要定义一个特殊的忽略规则。你可以在关于shell命令行语言的IEEE规范中找到Pattern Matching Notation。" +#: source/TortoiseSVN_en.xml:8726(primary) +msgid "repoviewer" +msgstr "版本库浏览器" -#: source/TortoiseSVN_en.xml:6168(title) -msgid "Deleting, Renaming And Moving" -msgstr "删除、重命名和移动" +#: source/TortoiseSVN_en.xml:8728(para) +msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseSVN provides a means to link with these viewers." +msgstr "有许多web为基础的版本库浏览器，例如ViewVC and WebSVN，TortoiseSVN提供了链接这些浏览器的方法。" -#: source/TortoiseSVN_en.xml:617(primary) -msgid "spellchecker" -msgstr "拼写检查器" +#: source/TortoiseSVN_en.xml:8740(para) +msgid "You can integrate a repoviewer of your choice in TortoiseSVN. To do this, you have to define some properties which define the linkage. They must be set on Folders: ()" +msgstr "你可以通过TortoiseSVN选择集成一种版本库浏览器，为此，你需要定义一些链接的属性，必须设置在文件夹: ()" -#: source/TortoiseSVN_en.xml:6170(primary) -msgid "delete" -msgstr "删除" +#: source/TortoiseSVN_en.xml:8748(term) +msgid "webviewer:revision" +msgstr "webviewer:revision" -#: source/TortoiseSVN_en.xml:6173(primary) -msgid "remove" -msgstr "删除" +#: source/TortoiseSVN_en.xml:8750(para) +msgid "Set this property to the url of your repoviewer to view all changes in a specific revision. It must be properly URI encoded and it has to contain %REVISION%. %REVISION% is replaced with the revision number in question. This allows TortoiseSVN to display a context menu entry in the log dialog Context MenuView revision in webviewer" +msgstr "将这个属性设置为版本库浏览器显示所有本版本修改内容的url，它必须是URI编码的，也必须包含%REVISION%。在问题单中%REVISION%将会被替换成版本号。这允许TortoiseSVN在日志对话框的增加这样的条目右键菜单在版浏览器中查看此修订" -#: source/TortoiseSVN_en.xml:6176(primary) -msgid "rename" -msgstr "改名" +#: source/TortoiseSVN_en.xml:8767(term) +msgid "webviewer:pathrevision" +msgstr "webviewer:pathrevision" -#: source/TortoiseSVN_en.xml:6179(primary) -msgid "move" -msgstr "移动" +#: source/TortoiseSVN_en.xml:8769(para) +msgid "Set this property to the url of your repoviewer to view changes to a specific file in a specific revision. It must be properly URI encoded and it has to contain %REVISION% and %PATH%. %PATH% is replaced with the path relative to the repository root. This allows TortoiseSVN to display a context menu entry in the log dialog Context MenuView revision and path in webviewer For example, if you right-click in the log dialog bottom pane on a file entry /trunk/src/file then the %PATH% in the url will be replaced with /trunk/src/file." +msgstr "设置" -#: source/TortoiseSVN_en.xml:6182(para) -msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseSVN submenu. " -msgstr "不像CVS,Subversion允许重命名和移动文件和目录。因此在TortoiseSVN 的子菜单中有删除和重命名的菜单项。" +#: source/TortoiseSVN_en.xml:8816(title) +msgid "TortoiseSVN's Settings" +msgstr "TortoiseSVN的设置" -#: source/TortoiseSVN_en.xml:6187(title) -msgid "Explorer context menu for versioned files" -msgstr "版本控制文件的菜单浏览" +#: source/TortoiseSVN_en.xml:8818(primary) +msgid "settings" +msgstr "设置" -#: source/TortoiseSVN_en.xml:6191(para) -msgid "If you delete a file/directory using TSVN, the file is removed from your working copy and marked for deletion. The file's parent folder shows a \"deleted\" icon overlay. You can always get the file back, if you call TortoiseSVNRevert on the parent folder." -msgstr "如果你通过TSVN删除了一个文件/目录，吗呢这个文件被移出你的工作副本并标记为删除。该文件的父目录会覆盖上一个\"删除\"标记。你随时可以通过在父目录调用TortoiseSVNRevert命令来恢复该文件。" +#: source/TortoiseSVN_en.xml:8820(para) +msgid "To find out what the different settings are for, just leave your mouse pointer a second on the editbox/checkbox... and a helpful tooltip will popup." +msgstr "想知道不同的设置是干什么用的，你只需将鼠标指针在编辑框/选项框上停留一秒钟...一个帮助提示气泡就会弹出来。" -#: source/TortoiseSVN_en.xml:620(primary) -msgid "dictionary" -msgstr "词典" +#: source/TortoiseSVN_en.xml:8829(title) +msgid "General Settings" +msgstr "常规设置" -#: source/TortoiseSVN_en.xml:6202(para) -msgid "When you TortoiseSVNDelete a file, it is removed from your working copy immediately as well as being marked for deletion in the repository on next commit. When you TortoiseSVNDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. This difference in behaviour is a part of Subversion, not TortoiseSVN." -msgstr "" +#: source/TortoiseSVN_en.xml:8831(primary) +msgid "sounds" +msgstr "声音" -#: source/TortoiseSVN_en.xml:6219(para) -msgid "If you want to delete an item from the repository, but keep it locally as an unversioned file/folder, use Extended Context MenuDelete (keep local). You have to hold the Shift while right clicking on the item in the explorer list pane (right pane) in order to see this in the extended context menu." -msgstr "如果你想从版本库删除项目，但是在本地作为非版本控制的文件/目录保留，可以使用 扩展上下文菜单删除(保留本地副本)。为了看到扩展上下文菜单，你必须在文件管理器列表窗格(右窗格)中的项目上点击右键，同时按着 Shift 键。" +#: source/TortoiseSVN_en.xml:8835(title) +msgid "The Settings Dialog, General Page" +msgstr "设置对话框，常规设置页面" -#: source/TortoiseSVN_en.xml:622(para) -msgid "TortoiseSVN includes a spell checker which allows you to check your commit log messages. This is especially useful if the project language is not your native language. The spell checker uses the same dictionary files as OpenOffice and Mozilla." -msgstr "TortoiseSVN 包括了一个拼写检查器，可以检查你的提交日志信息，当你的项目语言不是你的本地语言时尤其有用，拼写检查器使用 OpenOffice 和 Mozilla 相同的词典。" +#: source/TortoiseSVN_en.xml:8833(para) +msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." +msgstr " 这个对话框允许你指定自己喜欢的语言，同时也可做那些与Subversion相关的特殊设置。" -#: source/TortoiseSVN_en.xml:6230(para) -msgid "If you want to move files inside a working copy, use the drag-and-drop handler again: " -msgstr "如果你想在工作副本中移动文件，那么可以这样使用鼠标拖拽: " +#: source/TortoiseSVN_en.xml:8843(term) +msgid "Language" +msgstr "语言" -#: source/TortoiseSVN_en.xml:6235(para) -msgid "select the files or directories you want to move" -msgstr "选择你要移动的文件或目录" +#: source/TortoiseSVN_en.xml:8845(para) +msgid "Selects your user interface language. What else did you expect?" +msgstr "选择你TSVN的用户界面语言。不然你还期望从这里得到啥别的？" -#: source/TortoiseSVN_en.xml:6251(para) -msgid "in the popup menu select Context MenuSVN Move versioned files here" -msgstr "在弹出菜单选择上下文菜单SVN 移动文件。" +#: source/TortoiseSVN_en.xml:8852(term) +msgid "Automatically check for newer versions every week" +msgstr "每周自动检查新版本" -#: source/TortoiseSVN_en.xml:6262(title) -msgid "Do Not SVN Move Externals" -msgstr "不要使用 SVN 移动外部连接" +#: source/TortoiseSVN_en.xml:8854(para) +msgid "If checked, TortoiseSVN will contact its download site once a week to see if there is a newer version of the program available. Use Check now if you want an answer right away. The new version will not be downloaded; you simply receive an information dialog telling you that the new version is available." +msgstr "如果检查过，TSVN将每周联系它的下载站点一次，来看看程序是否有个可用的新版本。若你想马上得到结果，使用 立即检查 按钮。无论如何，新版本不会被自动下载，而只是你将收到一条提示信息对话框，告诉你有新版本可用。" -#: source/TortoiseSVN_en.xml:6263(para) -msgid "You should not use the TortoiseSVN Move or Rename commands on a folder which has been created using svn:externals. This action would cause the external item to be deleted from its parent repository, probably upsetting many other people. If you need to move an externals folder you should use an ordinary shell move, then adjust the svn:externals properties of the source and destination parent folders." -msgstr "你不应该用TortoiseSVN的移动或重命名命令作用在一个已经用svn:externals创建的目录上。因为这个动作可能会导致外部的元素(item)被从他的父版本库中删除，这可能会使其他很多人烦恼。如果你必须移动洋外部的目录，你应该使用一个普通的shell移动，然后调整源文件和目的文件的父目录的svn:externals道具。" +#: source/TortoiseSVN_en.xml:8865(term) +msgid "System sounds" +msgstr "系统声音" -#: source/TortoiseSVN_en.xml:6276(para) -msgid "If a file is deleted via the explorer instead of using the TortoiseSVN context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseSVNDelete so that Subversion doesn't have to guess what you really want to do." -msgstr "如果一个 文件 是通过浏览器而不是使用TortoiseSVN 快捷菜单被删除，提交对话框也会显示这些文件并让你在提交前把他们从版本控制中移除。可是,如果你更新你的工作副本， Subversion 将会混淆这个丢失文件并替换他为版本库中的最新版本。因此，如果你需要删除一个版本控制下的文件，请始终使用TortoiseSVNDelete保证 Subversion不去猜测你到底想干什么。" +#: source/TortoiseSVN_en.xml:8871(para) +msgid "Error" +msgstr "错误" -#: source/TortoiseSVN_en.xml:6290(para) -msgid "If a folder is deleted via the explorer instead of using the TortoiseSVN context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseSVNDelete." -msgstr "如果一个 目录 是通过浏览器而不是使用TortoiseSVN 快捷菜单被删除，你的工作副本将回被损坏，并且你将不能提交。如果你更新你的工作副本，如果你更新你的工作副本， Subversion 将用版本库中的最新版本替换已丢失目录。接下来你就可以使用TortoiseSVNDelete这种正确的方法来删除它了。" +#: source/TortoiseSVN_en.xml:8876(para) +msgid "Notice" +msgstr "提示" -#: source/TortoiseSVN_en.xml:6303(title) -msgid "Commit the parent folder" -msgstr "提交父目录" +#: source/TortoiseSVN_en.xml:8881(para) +msgid "Warning" +msgstr "警告" -#: source/TortoiseSVN_en.xml:6304(para) -msgid "Since renames and moves are done as a delete followed by an add you must commit the parent folder of the renamed/moved file so that the deleted part of the rename/move will show up in the commit dialog. If you don't commit the removed part of the rename/move, it will stay behind in the repository and an update of your coworkers won't remove the old file. i.e. they will have both the old and the new copies." -msgstr "既然重命名和移动都可以像添加之后又删除一样被执行，你必需提交该重命名/移动文件的父目录，所以重命名/移动的删除部分将出现在提交对话框中。如果你不提交重命名/移动的已删除部分，他将保留在仓库中并且你的同组人将更新该未移除的旧文件。例如，他们将有两个一老一新的副本。" +#: source/TortoiseSVN_en.xml:8867(para) +msgid "TortoiseSVN has three custom sounds which are installed by default. You can select different sounds (or turn these sounds off completely) using the Windows Control Panel. Configure is a shortcut to the Control Panel." +msgstr "TSVN已经默认安装了三个自定义声音。 你可以使用Windows控制面板中的声音属性，来选择不同的声音(或是把这些声音完全关掉)。配置 按钮是一个打开控制面板声音属性的快捷方式。" -#: source/TortoiseSVN_en.xml:6314(para) -msgid "You must commit a folder rename before changing any of the files inside the folder, otherwise your working copy can get really messed up." -msgstr "你 必须在重命名目录后而在更改目录下的任何文件前进行提交，不然你的工作副本就回真的混淆。" +#: source/TortoiseSVN_en.xml:8893(term) +msgid "Global ignore pattern" +msgstr "全局忽略样式" -#: source/TortoiseSVN_en.xml:6321(title) -msgid "Getting a deleted file or folder back" -msgstr "找回已删除的文件或目录" +#: source/TortoiseSVN_en.xml:8896(primary) +msgid "exclude pattern" +msgstr "排斥样式" + +#: source/TortoiseSVN_en.xml:8899(primary) +msgid "global ignore" +msgstr "全局忽略" -#: source/TortoiseSVN_en.xml:6322(para) -msgid "If you have deleted a file or a folder and already committed that delete operation to the repository, then a normal TortoiseSVNRevert can't bring it back anymore. But the file or folder is not lost at all. If you know the revision the file or folder got deleted (if you don't, use the log dialog to find out) open the repository browser and switch to that revision. Then select the file or folder you deleted, right-click and select Context MenuCopy to... as the target for that copy operation select the path to your working copy." -msgstr "如果你删除了洋文件或目录并已经提交该删除操作到版本库，那么 一个常规的TortoiseSVNRevert已不能再将其找回。但是该文件或目录并没有完全丢失。如果你知道该被删除文件或目录的版本(如果不能，使用日志对话框来查找出来)，打开数据仓库的浏览器，并选择那个版本。然后选择你删除的文件或目录，右键并选择Context MenuCopy to...作为目标执行复制操作，然后选择你的工作副本的路径。" +#: source/TortoiseSVN_en.xml:8901(para) +msgid "Global ignore patterns are used to prevent unversioned files from showing up e.g. in the commit dialog. Files matching the patterns are also ignored by an import. Ignore files or directories by typing in the names or extensions. Patterns are separated by spaces e.g. */bin */obj *.bak *.~?? *.jar *.[Tt]mp. Remember that these patterns may be used against paths which include N levels of parent directory. Setting ignore patterns for anything other than simple file extensions is not as trivial as it first appears, so be sure to read for more information on the pattern-matching syntax, and how paths are checked." +msgstr "全局忽略模式被用来防止非版本控制的文件在例如提交时的对话框中被列出来。那些符合模式的文件，在执行导入操作时同样被忽略。通过在模式框中输入文件名或扩展名来忽略文件或文件夹。不同的模式之间以空格分隔，例如 */bin */obj *.bak *.~?? *.jar *.[Tt]mp。请记得这些模式可以用来处理含有 N 级父目录的路径。设置忽略模式并非象刚才显示的那么简单，所以请务必阅读 以获得更多模式匹配语法信息，和如何检查路径。" -#: source/TortoiseSVN_en.xml:6343(title) -msgid "Renaming a file only in case" -msgstr "仅在单一实例中重命名文件" +#: source/TortoiseSVN_en.xml:8915(para) +msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." +msgstr "值得注意的是，你在这里指定的忽略样式将同样作用于你本机上的其他Subversion客户端，包括命令行客户端。" -#: source/TortoiseSVN_en.xml:6345(para) -msgid "In case you have two files in the repository with the same name but differing only in case (e.g. TEST.TXT and test.txt) you can't update or checkout the directory where those files are in anymore." -msgstr "万一在你的版本库中有两个名字相同但大小拼写不同(例如: TEST.TXT和test.txt)的文件，你是不能更新或者检出该包含该文件的目录的。" +#: source/TortoiseSVN_en.xml:8921(para) +msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." +msgstr "如果你象下面段落那样使用Subversion配置文件来设置一个 全局－忽略 样式，那么它将覆盖你在这里做的设置。该Subversion配置文件可以象下面段落描述的那样，通过 编辑 按钮来访问。" -#: source/TortoiseSVN_en.xml:635(para) -msgid "The installer automatically adds the US and UK english dictionaries. If you want other languages, the easiest option is simply to install one of TortoiseSVN's language packs. This will install the appropriate dictionary files as well as the TortoiseSVN local user interface. Next time you restart, the dictionary will be available too." -msgstr "安装程序自动添加 US 和 UK 英语词典，如果你需要其他语言，最简单的选择是安装 TortoiseSVN 的语言包，这会安装合适的词典文件和 TortoiseSVN 的本地用户界面，当你下一次启动程序时，词典也将会生效。" +#: source/TortoiseSVN_en.xml:8929(para) +msgid "This ignore pattern will affect all your projects. It is not versioned, so it will not affect other users. By contrast you can also use the versioned svn:ignore property to exclude files or directories from version control. Read for more information." +msgstr "忽略样式将作用于你所有的项目工程。因为它是非版本控制的，所以它将不会对其他的用户起作用。相对而言，你也可以使用可版本控制的 svn:ignore 属性来把要忽略的文件或文件夹排斥在版本控制之外。阅读 以获得更多信息。" -#: source/TortoiseSVN_en.xml:6350(para) -msgid "In that case, you have to decide which one of them you want to keep and delete (or rename) the other one from the repository." -msgstr "如果是那样的话，你得决定在这个版本库里的哪一个文件是你想保留的，哪一个是要删除(或重命名)的" +#: source/TortoiseSVN_en.xml:8941(term) +msgid "Set filedates to the \"last commit time\"" +msgstr "将文件日期设置为“最后提交时间”" -#: source/TortoiseSVN_en.xml:6354(para) -msgid "There are (at least) two possible solutions to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!!!" -msgstr "这里(至少)有两种可能的解决方案来重命名文件而不丢失他的日志记录。在subversion里重命名它是很重要的。仅在浏览器中重命名将会损坏你的工作副本。" +#: source/TortoiseSVN_en.xml:8943(para) +msgid "This option tells TortoiseSVN to set the filedates to the last commit time when doing a checkout or an update. Otherwise TortoiseSVN will use the current date. If you are developing software it is generally best to use the current date because build systems normally look at the datestamps to decide which files need compiling. If you use \"last commit time\" and revert to an older file revision, your project may not compile as you expect it to." +msgstr "该选项通知TSVN在做检出或更新操作时，把文件日期设置为最后提交的时间。否则TSVN将使用当前日期。如果你在做软件开发的话，使用当前日期是总体上最好的选择，因为那些软件构建器通常通过查看时间戳来决定需要编译哪些文件。如果你使用了“最后提交时间”并把代码文件还原到了一个旧版本，你的工程可能就不会像你期望的那样被编译了。" -#: source/TortoiseSVN_en.xml:6360(para) -msgid "Solution A) (recommended) " -msgstr "解决方案 A)(推荐) " +#: source/TortoiseSVN_en.xml:8957(term) +msgid "Subversion configuration file" +msgstr "Subversion配置文件" -#: source/TortoiseSVN_en.xml:6364(para) -msgid "Commit the changes in your working copy." -msgstr "提交你工作副本中的改变到版本库" +#: source/TortoiseSVN_en.xml:8959(para) +msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseSVN, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." +msgstr "使用 编辑 按钮来直接编译Subversion配置文件。有些设置不能被TSVN直接修改，就需要在这里完成。可以阅读 运行时配置 来获得有关Subversion 配置 文件的更多信息。在 设置自动属性 中的章节介绍了可以在这里配置的特殊偏好部分。值得注意的是，Subversion可以从许多不同的位置读取配置信息，因此你也就需要了解哪一个将优先起作用。阅读 配置与Windows注册表 来获取更多信息。" -#: source/TortoiseSVN_en.xml:6369(para) -msgid "Rename the file from UPPERcase to upperCASE directly in the repository using the repository browser." -msgstr "使用版本库的浏览器立即重命名该文件的大写(小写)为小写(大写)" +#: source/TortoiseSVN_en.xml:8984(term) +msgid "Use \"_svn\" instead of \".svn\" directories" +msgstr "使用“_svn”目录替代“.svn”目录" -#: source/TortoiseSVN_en.xml:6375(para) -msgid "Update your working copy." -msgstr "更新你的工作副本" +#: source/TortoiseSVN_en.xml:8986(para) +msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." +msgstr "在使用VS.NET环境做web工程时，将无法处理 .svn 文件夹，但Subversion是要用这些文件夹来储存自己的内部信息的。这可不是Subversion的bug，这bug是VS.NET和它使用的frontpage扩展带来的。阅读 来获得有关此问题的更多信息。" -#: source/TortoiseSVN_en.xml:6381(para) -msgid "Solution B) " -msgstr "解决方案 B) " +#: source/TortoiseSVN_en.xml:8993(para) +msgid "If you want to change the behaviour of Subversion and TortoiseSVN, you can use this checkbox to set the environment variable which controls this." +msgstr "若你想改变Subversion和TSVN的这些行为，就可以使用这个选项框来设置控制这些的环境变量。" -#: source/TortoiseSVN_en.xml:6385(para) -msgid "Rename from UPPERcase to UPPERcase_ with the rename command in the TortoiseSVN submenu." -msgstr "使用TortoiseSVN子菜单中的重命名命令将UPPERcase重命名为UPPERcase_ 格式" +#: source/TortoiseSVN_en.xml:8998(para) +msgid "You should note that changing this option will not automatically convert existing working copies to use the new admin directory. You will have to do that yourself using a script (See our FAQ) or simply check out a fresh working copy." +msgstr "你应该注意到: 改变该选项将不会使已存在的工作副本中的管理文件夹从“_svn”自动转换到“.svn”。你需要使用一个脚本(查看我们的FAQ)来自行完成这项工作，或是简单地重新检出一个新的工作副本。" -#: source/TortoiseSVN_en.xml:6391(para) source/TortoiseSVN_en.xml:6401(para) -msgid "Commit the changes." -msgstr "提交该更改" +#: source/TortoiseSVN_en.xml:9009(title) +msgid "Look and Feel Settings" +msgstr "外观与样式设置" -#: source/TortoiseSVN_en.xml:6396(para) -msgid "Rename from UPPERcase_ to upperCASE." -msgstr "将UPPERcase_重命名为upperCASE格式" +#: source/TortoiseSVN_en.xml:9013(title) source/TortoiseSVN_en.xml:9094(title) +msgid "The Settings Dialog, Look and Feel Page" +msgstr "设置对话框，外观与样式页面" -#: source/TortoiseSVN_en.xml:6408(title) -msgid "Preventing two files with the same name" -msgstr "防止两个文件名字相同" +#: source/TortoiseSVN_en.xml:9011(para) +msgid " This page allows you to specify which of the TortoiseSVN context menu entries will show up in the main context menu, and which will appear in the TortoiseSVN submenu. By default most items are unchecked and appear in the submenu." +msgstr " 该页面允许你指定: 在TortoiseSVN的主上下文菜单中哪些条目可以直接在鼠标右键菜单显示，哪些在TortoiseSVN子菜单显示。默认情况下很多项未被勾选，只在子菜单显示。" -#: source/TortoiseSVN_en.xml:6409(para) -msgid "There is a server hook script available at: http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ that will prevent checkins which result in case conflicts." -msgstr "这有一个有用的服务器端脚本在http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/将会防止检入拼写(大小写)冲突文件。" +#: source/TortoiseSVN_en.xml:9021(para) +msgid "There is a special case for Get Lock. You can of course promote it to the top level using the list above, but as most files don't need locking this just adds clutter. However, a file with the svn:needs-lock property needs this action every time it is edited, so in that case it is very useful to have at the top level. Checking the box here means that when a file is selected which has the svn:needs-lock property set, Get Lock will always appear at the top level." +msgstr "获得锁会有一个特别的情况，你可以将其提升到顶级带但，但是大多数文件不需要锁定，这样做只是添加了混乱。然而，一个标记为svn:needs-lock属性的文件每次编辑前都需要那个操作，所以这个菜单会进入顶级菜单会比较方便。选定这个选项，会使设置svn:needs-lock属性的文件的Get Lock出现在顶级菜单中。" -#: source/TortoiseSVN_en.xml:6419(title) -msgid "Repairing File Renames" -msgstr "修复文件改名" +#: source/TortoiseSVN_en.xml:9031(para) +msgid "If you have a very large number of files in your working copy folders, it can take a long time before the context menu appears when you right click on a folder. This is because Subversion fetches the status for all files when you ask for folder status. To avoid this delay you can uncheck the Fetch status for context menu box. Be warned that the context menu for folders will not always be correct, and may include items which should not really be there. For example, you will see TortoiseSVNShow Log for an Added folder, which will not work because the folder is not yet in the repository." +msgstr "如果在你的工作副本下有大量的文件，那么你 右键点击 该文件夹的时候将花费较长的时间使上下文菜单显示出来。这是因为在你查询文件夹状态的时候，Subversion要去获取其下所有文件的状态。你可以在这里取消对 为右键菜单获取SVN状态 选项的勾选以避免这种延迟。要注意的是，文件夹的上下文菜单有时不太正确，可能会包含一些本来不该在那儿的条目。举个例子，右键点击一个新 添加 的文件夹，你可能会看到 TortoiseSVN显示日志 的操作选项，但那个是不会起作用的，因为该文件夹还没真正提交到版本库里。" -#: source/TortoiseSVN_en.xml:6420(para) -msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related." -msgstr "有时候你的IDE会因为执行反射操作，改名文件，当然它不能告诉Subversion。如果你尝试提交修改，Subversion会发现丢失了老文件，新增了未版本控制的新文件。你可以简单的增加新文件，但是你将丢失历史记录，因为Subversion不知道这些文件的关系。" +#: source/TortoiseSVN_en.xml:9053(term) +msgid "Unchecked (default)" +msgstr "未勾选(默认)" -#: source/TortoiseSVN_en.xml:6428(para) -msgid "A better way is to notify Subversion that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." -msgstr "更好的方法是通知Subversion这实际上是改名，你可以在提交和检查修改对话框中做此操作。简单选择老文件(丢失的)和新文件(未版本控制的)，使用右键菜单修复移动设置这两个文件是改名关系。" +#: source/TortoiseSVN_en.xml:9055(para) +msgid "In this state the menu items are all drawn by TortoiseSVN. No accelerator keys are shown." +msgstr "这种状态下，菜单项全部是由TSVN画出的，不会显示任何快捷键。" -#: source/TortoiseSVN_en.xml:643(para) -msgid "Or you can install the dictionaries yourself. If you have OpenOffice or Mozilla installed, you can copy those dictionaries, which are located in the installation folders for those applications. Otherwise, you need to download the required dictionary files from http://lingucomponent.openoffice.org/spell_dic.html" -msgstr "或者你也可以自己安装词典。如果你安装了 OpenOffice 或 Mozilla，你可以复制这些词典，位于那些应用的安装目录。否则，你需要从 http://lingucomponent.openoffice.org/spell_dic.html 下载必要的词典文件。" +#: source/TortoiseSVN_en.xml:9062(term) +msgid "Checked" +msgstr "已勾选" -#: source/TortoiseSVN_en.xml:6442(title) -msgid "Deleting Unversioned Files" -msgstr "删除未版本控制的文件" +#: source/TortoiseSVN_en.xml:9064(para) +msgid "This activates the accelerators for TortoiseSVN commands, but of course these may conflict with the accelerators for anything else in the explorer context menu. Pressing the shortcut key multiple times will cycle through the matching context menu items. In this state, the menu items are drawn by Windows which makes the icons look ugly." +msgstr "这种状态激活了TSVN命令的快捷键，但这些与浏览器右键菜单中的其他快捷键显然存在起冲突的可能。多次按下快捷键将循环匹配右键菜单中共享同个快捷键的条目。这种状态下，菜单项是被Windows画出来的，而且看上去丑的要命。" -#: source/TortoiseSVN_en.xml:6443(para) -msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." -msgstr "通常你可以在Subversion中设置自己的忽略列表，例如忽略所有产生的文件。但是你如何清理这些忽略的项目，从而产生一个干净的构建呢？通常你在makefile中清理，但是如果你在调试makefile，或者修改构建系统，那么有一个清理方法是极为有用的。" +#: source/TortoiseSVN_en.xml:9075(term) +msgid "Indeterminate" +msgstr "半勾选(灰色)" -#: source/TortoiseSVN_en.xml:6450(para) -msgid "TortoiseSVN provides just such an option using Extended Context MenuDelete unversioned items.... You have to hold the Shift while right clicking on a folder in the explorer list pane (right pane) in order to see this in the extended context menu. This will produce a dialog which lists all unversioned files anywhere in your working copy. You can then select or deselect items to be removed." -msgstr "TortoiseSVN 提供了使用扩展上下文菜单删除未版本控制的项目...来清理工作副本。你可以在目录上右键操作时，保持 Shift按下，就可以看到这个上下文菜单。它会出现一个对话框，列出工作副本中的所有未版本控制的文件。你可以选择或取消删除的项目。" +#: source/TortoiseSVN_en.xml:9077(para) +msgid "In this mode the accelerator keys are active and the menu items are drawn in text only mode without icons." +msgstr "这种模式下快捷键被激活，同时菜单项将以纯文本的形式被画出，不显示任何图标。" -#: source/TortoiseSVN_en.xml:6462(para) -msgid "When such items are deleted, the recycle bin is used, so if you make a mistake here and delete a file that should have been versioned, you can still recover it." -msgstr "当删除这些项目时，使用了垃圾箱。所以如果你犯了错误，删除了应该版本控制的文件，你仍旧可以恢复。" +#: source/TortoiseSVN_en.xml:9048(para) +msgid "The option Enable accelerators on the top level menu has three states: " +msgstr "选项 使用顶级菜单的快捷键 有三种状态: " -#: source/TortoiseSVN_en.xml:6470(title) -msgid "Undo Changes" -msgstr "撤消更改" +#: source/TortoiseSVN_en.xml:9084(para) +msgid "Windows Vista has an improved user interface for context menu entries, which means that ownerdrawn icons are not required. This option is therefore not shown in Vista as we can have both pretty icons and accelerators :-)" +msgstr "Windows Vista 提供了上下文菜单的改良接口，从而不再需要自我绘制图标。由于我们已经具有漂亮的图标和加速键，此选项不在Vista中出现:-)" -#: source/TortoiseSVN_en.xml:6472(primary) -msgid "revert" -msgstr "恢复" +#: source/TortoiseSVN_en.xml:9090(title) +msgid "Icon Overlay Settings" +msgstr "图标叠加设置" -#: source/TortoiseSVN_en.xml:6475(primary) -msgid "undo" -msgstr "撤消" +#: source/TortoiseSVN_en.xml:9092(para) +msgid " This page allows you to choose the items for which TortoiseSVN will display icon overlays. Network drives can be very slow, so by default icons are not shown for working copies located on network shares. You can even disable all icon overlays, but where's the fun in that?" +msgstr " 此页面允许你选择TSVN为哪些条目显示图标覆盖。选择网络磁盘可能会非常慢，所以默认情况下不为定位于网络共享中的工作副本显示图标覆盖。你甚至可以取消所有的图标覆盖，但那样做还剩下什么好玩儿的呢？" -#: source/TortoiseSVN_en.xml:6477(para) -msgid "If you want to undo all changes you made in a file since the last update you need to select the file, right click to pop up the context menu and then select the command TortoiseSVNRevert A dialog will pop up showing you the files that you've changed and can revert. Select those you want to revert and click on OK. " -msgstr "如果你想要撤消一个文件自上次更新后的所有的变更，你需要选择该文件, 右击弹出快捷菜单，然后选择TortoiseSVNRevert命令，将会弹出一个显示这个你已经变更并能恢复的文件。选择那些你想要恢复的然后按OK. 。" +#: source/TortoiseSVN_en.xml:9102(para) +msgid "USB Flash drives appear to be a special case in that the drive type is identified by the device itself. Some appear as fixed drives, and some as removable drives." +msgstr "USB闪存看上去是个特殊情况，因为驱动类型是设备自主标识的。于是有些显示为固定驱动器，而有些显示为可移动磁盘。" -#: source/TortoiseSVN_en.xml:6490(title) -msgid "Revert dialog" -msgstr "恢复对话框" +#: source/TortoiseSVN_en.xml:9107(para) +msgid "By default, overlay icons will appear in all open/save dialogs as well as in Windows Explorer. If you want them to appear only in Windows Explorer, check the Show overlays only in explorer box." +msgstr "默认情况下，图标覆盖将不止显示在Windows资源浏览器下，同样会显示在所有的打开/保存对话框里。如果你想让它们 仅仅 显示在Windows资源浏览器下，勾选 仅在资源管理器中显示图标覆盖 选项。" -#: source/TortoiseSVN_en.xml:6494(para) source/TortoiseSVN_en.xml:7686(para) -msgid "The columns in this dialog can be customized in the same way as the columns in the Check for modifications dialog. Read for further details." -msgstr "在这一对话框中，纵列和在 检查修改对话框中的纵列同样是可以定制的。更多细节请阅读 " +#: source/TortoiseSVN_en.xml:9121(term) +msgid "Default" +msgstr "默认" -#: source/TortoiseSVN_en.xml:6500(title) -msgid "Undoing Changes which have been Committed" -msgstr "取消已经提交的改变" +#: source/TortoiseSVN_en.xml:9123(para) +msgid "Caches all status information in a separate process (TSVNCache.exe). That process watches all drives for changes and fetches the status again if files inside a working copy get modified. The process runs with the least possible priority so other programs don't get hogged because of it. That also means that the status information is not realtime but it can take a few seconds for the overlays to change." +msgstr "把所有状态信息缓存在一个独立进程中(TSVNCache.exe)。该进程监视所有驱动器的更改，并在工作副本中的文件被修改时重新获取其状态。该进程以最低优先级运行，所以其他程序不会被它挤兑。这同样意味着状态信息并不是 实时 的，因为它需要几秒钟时间处理图标覆盖的变化。" -#: source/TortoiseSVN_en.xml:6501(para) -msgid "Revert will only undo your local changes. It does not undo any changes which have already been committed. If you want to undo all the changes which were committed in a particular revision, read for further information." -msgstr "Revert仅能撤消你本地的变更。他不能撤消已经提交的的变更。如果你想撤消所有的包括已经提交到一个特定版本的变更，请阅读 获得更多信息。" +#: source/TortoiseSVN_en.xml:9134(para) +msgid "Advantage: the overlays show the status recursively, i.e. if a file deep inside a working copy is modified, all folders up to the working copy root will also show the modified overlay. And since the process can send notifications to the shell, the overlays on the left treeview usually change too." +msgstr "优点: 图标覆盖递归地显示状态，就是说，如果一个处在工作副本深处的文件被修改了，所有途径的文件夹包括工作副本的根目录都会显示出修改的图标覆盖。也因为该进程可以向Windows外壳发送通知，资源管理器左面的树形图通常也会更改。" -#: source/TortoiseSVN_en.xml:6515(primary) -msgid "cleanup" -msgstr "清理" +#: source/TortoiseSVN_en.xml:9142(para) +msgid "Disadvantage: the process runs constantly, even if you're not working on your projects. It also uses around 10-50 MB of RAM depending on number and size of your working copies." +msgstr "缺点: 即使你已经不在项目下工作了，该进程仍然持续运行。取决于你工作副本的数量和大小，它将占用10-50 MB的RAM内存空间。" -#: source/TortoiseSVN_en.xml:6517(para) -msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseSVNCleanup on the folder. It is a good idea to do this at the top level of the working copy." -msgstr "也许由于服务器问题，一个Subversion指令不能成功地完成，你的工作副本因此被滞留在一个不一致的状态。 那样的话，你需要在该目录上使用TortoiseSVN清理命令。在工作副本的根目录使用它是一个好主意。" +#: source/TortoiseSVN_en.xml:9150(term) +msgid "Shell" +msgstr "Windows外壳" -#: source/TortoiseSVN_en.xml:652(para) -msgid "Once you have got the dictionary files, you probably need to rename them so that the filenames only have the locale chars in it. Example: Then just copy them to the bin sub-folder of the TortoiseSVN installation folder. Normally this will be C:\\Program Files\\TortoiseSVN\\bin. If you don't want to litter the bin sub-folder, you can instead place your spell checker files in C:\\Program Files\\TortoiseSVN\\Languages. If that folder isn't there, you have to create it first. The next time you start TortoiseSVN, the spell checker will be available." -msgstr "一旦你得到了词典文件，你可能需要重命名文件，这样文件名只包含位置信息，例如: 然后把它们复制到TortoiseSVN 安装目录的 bin 子目录，通常情况下，可能是在 C:\\Program Files\\TortoiseSVN\\bin。如果你不希望弄乱bin子目录，你可以将拼写检查文件放置在C:\\Program Files\\TortoiseSVN\\Languages，如果那个目录不存在，你可以自己创建，当你下次启动TortoiseSVN 时，就可以使用拼写检查器。" +#: source/TortoiseSVN_en.xml:9152(para) +msgid "Caching is done directly inside the shell extension dll, but only for the currently visible folder. Each time you navigate to another folder, the status information is fetched again." +msgstr "缓存在外壳扩展dll中直接完成，但仅仅是为那些当前可见的文件夹。每次你浏览到其他文件夹，状态信息就会被重新获取。" -#: source/TortoiseSVN_en.xml:6528(para) -msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to repond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." -msgstr "清理有另外的一个有用的副作用。如果一个文件日期变化了但是它的内容没变,Subversion除了采用byte-by-byte将该文件和原副本进行对照，不能分清它是否真的变更。 如果你有很多这种状态下的文件，将会使获得状态非常慢，还会导致许多会话响应变慢。在你的工作副本上执行一个清理命令将会修正这些 \" 坏掉的 \" 时戳，从而可以全速检查它们的状态。" +#: source/TortoiseSVN_en.xml:9158(para) +msgid "Advantage: needs only very little memory (around 1 MB of RAM) and can show the status in realtime." +msgstr "优点: 仅仅需要很少的内存(大约1 MB)，并且可以 实时 显示状态。" -#: source/TortoiseSVN_en.xml:6539(title) -msgid "Use Commit Timestamps" -msgstr "使用提交时戳" +#: source/TortoiseSVN_en.xml:9162(para) +msgid "Disadvantage: Since only one folder is cached, the overlays don't show the status recursively. For big working copies, it can take more time to show a folder in explorer than with the default cache. Also the mime-type column is not available." +msgstr "缺点: 因为仅有一个文件夹被缓存，图标覆盖不会递归地显示状态。在大一些的工作副本下，它在浏览器中显示一个文件夹将比默认缓存模式花费更多时间。而且 mime-type 列将无效。" -#: source/TortoiseSVN_en.xml:6540(para) -msgid "Some earlier releases of Subversion were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." -msgstr "Subversion的一些早期发布中存在一个bug，当你使用使用提交时戳选项检出的时候会造成时戳混乱。使用清理命令可以修正工作副本中的这些问题。" +#: source/TortoiseSVN_en.xml:9172(term) +msgid "None" +msgstr "无" -#: source/TortoiseSVN_en.xml:6550(title) -msgid "Project Settings" -msgstr "项目设置" +#: source/TortoiseSVN_en.xml:9174(para) +msgid "With this setting, the TortoiseSVN does not fetch the status at all in Explorer. Because of that, files don't get an overlay and folders only get a 'normal' overlay if they're versioned. No other overlays are shown, and no extra columns are available either." +msgstr "在这种设置下，TSVN在浏览器里就完全不去获取状态了。因此，版本控制下的文件将不会获得任何图标覆盖。文件夹也仅仅有个“正常”状态的图标覆盖，其他的不会显示，也不会有其他额外的列可用。" -#: source/TortoiseSVN_en.xml:6552(primary) -msgid "properties" -msgstr "属性" +#: source/TortoiseSVN_en.xml:9181(para) +msgid "Advantage: uses absolutely no additional memory and does not slow down the Explorer at all while browsing." +msgstr "优点: 绝对不会占用任何额外的内存，也完全不会减慢浏览器的浏览速度。" -#: source/TortoiseSVN_en.xml:6554(para) -msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseSVN submenu!). In the properties dialog box TortoiseSVN has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." -msgstr "有时你可能想得到关于一个文件/目录的更多的细节信息而不仅是一个覆盖的标志。 你能得到Subversion的属性对话框中浏览到的所有信息。只需选择指定文件或目录，然后在文件菜单中选择Windows Menuproperties(注意: 这是浏览器提供的标准属性菜单，而不是TortoiseSVN 子菜单的其中之一)。在TortoiseSVN 属性对话框中已经为在Subversion控制下的文件/目录增加新的属性页。在这里你能看到所有的关于选择文件/目录的相关信息。" +#: source/TortoiseSVN_en.xml:9185(para) +msgid "Disadvantage: Status information of files and folders is not shown in Explorer. To see if your working copies are modified, you have to use the \"Check for modifications\" dialog." +msgstr "缺点: 文件、文件夹的状态信息不会显示在浏览器中。要获知你的工作副本是否被修改了，你需要使用“检查更新”对话框。" -#: source/TortoiseSVN_en.xml:6556(title) -msgid "Explorer property page, Subversion tab" -msgstr "资源管理器属性页，Subversion 页面" +#: source/TortoiseSVN_en.xml:9113(para) +msgid "Since it takes quite a while to fetch the status of a working copy, TortoiseSVN uses a cache to store the status in so the explorer doesn't get hogged too much when showing the overlays. You can choose which type of cache TortoiseSVN should use according to your system and working copy size here: " +msgstr "因为它要花费一段时间来获取工作副本的状态，TSVN将使用一个缓存来存储这些状态，从而使浏览器在显示图标覆盖时，资源占用的不太厉害。你可以根据你的系统和工作副本的大小来在这里选择让TSVN使用哪种类型的缓存: " -#: source/TortoiseSVN_en.xml:6576(title) -msgid "Subversion Properties" -msgstr "Subversion 属性" +#: source/TortoiseSVN_en.xml:9194(para) +msgid "If you select the default option, you can also choose to mark folders as modified if they contain unversioned items. This could be useful for reminding you that you have created new files which are not yet versioned." +msgstr "若你选择了默认选项，将同样决定如下选择: 在文件夹包含非版本控制的项目时，把文件夹图标覆盖标记为已修改。这个有用的设置可以提醒你已经创建了非版本控制的新文件。" -#: source/TortoiseSVN_en.xml:6579(para) -msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseSVNproperties and within TSVN's status lists, from Context menuproperties." -msgstr " 你可以在 Windows 属性对话框读写 Subversion 属性。也可以从TortoiseSVN属性，或者 上下文菜单属性，来读写 Subversion 属性。" +#: source/TortoiseSVN_en.xml:9199(para) +msgid "The Exclude Paths are used to tell TortoiseSVN those paths for which it should not show icon overlays and status columns. This is useful if you have some very big working copies containing only libraries which you won't change at all and therefore don't need the overlays. For example:" +msgstr "排除路径 是被用来告诉TSVN 不用 在哪些路径下显示图标覆盖和状态列。如果你有些很大的工作副本，而这些工作副本仅仅包含你完全不想改变的库文件，从而你也不需要显示图标覆盖，这时该功能将会很有用。举个例子: " -#: source/TortoiseSVN_en.xml:6581(title) -msgid "Subversion property page" -msgstr "Subversion 属性页" +#: source/TortoiseSVN_en.xml:9207(para) +msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." +msgstr "填写 f:\\development\\SVN\\Subversion 将 仅仅 在这个特殊文件夹上取消图标覆盖。 你仍然可以在该路径下的所有文件、文件夹上看到图标覆盖。" -#: source/TortoiseSVN_en.xml:659(para) -msgid "en_US.aff" -msgstr "en_US.aff" +#: source/TortoiseSVN_en.xml:9212(para) +msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." +msgstr "填写 f:\\development\\SVN\\Subversion* 将在路径以 f:\\development\\SVN\\Subversion 开始的 所有 文件和文件夹上取消图标覆盖。这意味着你在该路径下的任何文件/文件夹上都将看不到图标覆盖了。" -#: source/TortoiseSVN_en.xml:6596(para) -msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in . For more information about properties in Subversion see the Special Properties." -msgstr "从版本库里删除数据的唯一方法就是使用svnadmin这个Subversion命令行工具。具体如何实现请参考《使用 Subversion 进行版本管理》。" +#: source/TortoiseSVN_en.xml:9219(para) +msgid "The same applies to the Include Paths. Except that for those paths the overlays are shown even if the overlays are disabled for that specific drive type, or by an exclude path specified above." +msgstr "包含路径 也使用同样的语法。除了有些反例: 即使该路径处在某个取消图标覆盖显示的特定驱动类型下，或是处在上面的排除路径之下， 也依然会显示图标覆盖。" -#: source/TortoiseSVN_en.xml:6606(para) -msgid " To add a new property, first click on Add.... Select the required property name from the combo box, or type in a name of your own choice, then enter a value in the box below. Properties which take multiple values, such as an ignore list, can be entered on multiple lines. Click on OK to add that property to the list." -msgstr "为了增加新属性，先单击增加...，从组合框中选择需要的属性名称，或者输入你自定义的名称，然后在下面的编辑框内输入取值。有多个取值的属性，例如忽略列表，肯呢个输入多行。单极确认将属性增加到属性列表。" +#: source/TortoiseSVN_en.xml:9224(para) +msgid "TSVNCache.exe also uses these paths to restrict its scanning. If you want it to look only in particular folders, disable all drive types and include only the folders you specifically want to be scanned." +msgstr "TSVNCache.exe 同样使用这些路径来限制它的扫描。如果你想让它仅仅在某些特定文件夹里监视，就取消所有的驱动器类型，并仅仅包含你允许被扫描的文件夹。" -#: source/TortoiseSVN_en.xml:6608(title) -msgid "Adding properties" -msgstr "增加属性" +#: source/TortoiseSVN_en.xml:9231(title) +msgid "Icon Set Selection" +msgstr "图标集选择" -#: source/TortoiseSVN_en.xml:6618(para) -msgid "If you want to apply a property to many items at once, select the files/folders in explorer, then select Context menuproperties" -msgstr "如果你想一次性设置许多文件的属性，在资源管理器中选择文件/文件夹，然后选择上下文菜单属性。" +#: source/TortoiseSVN_en.xml:9235(title) +msgid "The Settings Dialog, Icon Set Page" +msgstr "设置对话框，图标集页面" -#: source/TortoiseSVN_en.xml:6626(para) -msgid "If you want to apply the property to every file and folder in the hierarchy below the current folder, check the Recursive checkbox." -msgstr "如果你想设置当前文件夹内的全部文件和文件夹，选中递归检查框。" +#: source/TortoiseSVN_en.xml:9233(para) +msgid " You can change the overlay icon set to the one you like best. Note that if you change overlay set, you may have to restart your computer for the changes to take effect." +msgstr " 你可以选择你最喜欢的覆盖图标集。要注意的是，倘若改变了覆盖图标集，你可能需要重启计算机使更改生效。" -#: source/TortoiseSVN_en.xml:6631(para) -msgid "Some properties, for example svn:needs-lock, can only be applied to files, so the property name doesn't appear in the drop down list for folders. You can still apply such a property recursively to all files in a hierarchy, but you have to type in the property name yourself." -msgstr "一些属性，例如svn:needs-lock只能用于文件，所以它们在文件夹的属性下拉列表内不会出现。你仍旧可以递归的设置目录树中所有文件的属性，但是需要你自己输入属性名称。" +#: source/TortoiseSVN_en.xml:9244(title) +msgid "TortoiseSVN Dialog Settings 1" +msgstr "TSVN对话框设置一" -#: source/TortoiseSVN_en.xml:6638(para) -msgid "If you wish to edit an existing property, select that property from the list of existing properties, then click on Edit...." -msgstr "如果你想编辑一个已有属性，在已有属性列表中选择它，然后单击编辑...即可。" +#: source/TortoiseSVN_en.xml:9248(title) +msgid "The Settings Dialog, Dialogs 1 Page" +msgstr "设置对话框，对话框一页面" -#: source/TortoiseSVN_en.xml:664(para) -msgid "en_US.dic" -msgstr "en_US.dic" +#: source/TortoiseSVN_en.xml:9246(para) +msgid " This dialog allows you to configure some of TortoiseSVN's dialogs the way you like them." +msgstr " 此对话框允许你按照喜欢的方式去配置一些TSVN的对话框。" -#: source/TortoiseSVN_en.xml:6642(para) -msgid "If you wish to remove an existing property, select that property from the list of existing properties, then click on Remove." -msgstr "如果你想删除已有属性，在已有属性列表中选择它，然后单击删除即可。" +#: source/TortoiseSVN_en.xml:9256(term) +msgid "Default number of log messages" +msgstr "默认的日志信息数" -#: source/TortoiseSVN_en.xml:6646(para) -msgid "The svn:externals property can be used to pull in other projects from the same repository or a completely different repository. For more information, read ." -msgstr "属性svn:externals可以用来下载位于同一版本库或不同版本库的其它工程。阅读以获得更多信息。" +#: source/TortoiseSVN_en.xml:9258(para) +msgid "Limits the number of log messages that TortoiseSVN fetches when you first select TortoiseSVNShow Log Useful for slow server connections. You can always use Get All or Next 100 to get more messages." +msgstr "限制你第一次选择 TortoiseSVN显示日志 时，TSVN向服务器获取的日志信息数。在服务器连接缓慢时很有用。你可以使用 全部显示 或 下100(条) 来获得更多信息。" -#: source/TortoiseSVN_en.xml:6652(para) -msgid "TortoiseSVN can handle binary property values using files. To read a binary property value, Save... to a file. To set a binary value, use a hex editor or other appropriate tool to create a file with the content you require, then Load... from that file." -msgstr "TortoiseSVN可以处理文件的二进制属性。使用保存...到文件读取二进制属性值。使用十六进制编辑器或其它适当的工具创建文件，然后用从文件加载...设置二进制值为此文件的内容。" +#: source/TortoiseSVN_en.xml:9272(term) +msgid "Font for log messages" +msgstr "日志信息字体" -#: source/TortoiseSVN_en.xml:6659(para) -msgid "Although binary properties are not often used, they can be useful in some applications. For example if you are storing huge graphics files, or if the application used to load the file is huge, you might want to store a thumbnail as a property so you can obtain a preview quickly." -msgstr "尽管二进制文件不经常使用，它们在一些程序中是有用的。举例来说，如果你存储了巨大的图形文件，或者用程序加载的文件巨大，你可能想将缩略图作为属性存储，于是你可以快速的预览。" +#: source/TortoiseSVN_en.xml:9274(para) +msgid "Selects the font face and size used to display the log message itself in the middle pane of the Revision Log dialog, and when composing log messages in the Commit dialog." +msgstr "选择日志信息显示的字体样式和大小，作用域为版本日志对话框的中间窗格，以及提交对话框时填写日志信息的窗格。" -#: source/TortoiseSVN_en.xml:6666(title) -msgid "Commit properties" -msgstr "提交属性" +#: source/TortoiseSVN_en.xml:9283(term) +msgid "Short date / time format in log messages" +msgstr "日志信息使用短日期/时间格式" -#: source/TortoiseSVN_en.xml:6667(para) -msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." -msgstr "Subversion 属性是受版本控制的。在你改变或增加属性后必须提交。" +#: source/TortoiseSVN_en.xml:9285(para) +msgid "If the standard long messages use up too much space on your screen use the short format." +msgstr "如果标准长度的日期/时间信息占在用了过多的屏幕空间，可以使用短格式。" -#: source/TortoiseSVN_en.xml:6673(title) -msgid "Conflicts on properties" -msgstr "属性冲突" +#: source/TortoiseSVN_en.xml:9292(term) +msgid "Progress Dialog" +msgstr "进程对话框" -#: source/TortoiseSVN_en.xml:6674(para) -msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." -msgstr "如果因为其他用户已经提交了同样的属性，提交时出现冲突，Subversion 会产生一个 .prej 文件。在你解决冲突后，请删除此文件。" +#: source/TortoiseSVN_en.xml:9294(para) +msgid "TortoiseSVN can automatically close all progress dialogs when the action is finished without error. This setting allows you to select the conditions for closing the dialogs. The default (recommended) setting is Close manually which allows you to review all messages and check what has happened. However, you may decide that you want to ignore some types of message and have the dialog close automatically if there are no critical changes." +msgstr "当一个动作正确无误地完成时，TSVN可以自动关闭所有的进程对话框。这项设置允许你选择在何种情况下关闭对话框。默认(推荐)的设置是 手动关闭 ，允许你重新浏览所有信息并检查发生了什么。当然，你可能会决定忽略某些类型的信息并在你的操作没做出什么重大改变的情况下让对话框自动关闭。" -#: source/TortoiseSVN_en.xml:6682(title) -msgid "Automatic property setting" -msgstr "自动属性设置" +#: source/TortoiseSVN_en.xml:9305(para) +msgid "Auto-close if no merges, adds or deletes means that the progress dialog will close if there were simple updates, but if changes from the repository were merged with yours, or if any files were added or deleted, the dialog will remain open. It will also stay open if there were any conflicts or errors during the operation." +msgstr "如无合并、添加、删除操作，自动关闭 意味着如果有简单更新的话，进程对话框将关闭。但如果版本库的更改和你的内容进行了合并，或若有任何文件被添加或删除，对话框将保持打开。若操作中发生什么冲突和错误这些对话框也将同样保持打开。" -#: source/TortoiseSVN_en.xml:6683(para) -msgid "You can configure Subversion to set properties automatically on files and folders when they are added to the repository. Read for further information." -msgstr "你可以设置当文件和文件夹加入版本库时，自动设置属性。阅读以获得更多信息。" +#: source/TortoiseSVN_en.xml:9313(para) +msgid "Auto-close if no merges, adds or deletes for local operations means that the progress dialog will close as for Auto-close if no merges, adds or deletes but only for local operations like adding files or reverting changes. For remote operations the dialog will stay open." +msgstr "对本地操作自动关闭(如无合并、添加或删除操作，自动关闭) 意味着进程对话框当 如无合并、添加或删除操作 时自动关闭，但仅限于那些如添加文件、还原等本地的操作。在做远程操作时对话框将保持打开。" -#: source/TortoiseSVN_en.xml:6691(title) -msgid "TortoiseSVN Properties" -msgstr "TortoiseSVN 属性" +#: source/TortoiseSVN_en.xml:9321(para) +msgid "Auto-close if no conflicts relaxes the criteria further and will close the dialog even if there were merges, adds or deletes. However, if there were any conflicts or errors, the dialog remains open." +msgstr "无冲突时自动关闭 更放宽了标准，即使在无合并、添加、删除操作时也同样关闭对话框。当然，如果操作发生了任何冲突或错误，对话框将保持打开。" -#: source/TortoiseSVN_en.xml:6692(para) -msgid "TortoiseSVN has a few special properties of its own, and these begin with tsvn:. " -msgstr "TortoiseSVN 有自己专用的几个属性，它们都有tsvn:前缀。" +#: source/TortoiseSVN_en.xml:9328(para) +msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." +msgstr "如无错误，自动关闭 即使在有冲突发生时也会关闭。维持对话框打开的唯一条件是发生了错误，使得Subversion无法完成任务。举个例子，一个更新操作由于服务器不可达而失败了，或是一个提交操作因为工作副本已经过期而失败。" -#: source/TortoiseSVN_en.xml:6697(para) -msgid "tsvn:logminsize sets the minimum length of a log message for a commit. If you enter a shorter message than specified here, the commit is disabled. This feature is very useful for reminding you to supply a proper descriptive message for every commit. If this property is not set, or the value is zero, empty log messages are allowed." -msgstr "tsvn:logminsize设置提交日志的最小长度。如果你输入的日志短于预设值，提交会被禁止。这个属性对于提醒你为每次提交提供一个适当的描述信息非常有用。如果不设置这个属性，或者设置为0，那么就允许空提交信息。" +#: source/TortoiseSVN_en.xml:9340(term) +msgid "Use URL of WC as the default \"From:\" URL" +msgstr "使用工作副本的URL作为默认的来源URL" -#: source/TortoiseSVN_en.xml:6706(para) -msgid "tsvn:lockmsgminsize sets the minimum length of a lock message. If you enter a shorter message than specified here, the lock is disabled. This feature is very useful for reminding you to supply a proper descriptive message for every lock you get. If this property is not set, or the value is zero, empty lock messages are allowed." -msgstr "tsvn:lockmsgminsize设置锁定日志的最小长度。如果你输入的日志短于预设值，加锁会被禁止。这个属性对于提醒你为每次加锁提供一个适当的描述信息非常有用。如果不设置这个属性，或者设置为0，那么就允许空加锁信息。" +#: source/TortoiseSVN_en.xml:9342(para) +msgid "In the merge dialog, the default behaviour is for the From: URL to be remembered between merges. However, some people like to perform merges from many different points in their hierarchy, and find it easier to start out with the URL of the current working copy. This can then be edited to refer to a parallel path on another branch." +msgstr "在合并对话框里，默认行为是在每次合并中记忆 起始: 的URL。无论如何，都有某些人喜欢在他们的版本进化树中从很多不同的位置执行合并操作，他们发现从当前工作副本的URL开始更方便些。该URL可以随后被编辑来指向一个同级路径或另一个分支。" -#: source/TortoiseSVN_en.xml:6717(para) -msgid "tsvn:logwidthmarker is used with projects which require log messages to be formatted with some maximum width (typically 80 characters) before a line break. Setting this property to a non-zero will do 2 things in the log message entry dialog: it places a marker to indicate the maximum width, and it disables word wrap in the display, so that you can see whether the text you entered is too long. Note: this feature will only work correctly if you have a fixed-width font selected for log messages." -msgstr "tsvn:logwidthmarker用在要求日志信息被格式化为在最大宽度(典型是80字符)处换行非常有用。设置此属性为大于0的值会在日志消息对话框中做两件事: 放置一个标记指示最大宽度，和禁止自动换行，于是你可以看到输入的信息是否太长。注意: 这个特性仅在你选择的消息使用固定宽度字体时才能正确工作。" +#: source/TortoiseSVN_en.xml:9354(term) +msgid "Default checkout path" +msgstr "缺省检出路径" -#: source/TortoiseSVN_en.xml:6730(para) -msgid "tsvn:logtemplate is used with projects which have rules about log message formatting. The property holds a multi-line text string which will be inserted in the commit message box when you start a commit. You can then edit it to include the required information. Note: if you are also using tsvn:logminsize, be sure to set the length longer than the template or you will lose the protection mechanism." -msgstr "tsvn:logtemplate在需要定义日志消息格式化规则的工程中使用。在你开始提交时，这个属性的多行消息会被插入日志消息编辑框。你可以编辑它以便包含需要的信息。注意: 如果你使用了tsvn:logminsize属性，请确认这个长度大于模版的长度，不然就会失去其保护作用。" +#: source/TortoiseSVN_en.xml:9356(para) +msgid "You can specify the default path for checkouts. If you keep all your checkouts in one place, it is useful to have the drive and folder pre-filled so you only have to add the new folder name to the end." +msgstr "你可以指定缺省的检出路径。如果你保持所有检出在同一个地方，那么预先填写的路径是极为有用的，这样你只需要在路径末尾增加新的目录名称即可。" -#: source/TortoiseSVN_en.xml:6741(para) -msgid "In the Commit dialog you have the option to paste in the list of changed files, including the status of each file (added, modified, etc). tsvn:logfilelistenglish defines whether the file status is inserted in english or in the localized language. If the property is not set, the default is true." -msgstr "在提交对话框，你可以复制修改的文件列表，包含每个文件的状态(增加，修改等)。tsvn:logfilelistenglish定义了文件状态用英文插入，还是用本地消息插入。此属性的默认值是真。" +#: source/TortoiseSVN_en.xml:9365(term) +msgid "Default checkout URL" +msgstr "缺省检出URL" -#: source/TortoiseSVN_en.xml:6752(para) -msgid "TortoiseSVN can use spell checker modules which are also used by OpenOffice and Mozilla. If you have those installed this property will determine which spell checker to use, i.e. in which language the log messages for your project should be written. tsvn:projectlanguage sets the language module the spell checking engine should use when you enter a log message. You can find the values for your language on this page: MSDN: Language Identifiers." -msgstr "TortoiseSVN可以使用OpenOffice和Mozilla使用的拼写检查模块。如果你安装了这些模块，那么这个属性将检测使用哪个拼写检查模块。也就是，你的工程的日志信息用的语言。tsvn:projectlanguage设置拼写检查引擎应该使用什么语言模块来检查日志信息。你可以在这个叶面找到你的语言的取值: MSDN: 语言标示符。" +#: source/TortoiseSVN_en.xml:9367(para) +msgid "You can also specify the default URL for checkouts. If you often checkout sub-projects of some very large project, it can be useful to have the URL pre-filled so you only have to add the sub-project name to the end." +msgstr "你可以指定缺省的检出URL。如果你经常检出一些大项目的子工程，那么预先填写的URL是极为有用的，这样你只需要在路径末尾增加新的工程名称即可。" -#: source/TortoiseSVN_en.xml:6766(para) -msgid "You can enter this value in decimal, or in hexadecimal if prefixed with 0x. For example English (US) can be entered as 0x0409 or 1033." -msgstr "你可以用十进制输入取值，如果用0x前缀的话，也可以用十六进制。例如英语(美国英语)可以输入0x0409或者1033。" +#: source/TortoiseSVN_en.xml:9378(title) +msgid "TortoiseSVN Dialog Settings 2" +msgstr "TSVN对话框设置二" -#: source/TortoiseSVN_en.xml:6774(para) -msgid "When you want to add a new property, you can either pick one from the list in the combo box, or you can enter any property name you like. If your project uses some custom properties, and you want those properties to appear in the list in the combo box (to avoid typos when you enter a property name), you can create a list of your custom properties using tsvn:userfileproperties and tsvn:userdirproperties. Apply these properties to a folder. When you go to edit the properties of any child item, your custom properties will appear in the list of pre-defined property names." -msgstr "当你想增加新属性时，你可以从组合框的下拉列表选取，也可以输入你喜欢的任何属性名称。如果你的项目使用了自定义属性，并且想让这些属性出现在组合框的下拉列表中(避免输入时拼写错误)，你可以使用tsvn:userfileproperties和tsvn:userdirproperties创建自定义属性列表。对目录应用这些属性，当你编辑其任何子项属性时，你自定义的属性将会在预定义属性名称列表中出现。" +#: source/TortoiseSVN_en.xml:9382(title) +msgid "The Settings Dialog, Dialogs 2 Page" +msgstr "设置对话框，对话框二页面" -#: source/TortoiseSVN_en.xml:678(para) -msgid "If you install multiple dictionaries, TortoiseSVN uses these rules to select which one to use. " -msgstr "如果你安装了多个词典，TortoiseSVN 使用下面的规则选择一个。" +#: source/TortoiseSVN_en.xml:9388(term) +msgid "Recurse into unversioned folders" +msgstr "递归处理未进行版本控制的文件夹" -#: source/TortoiseSVN_en.xml:6790(para) source/TortoiseSVN_en.xml:8683(para) -msgid "Some tsvn: properties require a true/false value. TSVN also understands yes as a synonym for true and no as a synonym for false." -msgstr "一些 tsvn: 属性需要 true/false 值。它也理解 yes 是 true 的同义词，no 是 false的同义词。" +#: source/TortoiseSVN_en.xml:9390(para) +msgid "If this box is checked (default state), then whenever the status of an unversioned folder is shown in the Add, Commit or Check for Modifications dialog, every child file and folder is also shown. If you uncheck this box, only the unversioned parent is shown. Unchecking reduces clutter in these dialogs. In that case if you select an unversioned folder for Add, it is added recursively." +msgstr "若这个选项框被选中(默认状态)，那么一个非版本控制的文件夹，不论在 添加，提交 或 检查更新 时显示的是什么状态，它的每个子文件和子文件夹都要同样显示。取消选择将减少这些对话框中的混乱程度。这样一来如果你选择添加一个非版本控制的文件夹，将会非递归地添加。" -#: source/TortoiseSVN_en.xml:6797(title) -msgid "Set the tsvn: properties on folders" -msgstr "设置文件夹的 tsvn: 属性" +#: source/TortoiseSVN_en.xml:9404(term) +msgid "Use autocompletion of filepaths and keywords" +msgstr "自动完成文件路径和关键词" -#: source/TortoiseSVN_en.xml:6798(para) -msgid "These tsvn: properties must be set on folders for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseSVN will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. C:\\) is found. If you can be sure that each user checks out only from e.g trunk/ and not some subfolder, then it is sufficient to set the properties on trunk/. If you can't be sure, you should set the properties recursively on each subfolder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to trunk/)." -msgstr "属性tsvn:只能在文件夹设置。当你提交文件或文件夹时，这些属性从文件夹读取。如果没有发现这些属性，TortoiseSVN会向上级目录搜索，直到未版本控制的文件夹，或到达根目录(例如 C:\\) 。如果你确认每个用户都是从同一个目录检出，例如trunk/，而不是其它子目录，那么只在trunk/设置属性就足够了。如果你不能确定，那么应当递归的设置每个子目录。深层的设置覆盖高层的设置 (靠近 trunk/)。" +#: source/TortoiseSVN_en.xml:9406(para) +msgid "The commit dialog includes a facility to parse the list of filenames being committed. When you type the first 3 letters of an item in the list, the autocompletion box pops up, and you can press Enter to complete the filename. Check the box to enable this feature." +msgstr "提交对话框包含了一个功能模块，可以解析被提交的一系列文件名。当你输入一个提交列表中某个文件的前三个字母时，自动完成对话框就会弹出来，使你随后可以点击回车来直接完成这个文件名。选择该选项来使用这个功能特性。" -#: source/TortoiseSVN_en.xml:6812(para) source/TortoiseSVN_en.xml:8705(para) -#: source/TortoiseSVN_en.xml:8807(para) -msgid "For tsvn: properties only you can use the Recursive checkbox to set the property to all subfolders in the hierarchy, without also setting it on all files." -msgstr "对于tsvn:属性，你只能对于所有子目录使用递归检查框设置属性，不能设置文件的属性。" +#: source/TortoiseSVN_en.xml:9416(term) +msgid "Timeout in seconds to stop the autocompletion parsing" +msgstr "对自动完成进行多长时间的分析(秒)" -#: source/TortoiseSVN_en.xml:6819(para) -msgid "TortoiseSVN can integrate with some bugtracking tools. This uses properties, which start with bugtraq:. Read for further information." -msgstr "TortoiseSVN可以与一些问题跟踪工具集成。它使用bugtraq:开始的属性。阅读以便获得更多信息。" +#: source/TortoiseSVN_en.xml:9418(para) +msgid "The autocompletion parser can be quite slow if there are a lot of large files to check. This timeout stops the commit dialog being held up for too long. If you are missing important autocompletion information, you can extend the timeout." +msgstr "如果有大量文件需要程序检查，自动完成解析器可能会非常慢。该超时时间设置可以防止提交对话框被长时间挂起。若你错过了某些重要的自动完成信息，你可以延长该超时时间。" -#: source/TortoiseSVN_en.xml:6824(para) -msgid "It can also integrate with some web-based repository browsers. Read for further information." -msgstr "它也与一些基于WEB的版本库浏览器集成。阅读以获得更多信息。" +#: source/TortoiseSVN_en.xml:9427(term) +msgid "Only use spellchecker when tsvn:projectlanguage is set" +msgstr "仅在保留了 tsvn:projectlanguage 时才进行拼写检查" -#: source/TortoiseSVN_en.xml:683(para) -msgid "Check the tsvn:projectlanguage setting. Refer to for information about setting project properties." -msgstr "检查 tsvn:projectlanguage 设置，关于设置项目属性可以参考。" +#: source/TortoiseSVN_en.xml:9429(para) +msgid "If you don't wish to use the spellchecker for all commits, check this box. The spellchecker will still be enabled where the project properties require it." +msgstr "若你不愿意在所有提交操作时都进行拼写检查，就选择该选项。而后拼写检查功能将在项目属性做出明确要求时才生效。" -#: source/TortoiseSVN_en.xml:6831(title) -msgid "Branching / Tagging" -msgstr "分支/标记" +#: source/TortoiseSVN_en.xml:9437(term) +msgid "Max. items to keep in the log message history" +msgstr "日志中保留的最大条目数量" -#: source/TortoiseSVN_en.xml:6833(primary) -msgid "branch" -msgstr "分支" +#: source/TortoiseSVN_en.xml:9439(para) +msgid "TortoiseSVN stores the last 25 log messages you entered for each repository. You can customize the number stored here. If you have many different repositories, you may wish to reduce this to avoid filling your registry." +msgstr "TSVN可以为每个版本库保存你访问时所输入的最后25条日志信息。你可以自定义该数目。若你有很多不同的版本库，你可能会希望减少该数目以防止向注册表中填入过多信息。" -#: source/TortoiseSVN_en.xml:6836(primary) -msgid "tag" -msgstr "标记" +#: source/TortoiseSVN_en.xml:9448(term) +msgid "Re-open commit dialog after a commit failed" +msgstr "如果提交失败，自动重新打开提交对话框" -#: source/TortoiseSVN_en.xml:6842(para) -msgid "One of the features of version control systems is the ability to isolate changes onto a separate line of development. This line is known as a branch. Branches are often used to try out new features without disturbing the main line of development with compiler errors and bugs. As soon as the new feature is stable enough then the development branch is merged back into the main branch (trunk)." -msgstr "版本控制系统的一个特性是能够把各种修改分离出来放在开发品的一个分割线上。这条线被称为分支。分支经常被用来试验新的特性，而不会对开发有编译错误的干扰。当新的特性足够稳定之后，开发品的分支就可以混合回主分支里(主干线)." +#: source/TortoiseSVN_en.xml:9450(para) +msgid "When a commit fails for some reason (working copy needs updating, pre-commit hook rejects commit, network error, etc), you can select this option to keep the commit dialog open ready to try again. However, you should be aware that this can lead to problems. If the failure means you need to update your working copy, and that update leads to conflicts you must resolve those first." +msgstr "当一个提交操作由于某些原因(工作副本需要更新、pre-commit钩子程序拒绝了提交、网络错误等等)失败了，你可以选择该选项来使提交对话框保持打开，以便重新操作。当然，你应该注意到这可能会导致一些问题。若发生的错误意味着你需要更新你的工作副本，而此更新操作将导致冲突，那么你必须先解决这些事情再说。" -#: source/TortoiseSVN_en.xml:6852(para) -msgid "Another feature of version control systems is the ability to mark particular revisions (e.g. a release version), so you can at any time recreate a certain build or environment. This process is known as tagging." -msgstr "版本控制系统的另一个特性是能够标记特殊的版本(例如某个发布版本)，所以你可以在任何时候重新建立一个特定的构件和环境。这个过程被称作标记。" +#: source/TortoiseSVN_en.xml:9461(term) +msgid "Contact the repository on startup" +msgstr "启动时连接版本库" -#: source/TortoiseSVN_en.xml:6858(para) -msgid "Subversion does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." -msgstr "Subversion 没有用于建立分支和标记的特殊命令，但是使用所谓的便宜复制来代替。便宜复制类似于Unix里的硬连接，它意思是代替一个版本库里的完整的复制，创建一个内部的连接，指向一个具体的版本树。结果分支和标记就迅速被创建，并且没有在版本库里占据任何额外的空间。" +#: source/TortoiseSVN_en.xml:9463(para) +msgid "The Check for Modifications dialog checks the working copy by default, and only contacts the repository when you click Check repository. If you always want to check the repository, you can use this setting to make that action happen automatically." +msgstr "“检查更新”对话框将默认检查工作副本，但仅当你点击 检查版本库 时才连接你的版本库做检查。若你想总是去检查版本库，就可以使用该设置来使版本库检查的动作每次都自动启动。" -#: source/TortoiseSVN_en.xml:6868(title) -msgid "Creating a Branch or Tag" -msgstr "创建一个分支或标记" +#: source/TortoiseSVN_en.xml:9473(term) +msgid "Sort items numerically" +msgstr "按数字顺序排序" -#: source/TortoiseSVN_en.xml:6869(para) -msgid "If you have imported your project with the recommended directory structure, creating a branch or tag version is very simple: Select the folder in your working copy which you want to copy to a branch or tag, then select the command TortoiseSVNBranch/Tag...." -msgstr "如果你用推荐的目录结构导入了一个工程，那么创建分支或标记就非常简单: 在你当前的工作副本中给你你想要复制的分支或标记选择一个目录，然后选择命令TortoiseSVN分支/标记...。" +#: source/TortoiseSVN_en.xml:9475(para) +msgid "The repository browser can use a more intelligent sorting algorithm which handles paths containing numbers better than a plain ascii sort. This is sometimes useful for getting version number tags in the correct order. This option controls the default sort type used." +msgstr "版本库浏览器可以使用一个更智能的排序算法，该算法处理包含数字的路径的效果比纯按ASCII排序效果要好。这在某些时候会变得很有用，比如用来使版本号标签排成正确的顺序。该选项可以控制你所使用的默认排序类型。" -#: source/TortoiseSVN_en.xml:6873(title) -msgid "The Branch/Tag Dialog" -msgstr "分支/标记对话框" +#: source/TortoiseSVN_en.xml:9487(title) +msgid "TortoiseSVN Colour Settings" +msgstr "TortoiseSVN 颜色设置" -#: source/TortoiseSVN_en.xml:6883(para) -msgid "" -"The default destination URL for the new branch will be the source URL on which your working copy is based. You will need to edit that URL to the new path for your branch/tag. So instead of \n" -" http://svn.collab.net/repos/ProjectName/trunk\n" -" you might now use something like \n" -" http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n" -" If you can't remember the naming convention you used last time, click the button on the right to open the repository browser so you can view the existing repository structure." -msgstr "" -"默认的目标URL将会是你当前工作副本所处的源URL。你必须给你的分支/标记编辑一个新路径。来取代\n" -" http://svn.collab.net/repos/ProjectName/trunk\n" -"你可以使用这样的设置 \n" -" http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n" -"如果你忘记了你上一次使用的命名约定，可以用鼠标右键打开版本库浏览器来察看已经存在的版本库结构。" +#: source/TortoiseSVN_en.xml:9491(title) +msgid "The Settings Dialog, Colours Page" +msgstr "设置对话框，颜色页面" -#: source/TortoiseSVN_en.xml:6899(para) -msgid "Now you have to select the source of the copy. Here you have three options: " -msgstr "现在你必须选择要复制的源位置。在这里你有三个设置选项: " +#: source/TortoiseSVN_en.xml:9489(para) +msgid " This dialog allows you to configure the text colours used in TortoiseSVN's dialogs the way you like them." +msgstr " 此对话框允许你按照你喜欢的方式来配置TSVN对话框使用的文本颜色。" -#: source/TortoiseSVN_en.xml:690(para) -msgid "If no project language is set, or that language is not installed, try the language corresponding to the Windows locale." -msgstr "如果没有设置项目语言，或者那个语言没有安装，尝试使用对应 Windows 区域信息的语言。" +#: source/TortoiseSVN_en.xml:9499(term) +msgid "Possible or real conflict / obstructed" +msgstr "可能或确实有冲突/有问题" -#: source/TortoiseSVN_en.xml:6906(para) -msgid "The new branch is copied directly in the repository from the HEAD revision. No data needs to be transferred from your working copy, and the branch is created very quickly." -msgstr "新分支直接从仓库中的最新版本里复制出来。不需要从你的工作副本中传输任何数据，这个分支的建立是非常快的。" +#: source/TortoiseSVN_en.xml:9501(para) +msgid "A conflict has occurred during update, or may occur during merge. Update is obstructed by an existing unversioned file/folder of the same name as a versioned one." +msgstr "当更新时或合并时发生了冲突。如果对应于版本控制下的文件/文件夹，存在一个同名的非版本控制的文件/文件夹，此时做更新将被阻碍。" -#: source/TortoiseSVN_en.xml:6915(term) -msgid "Specific revision in the repository" -msgstr "在版本库中指定具体的版本" +#: source/TortoiseSVN_en.xml:9506(para) +msgid "This colour is also used for error messages in the progress dialogs." +msgstr "此颜色同样被用在进程对话框的错误信息中。" -#: source/TortoiseSVN_en.xml:6917(para) -msgid "The new branch is copied directly in the repository but you can choose an older revision. This is useful if you forgot to make a tag when you released your project last week. If you can't remember the revision number, click the button on the right to show the revision log, and select the revision number from there. Again no data is transferred from your working copy, and the branch is created very quickly." -msgstr "在仓库中直接复制建立一个新分支同时你也可以选择一个旧版本。假如在你上周发布了项目时忘记了做标记，这将非常有用。如果你记不起来版本号，通过点击鼠标右键来显示版本日志，同时从这里选取版本号。和上次一样不需要从你的工作副本中传输任何数据，这个分支建立起来是非常快的。" +#: source/TortoiseSVN_en.xml:9512(term) +msgid "Added files" +msgstr "添加文件" -#: source/TortoiseSVN_en.xml:6932(para) -msgid "The new branch is an identical copy of your local working copy. If you have updated some files to an older revision in your WC, or if you have made local changes, that is exactly what goes into the copy. Naturally this sort of complex tag may involve transferring data from your WC back to the repository if it does not exist there already." -msgstr "新的分支是一个完全等同于你的本地工作副本的一个副本。如果你更新了一些文件到你的工作副本的某个旧版本里，或者你在本地做出了修改，这些改变将准确无误的进入副本中。自然而然地这种综合的标记会包含正在从工作副本传输到版本库的数据，如果这些数据还不存在的话。" +#: source/TortoiseSVN_en.xml:9514(para) +msgid "Items added to the repository." +msgstr "向版本库添加的条目。" -#: source/TortoiseSVN_en.xml:6945(para) -msgid "If you want your working copy to be switched to the newly created branch automatically, use the Switch working copy to new branch/tag checkbox. But if you do that, first make sure that your working copy does not contain modifications. If it does, those changes will be merged into the branch WC when you switch." -msgstr "如果你想把你的工作副本自动切换到最新创建的分支，使用转换工作副本至新分支/标记 选择框.但是如果你打算这么做，首先要确认你的工作副本没有被修改。如果有修改的话，当你转换后这些修改将会混合进你的工作副本分支里。" +#: source/TortoiseSVN_en.xml:9520(term) +msgid "Missing / deleted / replaced" +msgstr "丢失/已删除/已替换" -#: source/TortoiseSVN_en.xml:6953(para) -msgid "Press OK to commit the new copy to the repository. Don't forget to supply a log message. Note that the copy is created inside the repository." -msgstr "按下确认提交新副本到版本库中。别忘了提供一条日志信息。需要注意的是这个副本是在版本库内部创建的。" +#: source/TortoiseSVN_en.xml:9522(para) +msgid "Items deleted from the repository, missing from the working copy, or deleted from the working copy and replaced with another file of the same name." +msgstr "已从工作副本中遗失的条目；已从版本库中删除；或已经从工作副本删除并且被另一个同名文件替换。" -#: source/TortoiseSVN_en.xml:6958(para) -msgid "Note that creating a Branch or Tag does not affect your working copy. Even if you copy your WC, those changes are committed to the new branch, not to the trunk, so your WC may still be marked as modified." -msgstr "需要注意建立一个分支或标记不会影响你的工作副本。即使你复制了你的工作副本，这些修改也会提交到新分支里，而不是到主干里，所以你的工作副本可能仍然标记为已修改状态。" +#: source/TortoiseSVN_en.xml:9530(term) +msgid "Merged" +msgstr "合并" -#: source/TortoiseSVN_en.xml:696(para) -msgid "If the exact Windows locale doesn't work, try the Base language, eg. de_CH (Swiss-German) falls back to de_DE (German)." -msgstr "如果精确的 Windows 区域信息不起作用，可以试一下基础语言，例如将 de_CH(Swiss-German) 修改为 de_DE (German)。" +#: source/TortoiseSVN_en.xml:9532(para) +msgid "Changes from the repository successfully merged into the WC without creating any conflicts." +msgstr "从版本库所做的更改被成功地合并到工作副本，并无任何冲突产生。" -#: source/TortoiseSVN_en.xml:6966(title) -msgid "To Checkout or to Switch..." -msgstr "检出或者切换" +#: source/TortoiseSVN_en.xml:9539(term) +msgid "Modified / copied" +msgstr "已修改/已复制" -#: source/TortoiseSVN_en.xml:6969(primary) -msgid "switch" -msgstr "切换" +#: source/TortoiseSVN_en.xml:9541(para) +msgid "Add with history, or paths copied in the repository. Also used in the log dialog for entries which include copied items." +msgstr "已经增加(现在只是修改)，或者在版本库中复制。也在包含复制条目的日志对话框中使用。" -#: source/TortoiseSVN_en.xml:6971(para) -msgid "...that is (not really) the question. While a checkout checks out everything from the desired branch into your working directory, TortoiseSVNSwitch... only transfers the changed data to your working copy. Good for the network load, good for your patience. :-)" -msgstr "...这是个小问题。当你想从预期的分支检出所有数据到你的工作副本目录时TortoiseSVN切换... 仅仅传输已经被修改的数据到你的工作副本中。这样能减轻你的网络负担，也能减少你的耐心。" +#: source/TortoiseSVN_en.xml:9549(term) +msgid "Deleted node" +msgstr "删除的节点" -#: source/TortoiseSVN_en.xml:6982(para) -msgid "To be able to work with your freshly generated copy you have several ways to handle it. You can: " -msgstr "为了能够使用你最新产生的副本你有采用下面几种方法。你可以: " +#: source/TortoiseSVN_en.xml:9551(para) +msgid "An item which has been deleted from the repository." +msgstr "一个已经从版本库中删除了的条目。" -#: source/TortoiseSVN_en.xml:6987(para) -msgid "TortoiseSVNCheckout to make a fresh checkout in an empty folder. You can check out to any location on your local disk and you can create as many working copies from your repository as you like." -msgstr "TortoiseSVN检出一个最新的项目在一个空目录下。你可以在你的本地磁盘上的任意位置进行检出操作，同时你可以从版本库中按照你的意愿建立出任意数量的副本。" +#: source/TortoiseSVN_en.xml:9557(term) +msgid "Added node" +msgstr "添加的节点" -#: source/TortoiseSVN_en.xml:6999(para) -msgid "Switch your current working copy to the newly created copy in the repository. Again select the top level folder of your project and use TortoiseSVNSwitch... from the context menu." -msgstr "在版本库中从你当前的工作副本切换到最新建立的副本。再一次选择你的项目所处的顶级文件夹然后在菜单中使用TortoiseSVN切换...。" +#: source/TortoiseSVN_en.xml:9559(para) +msgid "An item which has been added to the repository, by an add, copy or move operation." +msgstr "一个通过添加、复制或移动操作，已经被添加到版本库的条目。" -#: source/TortoiseSVN_en.xml:7009(para) -msgid "In the next dialog enter the URL of the branch you just created. Select the Head Revision radio button and click on OK. Your working copy is switched to the new branch/tag." -msgstr "在接下来的对话框中蠕蠕你刚才建立的分支的URL。选择最新版本单选按钮然后确认。你的工作副本就切换到了最新的分支/标记。" +#: source/TortoiseSVN_en.xml:9566(term) +msgid "Renamed node" +msgstr "重命名的节点" -#: source/TortoiseSVN_en.xml:7017(para) -msgid "Switch works just like Update in that it never discards your local changes. Any changes you have made to your working copy which have not yet been committed will be merged when you do the Switch. If you do not want this to happen then you must either commit the changes before switching, or revert your working copy to an already-committed revision (typically HEAD)." -msgstr "切换操作起来就象更新，因为它没有丢弃你在本地做的修改。在工作副本里当你进行切换的时候任何没有提交过的修改都会被混合。如果你不想看到这样的结果，那么你可以有两种选择，要么在切换前提交修改，要么把工作副本恢复到一个已经提交过的版本(比如最新版本)。" +#: source/TortoiseSVN_en.xml:9568(para) +msgid "An item which has been renamed within the repository." +msgstr "一个在版本库中已经被重命名的条目。" -#: source/TortoiseSVN_en.xml:7028(title) -msgid "The Switch Dialog" -msgstr "切换对话框" +#: source/TortoiseSVN_en.xml:9574(term) +msgid "Replaced node" +msgstr "替换的节点" -#: source/TortoiseSVN_en.xml:7032(para) -msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " -msgstr "尽管Subversion本身不区分标记和分支，它们的使用方法还是有些不同。" +#: source/TortoiseSVN_en.xml:9576(para) +msgid "The original item has been deleted and a new item with the same name replaces it." +msgstr "该原始条目已经被删除，且有同名条目替换了的条目。" -#: source/TortoiseSVN_en.xml:7037(para) -msgid "Tags are typically used to create a static snapshot of the project at a particular stage. As such they not normally used for development - that's what branches are for, which is the reason we recommended the /trunk /branches /tags repository structure in the first place. Working on a tag revision is not a good idea, but because your local files are not write protected there is nothing to stop you doing this by mistake. However, if you try to commit to a path in the repository which contains /tags/, TortoiseSVN will warn you." -msgstr "在某个特殊的阶段标记被用来建立一个项目的静态映像。同样地标记和分支应该被独特地应用于开发品。这就是我们首选推荐 /trunk /branches /tags这样的版本库结构的原因。使用标记的版本并不是一个好想法，因为你的本地文件没有写保护，你这样做容易犯错误。不管怎样如果你试着提交(修改)到一个包含/标记/的版本库路径下，TortoiseSVN 会给你警告。" +#: source/TortoiseSVN_en.xml:9587(title) +msgid "Network Settings" +msgstr "网络设置" -#: source/TortoiseSVN_en.xml:704(para) -msgid "If none of the above works, then the default language is english, which is included with the standard installation." -msgstr "如果以上都没有效果，则缺省语言是英语，包含在标准安装中。" +#: source/TortoiseSVN_en.xml:9589(primary) +msgid "proxy server" +msgstr "代理服务器" -#: source/TortoiseSVN_en.xml:7053(para) -msgid "It may be that you need to make further changes to a release which you have already tagged. The correct way to handle this is to create a new branch from the tag first and commit the branch. Do your Changes on this branch and then create a new tag from this new branch, e.g. Version_1.0.1." -msgstr "如果你想要在一个已经标记的发布版上做更多的修改。正确的操作方法是先从标记处建立一个新分支然后提交这个分支。在这个分支的基础上进行修改后再从这个新分支上建立一个新标记，例如 Version_1.0.1。" +#: source/TortoiseSVN_en.xml:9593(title) +msgid "The Settings Dialog, Network Page" +msgstr "设置对话框，网络设置页面" -#: source/TortoiseSVN_en.xml:7063(para) -msgid "If you modify a working copy created from a branch and commit, then all changes go to the new branch and not the trunk. Only the modifications are stored. The rest remains a cheap copy." -msgstr "如果你修改了一个从分支建立的工作副本然后又提交了这个副本，那么所有的修改会转到一个新分支里而不是 主干。仅仅是存储了修改的数据。其余的数据还是便宜复制。" +#: source/TortoiseSVN_en.xml:9591(para) +msgid " Here you can configure your proxy server, if you need one to get through your company's firewall." +msgstr " 如果需要穿透你公司的防火墙，在这里可以配置你的代理服务器。" -#: source/TortoiseSVN_en.xml:7076(title) -msgid "Merging" -msgstr "正在合并" +#: source/TortoiseSVN_en.xml:9599(para) +msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." +msgstr "如果你需要对每个版本库建立一套代理设置，你必须使用Subversion服务器文件来配置。使用编辑来直接访问该配置文件(servers.txt)。该文件的细节和使用方法可以参考运行时配置" -#: source/TortoiseSVN_en.xml:7079(primary) -msgid "merge" -msgstr "合并" +#: source/TortoiseSVN_en.xml:9609(para) +msgid "You can also specify which program TortoiseSVN should use to establish a secure connection to a svn+ssh repository. We recommend that you use TortoisePlink.exe. This is a version of the popular Plink program, and is included with TortoiseSVN, but it is compiled as a Windowless app, so you don't get a DOS box popping up every time you authenticate." +msgstr "你同样可以在此指定SSH客户端程序，用来支持TortoiseSVN同使用svn+ssh协议的版本库建立安全连接。我们推荐您使用TortoisePlink.exe。这是著名的Plink程序的一个定制版本， 并且业已包含在TortoiseSVN之中，但它被编译成了一个无窗口的应用，因此当你每次认证的时候将不会看到弹出的DOS窗口。" -#: source/TortoiseSVN_en.xml:7081(para) -msgid "Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa." -msgstr "分支用来维护独立的开发支线，在一些阶段，你可能需要将分支上的修改合并到最新版本，或者将最新版本的修改合并到分支。" +#: source/TortoiseSVN_en.xml:9617(para) +msgid "One side-effect of not having a window is that there is nowhere for any error messages to go, so if authentication fails you will simply get a message saying something like Unable to write to standard output. For this reason we recommend that you first set up using standard Plink. When everything is working, you can use TortoisePlink with exactly the same parameters." +msgstr "这里有个不弹出窗口的副作用: 将没有什么错误信息可供你追踪。因此倘若认证失败你将得到一个信息说: Unable to write to standard output。这样一来，我们就推荐你第一次设置时使用原始的Plink程序；而当一切工作正常之时，再使用定制版的TortoisePlink，并且重复利用那些相同的参数。" -#: source/TortoiseSVN_en.xml:7086(para) -msgid "It is important to understand how branching and merging works in Subversion before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Subversion book, which gives a full description and many examples of how it is used." -msgstr "因为分支与合并很复杂，所以在你开始使用之前，请先理解它是怎么工作的。强烈建议你阅读《使用 Subversion 进行版本管理》的分支与合并章节，它给出了全面的描述，和许多使用举例。" +#: source/TortoiseSVN_en.xml:9628(title) +msgid "External Program Settings" +msgstr "外部程序设置" -#: source/TortoiseSVN_en.xml:7096(para) -msgid "An important point to remember is that Merge is closely related to Diff. The merge process works by generating a list of differences between two points in the repository, and applying those differences to your working copy. For example if you want to merge the changes made in revision N then you have to compare revision N with revision (N-1). Novices often ask Why do I have to subtract 1 from the start revision. Think of the underlying Diff process and it will become clearer. TO make this easier, when you use Show Log to select a range of revisions to merge, TortoiseSVN makes this adjustment for you automatically." -msgstr "十分关键之处是Subversion的合并与差异关系很密切。合并工作的基础是在版本库对两个分支产生一个差异列表，然后对你的工作副本应用这些差异。举例说明，如果你需要合并版本N的修改，那么你要与版本N-1比较。新手经常问为什么我需要从开始版本减一。考虑底层的差异处理，这个问题就会清楚了。为了容易操作，当你使用显示日志选择一个版本范围合并的时候，TortoiseSVN 自动为你做这个调整。" +#: source/TortoiseSVN_en.xml:9631(title) +msgid "The Settings Dialog, Diff Viewer Page" +msgstr "设置对话框，差异查看页面" -#: source/TortoiseSVN_en.xml:71(title) -msgid "Audience" -msgstr "致读者" +#: source/TortoiseSVN_en.xml:9629(para) +msgid " Here you can define your own diff/merge programs that TortoiseSVN should use. The default setting is to use TortoiseMerge which is installed alongside TortoiseSVN." +msgstr " 在这里你可以定义你自己的差异查看/合并工具. 默认设置是使用与TortoiseSVN一同安装的TortoiseMerge。" -#: source/TortoiseSVN_en.xml:7109(para) -msgid "In general it is a good idea to perform a merge into an unmodified working copy. If you have made other changes in your WC, commit those first. If the merge does not go as you expect, you may want to revert the changes, and the Revert command will discard all changes including any you made before the merge." -msgstr "通常来说，在没有修改的工作副本上执行合并是一个好想法。如果你在工作副本上做了修改，请先提交。如果合并没有按照你的想法执行，你可能需要撤销这些修改，命令恢复 会丢弃包含你执行合并之前的所有修改。" +#: source/TortoiseSVN_en.xml:9639(para) +msgid "Read for a list of some of the external diff/merge programs that people are using with TortoiseSVN." +msgstr "阅读 来了解人们为配合TortoiseSVN工作而使用的外部差异查看/合并程序列表。" -#: source/TortoiseSVN_en.xml:7116(para) -msgid "There are two common use cases for merging which are handled in slightly different ways, as described below." -msgstr "这里有两个处理稍微不同的用例，如下所述。" +#: source/TortoiseSVN_en.xml:9644(title) +msgid "Diff Viewer" +msgstr "差异查看器" -#: source/TortoiseSVN_en.xml:7121(title) -msgid "Merging a Range of Revisions" -msgstr "合并指定版本范围" +#: source/TortoiseSVN_en.xml:9657(term) source/TortoiseSVN_en.xml:9748(term) +msgid "%base" +msgstr "%base" -#: source/TortoiseSVN_en.xml:7122(para) -msgid "This method covers the case when you have made one or more revisions to a branch (or to the trunk) and you want to port those changes across to a different branch." -msgstr "这个方法覆盖了你已经在分支(或者最新版本)上做出了一个或多个修改，并且你想将这些修改应用到不同分支的情况。" +#: source/TortoiseSVN_en.xml:9659(para) +msgid "The original file without your changes" +msgstr "没更改的原始文件" -#: source/TortoiseSVN_en.xml:7127(para) -msgid " To merge revisions you need to go to a working copy of the branch in which you want to receive the changes, often the trunk. Select TortoiseSVNMerge... from the context menu. The merge is now complete. It's a good idea to have a look at the merge and see if it's as expected. Merging is usually quite complicated. Conflicts often arise if the branch has drifted far from the trunk." -msgstr " 为了合并版本，你需要进入接收修改的分支的工作副本，经常是trunk。选择右键菜单TortoiseSVN合并...。 现在合并结束。察看合并，看看它是否如预期那样工作，是个好想法。合并通常很复杂，如果分支与最新版本差别很大，合并经常会出现冲突。" +#: source/TortoiseSVN_en.xml:9665(term) source/TortoiseSVN_en.xml:9757(term) +msgid "%bname" +msgstr "%bname" -#: source/TortoiseSVN_en.xml:7129(title) -msgid "The Merge Dialog" -msgstr "合并对话框" +#: source/TortoiseSVN_en.xml:9667(para) source/TortoiseSVN_en.xml:9759(para) +msgid "The window title for the base file" +msgstr "原始文件的窗口标题" -#: source/TortoiseSVN_en.xml:7142(para) -msgid "In the From: field enter the full folder url of the branch or tag containing the changes you want to port into your working copy. You may also click ... to browse the repository and find the desired branch. If you have merged from this branch before, then just use the drop down list which shows a history of previously used URLs." -msgstr "在从:域输入文件夹在分支或标记中的完整URL，它包含了你想应用到工作副本的修改。你也可以点击...浏览版本库，找到渴望的分支。如果你以前已经从这个分支合并过，可以直接从包含历史的下拉列表选择以前使用的URL。" +#: source/TortoiseSVN_en.xml:9673(term) source/TortoiseSVN_en.xml:9765(term) +msgid "%mine" +msgstr "%mine" -#: source/TortoiseSVN_en.xml:7155(para) -msgid "Because you are porting a range of revisions from the same branch into your working copy, make sure the Use \"From:\" URL checkbox is checked." -msgstr "因为你要将同一分支的版本范围合并到工作副本，所以要确保使用 \"从:\" URL 检查框选中。" +#: source/TortoiseSVN_en.xml:9675(para) +msgid "Your own file, with your changes" +msgstr "你更改过的新文件" -#: source/TortoiseSVN_en.xml:7163(para) -msgid "" -"In the From Revision field enter the start revision number. This is the revision before the changes you want to merge. Remember that Subversion will create a diff file in order to perform the merge, so the start point has to be just before the first change you are interested in. For example, your log messages may look something like this: \n" -"Rev Comments\n" -"39. Working on MyBranch\n" -"38. Working on trunk\n" -"37. Working on MyBranch\n" -"36. Create branch MyBranch\n" -"35. Working on trunk\n" -"34. Working on trunk\n" -" ...\n" -" If you now want to merge all the changes from MyBranch into the trunk you have to choose 36 as the From Revision, not 37 as you might think. If you select revision 37 as the start point, then the difference engine compares the end point with revision 37, and will miss the changes made in revision 37 itself. If that sounds complicated, don't worry, there is an easier way in TortoiseSVN ..." -msgstr "" -"在从版本域输入开始版本号。它是在你要执行合并的修改之前的版本号。切记为了合并，Subversion将会创建一个差异，所以开始点务必准确。 例如，你的日志象这样: \n" -"版本 注释\n" -"39. Working on MyBranch\n" -"38. Working on trunk\n" -"37. Working on MyBranch\n" -"36. Create branch MyBranch\n" -"35. Working on trunk\n" -"34. Working on trunk\n" -" ...\n" -"如果你要将 MyBranch 的修改合并到 trunk，应该选择36作为开始版本，而不是象你想的是37。如果你选择37作为开始点，那么差异引擎将会比较结束点与版本37比较，这就丢失了版本37做的修改。如果这听起来很复杂，不要担心，在TortoiseSVN中有更简单的方法 ..." +#: source/TortoiseSVN_en.xml:9681(term) source/TortoiseSVN_en.xml:9773(term) +msgid "%yname" +msgstr "%yname" -#: source/TortoiseSVN_en.xml:7191(para) -msgid "The easiest way to select the range of revisions you need is to click on Show Log, as this will list recent changes with their log comments. If you want to merge the changes from a single revision, just select that revision. If you want to merge changes from several revisions, then select that range (using the usual Shift-modifier). Click on OK and the revision numbers of the From revision and To revision in the Merge dialog will both be filled in for you." -msgstr "选择版本范围最简单的方法是，点击显示日志，列出最近的修改和日志。如果你要合并单个版本的修改，直接选取那个版本。如果你要合并多个版本，就选择范围(使用通常的Shift-键)。点击确认，就会为你填写合并对话框的全部域，开始版本和结束版本。" +#: source/TortoiseSVN_en.xml:9683(para) source/TortoiseSVN_en.xml:9775(para) +msgid "The window title for your file" +msgstr "你新文件的窗口标题" -#: source/TortoiseSVN_en.xml:72(para) -msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseSVN is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." -msgstr "本书面向这样的计算机用户: 希望使用 Subversion 管理数据，但又不愿意使用 Subversion 的命令行客户端。因为 TortoiseSVN 是 Windows 的外壳扩展应用，所以我们假设用户很熟悉 Windows 资源管理器的使用。" +#: source/TortoiseSVN_en.xml:9646(para) +msgid "An external diff program may be used for comparing different revisions of files. The external program will need to obtain the filenames from the command line, along with any other command line options. TortoiseSVN uses substitution parameters prefixed with %. When it encounters one of these it will substitute the appropriate value. The order of the parameters will depend on the Diff program you use. " +msgstr "有时你可能需要一个外部的差异查看程序来比较不同版本的文件。在为你的命令行填写各种可选参数的同时，要确保这些外部程序从中获得文件名。在TortoiseSVN编辑命令行时，使用以 % 开头的替代参数。当外部程序执行至遇到这些替代参数，它将从TortoiseSVN那里获取那些实际的值。参数的填写顺序将依赖于你使用的差异查看程序。" -#: source/TortoiseSVN_en.xml:7204(para) -msgid "When the Use \"From:\" URL checkbox is checked, only one Show Log button is enabled. This is because the Show Log dialog sets both From: and To: revisions, so you need to use the multiple selection method outlined above." -msgstr "当选择了检查框 使用 \"开始:\" URL，只有按钮显示日志可用。这是因为显示日志对话框设置了全部开始:和结束:版本。所以你只用上面说的多项选择方法即可。" +#: source/TortoiseSVN_en.xml:9690(para) +msgid "The window titles are not pure filenames. TortoiseSVN treats that as a name to display and creates the names accordingly. So e.g. if you're doing a diff from a file in revision 123 with a file in your working copy, the names will be filename : revision 123 and filename : working copy" +msgstr "窗口标题并不一定代表真正的文件名。TortoiseSVN把它伪装成一个名字用来创建和显示。因此，倘若你在对比一个版本为123的文件和你当前工作副本中的文件，名字将显示为 文件名 : 版本 123 和 文件名 : 工作副本" -#: source/TortoiseSVN_en.xml:721(title) -msgid "Basic Concepts" -msgstr "基本概念" +#: source/TortoiseSVN_en.xml:9700(para) +msgid "" +"For example, with ExamDiff Pro: \n" +"C:\\Path-To\\ExamDiff.exe %base %mine\n" +" or with KDiff3: \n" +"C:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n" +" or with WinMerge: \n" +"C:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n" +" or with Araxis: \n" +"C:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n" +" %base %mine\n" +"" +msgstr "" +"例如，使用 ExamDiff Pro：\n" +"C:\\Path-To\\ExamDiff.exe %base %mine\n" +" 或者使用 KDiff3：\n" +"C:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n" +" 或者使用 WinMerge：\n" +"C:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n" +" 或者使用 Araxis：\n" +"C:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n" +" %base %mine\n" +"" -#: source/TortoiseSVN_en.xml:7212(para) -msgid "If you have already merged some changes from this branch, hopefully you will have made a note of the last revision merged in the log message when you committed the change. In that case, you can use Show Log for the Working Copy to trace that log message. Use the end point of the last merge as the start point for this merge. For example, if you have merged revisions 37 to 39 last time, then the start point for this merge should be revision 39." -msgstr "如果你已经从这个分支合并了一些修改，希望你在提交日志中注明最后一个合并的版本号。这时，你可以在工作服本上使用显示日志对话框跟踪日志。使用最后合并的版本号作为本次合并的开始版本。例如，你已经合并了版本37到39，那么本次合并你应该从版本39开始。" +#: source/TortoiseSVN_en.xml:9719(para) +msgid "If you use the svn:keywords property to expand keywords, and in particular the revision of a file, then there may be a difference between files which is purely due to the current value of the keyword. Also if you use svn:eol-style = native the BAsE file will have pure LF line endings whereas your file will have CR-LF line endings. TSVN will normally hide these differences automatically by first parsing the BASE file to expand keywords and line endings before doing the diff operation. However, this can take a long time with large files. If Convert files when diffing against BASE is unchecked then TSVN will skip pre-processing the files." +msgstr "如果你使用了 svn:keywords 属性来扩展关键词，特别是那些 revision 版本关键词，那么在那些纯粹在关键词上取值不同的文件之间对比将有一些不同。同样如果你使用 svn:eol-style = native，那么在工作基础版本文件只有纯粹的 LF (换行)结束符的地方，你的文件将有完整的 CR-LF (回车-换行)结束符。TSVN在做差异对比操作之前，通常会先行对那些扩展关键词和结束符等格式进行解析转换，从而自动隐藏这些差异。无论如何，在遇到大文件时这样做无疑会经过一个很长的处理时间。如果取消对 与基础版本比较时转换文件 的勾选，那么TSVN将忽略这些对文件的预处理。" -#: source/TortoiseSVN_en.xml:7225(para) -msgid "If you have not used Show Log to select the revision range, then you will need to set the To Revision manually. Enter the last revision number in the range you want to merge. Often this will be the HEAD revision, although it doesn't need to be - you may just want to merge a single revision." -msgstr "如果你没有使用显示日志对话框显示版本范围，那么你需要手工设置结束版本。在范围中输入你想合并的最后一个版本号。这经常是最新版本，尽管它不必是 - 你只想合并单个版本。" +#: source/TortoiseSVN_en.xml:9733(para) +msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." +msgstr "" -#: source/TortoiseSVN_en.xml:723(primary) -msgid "Subversion book" -msgstr "Subversion 手册" +#: source/TortoiseSVN_en.xml:9740(title) +msgid "Merge Tool" +msgstr "合并工具" -#: source/TortoiseSVN_en.xml:7233(para) -msgid "If other people may be committing changes then be careful about using the HEAD revision. It may not refer to the revision you think it does if someone else made a commit after your last update." -msgstr "如果其他用户可能提交，那么要小心使用最新版本。如果有人在你最近更新之后提交了，它指代的版本可能就不是你想的那样了。" +#: source/TortoiseSVN_en.xml:9750(para) +msgid "the original file without your or the others changes" +msgstr "没有被你或他人更改的原始文件" -#: source/TortoiseSVN_en.xml:7250(para) -msgid "When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. Unfortunately merge information is not stored by Subversion. For more information about this, refer to Best Practices for Merging in the Subversion book." -msgstr "当你已经测试了修改，准备提交时，日志信息应当总是包含这次合并的版本信息。如果你以后需要执行合并，就需要知道已经合并了什么，因为你不想多次合并同一修改。不幸的是，合并信息不会存储在Subversion版本库中。阅读《使用 Subversion 进行版本管理》中的合并的最佳实践章节以获得更多信息。" +#: source/TortoiseSVN_en.xml:9767(para) +msgid "your own file, with your changes" +msgstr "你更改过的新文件" -#: source/TortoiseSVN_en.xml:726(para) -msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." -msgstr "本章修改自《使用 Subversion 进行版本管理》的相同章节，它的在线版本位于: http://svnbook.red-bean.com/。" +#: source/TortoiseSVN_en.xml:9781(term) +msgid "%theirs" +msgstr "%theirs" -#: source/TortoiseSVN_en.xml:7263(para) -msgid "Branch management is important. If you want to keep this branch up to date with the trunk, you should be sure to merge often so that the branch and trunk do not drift too far apart. Of course, you should still avoid repeated merging of changes, as explained above." -msgstr "分支管理很重要。如果你要保持这个分支与最新版本同步，你应当经常合并，这样分支和最新版本的差别就不会太大。当然，你仍旧应该遵循上面的说明，避免重复合并修改。" +#: source/TortoiseSVN_en.xml:9783(para) +msgid "the file as it is in the repository" +msgstr "档案库中存放的文件" -#: source/TortoiseSVN_en.xml:7270(para) -msgid "Subversion can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder url for the merge." -msgstr "Subversion不能进行文件与文件夹的合并，反之亦然 - 只能文件夹对文件夹，文件对文件。如果选择了文件，打开合并对话框，那么你必须在对话框中给出文件的路径。如果你选择了文件夹，打开合并对话框，那么你必须给出文件夹的对话框。" +#: source/TortoiseSVN_en.xml:9789(term) +msgid "%tname" +msgstr "%tname" -#: source/TortoiseSVN_en.xml:7280(title) -msgid "Merging Two Different Trees" -msgstr "合并两个不同的目录树" +#: source/TortoiseSVN_en.xml:9791(para) +msgid "The window title for the file in the repository" +msgstr "档案库中文件的窗口标题" -#: source/TortoiseSVN_en.xml:7281(para) -msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes. So in this special case, you would merge by comparing the branch with the trunk." -msgstr "这个用例覆盖了这种情况，当你象《Subversion手册》里讨论的那样，创建了一个新特性分支。所有最新版本的修改都要每周一次合并到新特性分支，等新特性完成后，你向将它合并到最新版本。因为你已经保持了新特性分支和最新版本同步，所以除了你在分支做的修改，其它部分在分支和最新版本应该是相同的。于是在这种情况下，你应当用比较分支和最新版本的方法来合并。" +#: source/TortoiseSVN_en.xml:9797(term) +msgid "%merged" +msgstr "%merged" -#: source/TortoiseSVN_en.xml:7291(para) -msgid "To merge the feature branch back into the trunk you need to go to a working copy of the trunk. Select TortoiseSVNMerge... from the context menu. " -msgstr "为了将新特性从分支合并到最新版本，你需要进入最新版本的工作副本。在右键菜单选择 TortoiseSVN合并... " +#: source/TortoiseSVN_en.xml:9799(para) +msgid "the conflicted file, the result of the merge operation" +msgstr "发生冲突的文件，同时将被合并后的文件替换" -#: source/TortoiseSVN_en.xml:7302(para) -msgid "In the From: field enter the full folder url of the trunk. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes. You may also click ... to browse the repository." -msgstr "在开始:域输入trunk文件夹的全路径。这听起来好象是错误的，但是切记 trunk 是你想增加分支修改的开始点。也可以点击 ...浏览版本库。" +#: source/TortoiseSVN_en.xml:9806(term) +msgid "%mname" +msgstr "%mname" -#: source/TortoiseSVN_en.xml:7313(para) -msgid "Because you are comparing two different trees, make sure the Use \"From:\" URL checkbox is not checked." -msgstr "因为你在比较两个不同的树，确认没有选择使用 \"开始:\" 路径检查框。" +#: source/TortoiseSVN_en.xml:9808(para) +msgid "The window title for the merged file" +msgstr "合并文件的窗口标题" -#: source/TortoiseSVN_en.xml:7320(para) -msgid "In the To: field enter the full folder url of the feature branch." -msgstr "在结束:域输入关注的分支中文件夹的全路径。" +#: source/TortoiseSVN_en.xml:9742(para) +msgid "An external merge program used to resolve conflicted files. Parameter substitution is used in the same way as with the Diff Program. " +msgstr "外部合并程序被用来解决文件冲突。像差异查看程序那样，替代参数同样被用在命令行中。" -#: source/TortoiseSVN_en.xml:7326(para) -msgid "In both the From Revision field and the To Revision field, enter the last revision number at which the two trees were synchronized. If you are sure no-one else is making commits you can use the HEAD revision in both cases. If there is a chance that someone else may have made a commit since that synchronization, use the specific revision number to avoid losing more recent commits." -msgstr "在开始版本和结束版本 域，输入两个树被同步的最后一个版本号。如果你确信没有其他人提交，两个都可是输入 HEAD。如果在同步时可能有人提交的话，使用清楚的版本号以便面丢失最新提交。" +#: source/TortoiseSVN_en.xml:9815(para) +msgid "" +"For example, with Perforce Merge: \n" +"C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n" +" or with KDiff3: \n" +"C:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n" +" --L1 %bname --L2 %yname --L3 %tname\n" +" or with Araxis: \n" +"C:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n" +" /title3:%yname %theirs %base %mine %merged /a2\n" +"" +msgstr "" +"例如，使用 Perforce Merge：\n" +"C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n" +" 或者使用 KDiff3：\n" +"C:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n" +" --L1 %bname --L2 %yname --L3 %tname\n" +" 或者使用 Araxis：\n" +"C:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n" +" /title3:%yname %theirs %base %mine %merged /a2\n" +"" -#: source/TortoiseSVN_en.xml:7336(para) -msgid "You can also use Show Log to select the revision. Note that in this case you are not selecting a range of revisions, so the revision you select there is what will actually appear in the Revision field." -msgstr "你也可以使用显示日志选择版本。注意这种情况下，你不能选择版本范围，所以此时你选择的版本会实际出现在版本域。" +#: source/TortoiseSVN_en.xml:9833(title) +msgid "Diff/Merge Advanced Settings" +msgstr "差异查看/合并工具的高级设置" -#: source/TortoiseSVN_en.xml:734(para) -msgid "This chapter is a short, casual introduction to Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use." -msgstr "这一章是对 Subversion 一个简短随意的介绍，如果你对版本控制很陌生，这一章节完全是为你准备的，我们从讨论基本概念开始，深入理解 Subversion 的思想，然后展示许多简单的实例。" +#: source/TortoiseSVN_en.xml:9837(title) +msgid "The Settings Dialog, Diff/Merge Advanced Dialog" +msgstr "高级差异比较设置/高级合并设置的对话框" -#: source/TortoiseSVN_en.xml:7351(para) -msgid "In this case you will not need the feature branch again because the new feature is now integrated into the trunk. The feature branch is redundant and can be deleted from the repository if required." -msgstr "这种情况下，因为新特性已经集成到最新版本，你不再需要这个新特性分支。新特性分支变成多余的，如果需要可以从版本库删除它。" +#: source/TortoiseSVN_en.xml:9835(para) +msgid " In the advanced settings, you can define a different diff and merge program for every file extension. For instance you could associate Photoshop as the Diff Program for .jpg files :-) You can also associate the svn:mime-type property with a diff or merge program." +msgstr " 在高级设置中，你可以为每种文件类型都定义一个不同的差异比较/合并程序。例如，你可以指定Photoshop作为.jpg文件的 比较 程序 :-) 也可以按照 svn:mime-type 属性指定差异/合并程序。" -#: source/TortoiseSVN_en.xml:7359(title) -msgid "Previewing Merge Results" -msgstr "预览合并结果" +#: source/TortoiseSVN_en.xml:9846(para) +msgid "To associate using a file extension, you need to specify just the extension, with the leading dot but with no wildcard spec. Use .BMP to describe Windows bitmap files, not*.BMP. To associate using the svn:mime-type property, specify the mime type, including a slash, for example text/xml." +msgstr "无需任何通配符，你仅需指定文件的扩展名，包含开始的点，但是没有任何通配符。使用 .BMP 来描述Windows位图文件，而 不是*.BMP。如果使用svn:mime-type属性，要指定多媒体文件类型，包含斜线，例如text/xml。" -#: source/TortoiseSVN_en.xml:7360(para) -msgid "If you are uncertain about the merge operation, you may want to preview what will happen do before you allow it to change your working copy. There are three additional buttons to help you." -msgstr "如果你不信任合并操作，可以在允许它修改你的工作副本之前预览效果。有三个额外的按钮可以帮着你预览。" +#: source/TortoiseSVN_en.xml:9858(title) +msgid "Unified Diff Viewer" +msgstr "统一的差异查看器" -#: source/TortoiseSVN_en.xml:7365(para) -msgid "Unified Diff creates the diff file (remember that merge is based on diff) and shows you which lines will be changed in your working copy files. As this is a unified diff (patch) file it is not always easy to read out of context, but for small scale changes it can be helpful as it shows all the changes in one hit." -msgstr "统一差异创建差异文件(切记合并基于差异)，显示你的工作目录哪些行将要被修改。因为这是统一差异(补丁)文件，所以离开上下文，它经常很难读。但是对于小的修改，由于它将所有修改在一起显示，因此很有用。" +#: source/TortoiseSVN_en.xml:9860(para) +msgid "A viewer program for unified-diff files (patch files). No parameters are required. The Default option is to check for a file association for .diff files, and then for .txt files. If you don't have a viewer for .diff files, you will most likely get NotePad." +msgstr "一个统一差异文件(补丁文件)的查看程序。不需要任何参数。默认 选项遵循先检查 .diff 文件，再检查 .txt 文件的顺序。如果你没有 .diff 文件的查看器，就需要用记事本来查看了。" -#: source/TortoiseSVN_en.xml:7372(para) -msgid "Diff shows you a list of changed files. Double click on any of the listed files to start the diff viewer. Unlike the unified diff, this shows you the changes in their full contextual detail. As with the unified diff, the changes you see here are the changes between the From: and To: revisions. It does not show how your working copy will be affected by applying that change." -msgstr "差异显示修改文件列表。双击任一文件启动差异察看器。不像统一差异，它显示具有前后关系的详细修改信息。象统一差异那样，你看到的是开始版本: 和 结束版本:之间的差异。它不显示应用此改变之后，你的工作版本如何改变。" +#: source/TortoiseSVN_en.xml:9869(para) +msgid "The original Windows NotePad program does not behave well on files which do not have standard CR-LF line-endings. Since most unified diff files have pure LF line-endings, they do not view well in NotePad. However, you can download a free NotePad replacement Notepad2 which not only displays the line-endings correctly, but also colour codes the added and removed lines." +msgstr "原始Windows记事本程序对未使用标准“回车-换行”结束符的文件支持的并不好。而很多统一差异文件都仅仅使用“换行”结束符，因此他们的格式在记事本中显示的并不好。无论如何，你可以下载一个免费的记事本2 Notepad2，它不但可以正确地显示结束符，更可以为差异文件中添加和删除的那些行做颜色标记。" -#: source/TortoiseSVN_en.xml:7381(para) -msgid "Dry Run performs the merge operation, but does not modify the working copy at all. It shows you a list of the files that will be changed by a real merge, and notes those areas where conflicts will occur." -msgstr "演习运行执行合并操作，但是根本不 修改工作副本。它显示在真实的合并中要修改的文件列表，还告诉你哪里会出现冲突。" +#: source/TortoiseSVN_en.xml:9885(title) +msgid "Saved Data Settings" +msgstr "已保存数据的设置" -#: source/TortoiseSVN_en.xml:7389(title) -msgid "Ignoring Ancestry" -msgstr "忽略祖先" +#: source/TortoiseSVN_en.xml:9888(title) +msgid "The Settings Dialog, Saved Data Page" +msgstr "设置对话框，已保存数据设置页面" -#: source/TortoiseSVN_en.xml:7390(para) -msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Subversion has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Subversion use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Subversion book, Noticing or Ignoring Ancestry" -msgstr "大部分时候，你要合并文件的历史，所以要相对于公共祖先合并。有时你需要合并或许是有关系的文件，但是不在你的版本库中。例如，你已经将一个第三方库的版本1和2导入到两个单独目录。尽管它们逻辑相关，因为Subversion只看到你导入的文件，所以它不知道这些关系。如果你试图合并这两个树的修改，将会看到完全的删除和增加。让Subversion只使用路径差异，不关心历史差异，选中忽略祖先检查框。你可以在《使用 Subversion 进行版本管理》的关心或忽略祖先中阅读此主题的更多信息。" +#: source/TortoiseSVN_en.xml:9886(para) +msgid " For your convenience, TortoiseSVN saves many of the settings you use, and remembers where you have been lately. If you want to clear out that cache of data, you can do it here." +msgstr " 为您方便着想，TortoiseSVN保存了很多你用过的设置，并记录你最近浏览过的地址。如果你想清空这些数据缓存，就在这里操作。" -#: source/TortoiseSVN_en.xml:7410(title) -msgid "Locking" -msgstr "锁" +#: source/TortoiseSVN_en.xml:9897(term) +msgid "URL history" +msgstr "URL历史记录" -#: source/TortoiseSVN_en.xml:7412(primary) -msgid "locking" -msgstr "加锁" +#: source/TortoiseSVN_en.xml:9899(para) +msgid "Whenever you checkout a working copy, merge changes or use the repository browser, TortoiseSVN keeps a record of recently used URLs and offers them in a combo box. Sometimes that list gets cluttered with outdated URLs so it is useful to flush it out periodically." +msgstr "每次你检出一个工作副本，合并那些更改的文件，或仅仅是在使用版本库浏览器时，TortoiseSVN都将保存一个记录，记录那些最近使用过的URL，并在一个下拉列表框中显示出来。有时列表会被逐渐增多的过期URL弄得乱糟糟的，所以有定期清理一下的必要。" -#: source/TortoiseSVN_en.xml:7414(para) -msgid "Subversion generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " -msgstr "使用之前在中描述的复制-修改-合并 的方法，Subversion通常不需要锁就可以很好的工作。但是，在某些情况下你可能需要制定某种锁定策略。" +#: source/TortoiseSVN_en.xml:9906(para) +msgid "If you want to remove a single item from one of the combo boxes you can do that in-place. Just click on the arrow to drop the combo box down, move the mouse over the item you want to remove and type SHIFT+DELETE." +msgstr "如果你希望从列表中删除单独的条目，可以点击下拉列表，移动鼠标到你要删除的项上，然后按组合键SHIFT+DELETE。" -#: source/TortoiseSVN_en.xml:742(para) -msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." -msgstr "尽管我们的例子展示了人们如何分享程序源代码，仍然要记住 Subversion 可以控制所有类型的文件－它并没有限制只为程序员工作。" +#: source/TortoiseSVN_en.xml:9915(term) +msgid "Log messages" +msgstr "日志信息" -#: source/TortoiseSVN_en.xml:7422(para) -msgid "You are using unmergeable files, for example, graphics files. If two people change the same file, merging is not possible, so one of you will lose their changes." -msgstr "例如，你使用图形文件等不能合并的文件。如果两个人修改同一个这样的文件，合并是不可能的，所以你丢失其中一个的修改。" +#: source/TortoiseSVN_en.xml:9917(para) +msgid "TortoiseSVN stores recent commit log messages that you enter. These are stored per repository, so if you access many repositories this list can grow quite large." +msgstr "TortoiseSVN同时也储存你最近提交时填写的日志信息。对应每个版本库都要储存这些信息，所以如果你访问过很多版本库，这个列表将变得非常大。" -#: source/TortoiseSVN_en.xml:7430(para) -msgid "Your company has always used a locking VCS in the past and there has been a management decision that locking is best." -msgstr "你的公司过去经常使用VCS锁定，这是个管理决定，锁定是最好的。" +#: source/TortoiseSVN_en.xml:9925(term) +msgid "Dialog sizes and positions" +msgstr "窗口大小及位置" -#: source/TortoiseSVN_en.xml:7438(para) -msgid "Firstly you need to ensure that your Subversion server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:/// access, then of course only your client needs to be updated." -msgstr "首先，你需要确保你的Subversion服务器更新到至少1.2版本。早期的版本不支持锁定。如果你使用file:///进行访问，那么当然只要更新你的客户端就可以了。" +#: source/TortoiseSVN_en.xml:9927(para) +msgid "Many dialogs remember the size and screen position that you last used." +msgstr "许多对话框都可以记录你最后一次使用时的窗口大小和位置。" -#: source/TortoiseSVN_en.xml:7445(title) -msgid "How Locking Works in Subversion" -msgstr "锁定在Subverion中是如何工作的" +#: source/TortoiseSVN_en.xml:9934(term) +msgid "Authentication data" +msgstr "认证数据" -#: source/TortoiseSVN_en.xml:7446(para) -msgid "By default, nothing is locked and anyone who has commit access can commit changes to any file at any time. Others will update their working copies periodically and changes in the repository will be merged with local changes." -msgstr "默认情况下，所有的东西都没有锁定，只要有提交权限的人都可以在任何时候提交任何的文件。其他人会定时更新他们的工作副本，在库中的改变的东西都会与本地合并。" +#: source/TortoiseSVN_en.xml:9936(para) +msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" +msgstr "当你在登陆某个Subversion服务器，填写认证信息时，用户名和密码也可以被保存在本地，你也就不用每次都输入了。但考虑到一些安全因素，你可能会有清除这些认证信息的愿望，或者你仅仅是想换个不同的用户名登陆...John知道你正在用他的机器么？(规范点儿，用你自己的用户名登陆版本库吧，伙计 *by Jax)" -#: source/TortoiseSVN_en.xml:7452(para) -msgid "If you Get a Lock on a file, then only you can commit that file. Commits by all other users will be blocked until you release the lock. A locked file cannot be modified in any way in the repository, so it cannot be deleted or renamed either, except by the lock owner." -msgstr "如果你对一个文件 取得锁定，那么只有你可以提交这个文件。其他用户的提交都会被拒绝，直到你释放了这个锁。一个被锁定的文件不能在库中进行任何形式的合并。所以它不能除锁的拥用者之外的人删除或更名。" +#: source/TortoiseSVN_en.xml:9943(para) +msgid "If you want to clear auth data for one particular server only, read for instructions on how to find the cached data." +msgstr "如果你仅想清除某个特定版本库的认证数据，读一下 有关怎样寻找缓存数据的说明。" -#: source/TortoiseSVN_en.xml:7459(para) -msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Subversion property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseSVN to indicate that you need to acquire a lock before editing." -msgstr "但是，其他用户不必知道你已经增加了锁定，除非他们定期地检查锁定的状态。这其实没什么意义，因为他们发现提交失败的时候就可以知道锁定了。为了更容易管理锁，而设置了一个新的Subversion属性 svn:needs-lock。当一个文件的这个属性被设置(成任意值)的时候，每当该文件检出或更新时，本地的副本都被设成只读，除非该工作副本就是拥有锁的那个用户的。这么做是为了能警告你，你不应该修改这个文件，除非你申请到了锁定。受控只读的文件在TortoiseSVN中用一个特殊的图标来表示你需要在编辑前取得锁定。" +#: source/TortoiseSVN_en.xml:9953(title) +msgid "Registry Settings" +msgstr "注册表设置" -#: source/TortoiseSVN_en.xml:7475(para) -msgid "Locks are recorded by working copy location as well as by owner. If you have several working copies (at home, at work) then you can only hold a lock in one of those working copies." -msgstr "锁除了按所有者记录外，还在工作副本中记录。如果你有多个工作副本(在家，在单位)，那么在这些工作副本中，只允许对其中一份拥有锁。" +#: source/TortoiseSVN_en.xml:9955(primary) +msgid "registry" +msgstr "注册表" -#: source/TortoiseSVN_en.xml:7481(para) -msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Subversion provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." -msgstr "如果你的合作者之一请求一个锁，但却外出旅游去了，你怎么办？Subversion提供了一种强制锁。释放别人拥有的锁被称为破坏锁定，强制获得别人拥有的锁称为窃取锁定。当然，如果你想要与你的合作者保持良好的关系，轻易不要这么做。" +#: source/TortoiseSVN_en.xml:9957(para) +msgid "A few infrequently used settings are available only by editing the registry directly." +msgstr "一些极不常用的设置只有通过直接修改注册表的方式才能生效。" -#: source/TortoiseSVN_en.xml:7491(para) -msgid "Locks are recorded in the repository, and a lock token is created in your local working copy. If there is a discrepancy, for example if someone else has broken the lock, the local lock token becomes invalid. The repository is always the definitive reference." -msgstr "锁在库中进行记录，一个锁定令牌建立在你的本地工作副本中。如果有矛盾，比如某人破坏了锁下，那么本地的锁定令牌将不可用。库中的记录将是最权威的参考。" +#: source/TortoiseSVN_en.xml:9965(para) +msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseSVN\\ConfigDir. This will affect all TortoiseSVN operations." +msgstr "通过编辑注册表 HKCU\\Software\\TortoiseSVN\\ConfigDir，你可以为Subversion的配置文件指定一个不同位置。这将影响到TSVN的所有操作。" -#: source/TortoiseSVN_en.xml:7500(title) -msgid "Getting a Lock" -msgstr "取得锁定" +#: source/TortoiseSVN_en.xml:9974(term) +msgid "Cache Tray Icon" +msgstr "缓存托盘图标" -#: source/TortoiseSVN_en.xml:7501(para) -msgid "Select the file(s) in your working copy for which you want to acquire a lock, then select the command TortoiseSVNGet Lock.... A dialog appears, allowing you to enter a comment, so others can see why you have locked the file. The comment is optional and currently only used with Svnserve based repositories. If (and only if) you need to steal the lock from someone else, check the Steal lock box, then click on OK." -msgstr "选择工作副本中你想要获取锁定的文件，然后选择命令TortoiseSVN取得锁定.... 出现一个对话框，允许你输入注释，这样别人可以知道你为什么锁定这个文件。注释是可选的，并且只用于基于Svnserve的库。当(且仅当)你需要窃取别人的锁的时候，勾选偷取此锁定复选框，然后点击确定。" +#: source/TortoiseSVN_en.xml:9976(para) +msgid "To add a cache tray icon for the TSVNCache program, create a DWORD key with a value of 1 at HKCU\\Software\\TortoiseSVN\\CacheTrayIcon. This is really only useful for developers as it allows you to terminate the program gracefully." +msgstr "要为TSVNCache程序添加一个缓存托盘图标，先在 HKCU\\Software\\TortoiseSVN\\CacheTrayIcon 的位置，创建一个 DWORD 值，取值为1。这确实只对开发者才有点用处，因为它允许你来优雅地关闭TSVNCache，而不是在进程列表里kill掉它。(托盘图标可以显示当前已缓存了的文件夹数目 *by Jax)" -#: source/TortoiseSVN_en.xml:7509(title) -msgid "The Locking Dialog" -msgstr "锁定对话框" +#: source/TortoiseSVN_en.xml:9988(title) +msgid "Subversion Working Folders" +msgstr "Subversion 的工作文件夹" -#: source/TortoiseSVN_en.xml:752(primary) -msgid "repository" -msgstr "版本库" +#: source/TortoiseSVN_en.xml:9990(primary) +msgid ".svn folder" +msgstr "名为 .svn 的文件夹" -#: source/TortoiseSVN_en.xml:7521(para) -msgid "If you select a folder and then use TortoiseSVNGet Lock... the lock dialog will open with every file in every subfolder selected for locking. If you really want to lock an entire hierarchy, that is the way to do it, but you could become very unpopular with your co-workers if you lock them out of the whole project. Use with care ..." -msgstr "如果你选择一个文件夹，使用TortoiseSVN获取锁定...锁定对话框将显示所有子文件夹中的所有文件 。如果你真的要锁定整个目录，就这么做，但如果你这么做，可能会很不受你的合作者的欢迎。小心使用..." +#: source/TortoiseSVN_en.xml:9993(primary) +msgid "_svn folder" +msgstr "名为 _svn 的文件夹" -#: source/TortoiseSVN_en.xml:7535(title) -msgid "Releasing a Lock" -msgstr "释放锁定" +#: source/TortoiseSVN_en.xml:9995(para) +msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses." +msgstr "在使用VS.NET环境做web工程时，遇到.svn文件夹会出问题，但Subversion是要用这些文件夹来储存自己的内部信息的。这可不是Subversion的bug，这bug是VS.NET和它使用的frontpage扩展带来的。" -#: source/TortoiseSVN_en.xml:7536(para) -msgid "To make sure you don't forget to release a lock you don't need any more, locked files are shown in the commit dialog and selected by default. If you continue with the commit, locks you hold on the selected files are removed, even if the files haven't been modified. If you don't want to release a lock on certain files, you can uncheck them (if they're not modified). If you want to keep a lock on a file you've modified, you have to enable the Keep locks checkbox before you commit your changes." -msgstr "为了确保你不会忘记释放锁，你不需要做别的事，在提交对话框中，总是会显示锁定的文件，并总是默认被选中。如果你继续提交，选中的文件中的锁就被移除了，就算你从没有修改过。如果你不希望释放某文件的锁，你可以取消选中它(如果你没有修改过)。如果你希望保持一个修改过的文件的锁，你需要在提交之前选中保持锁定复选框。" +#: source/TortoiseSVN_en.xml:10001(para) +msgid "As of Version 1.3.0 of Subversion and TortoiseSVN, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Subversion will use _svn folders instead of .svn folders. You must restart your shell for that env variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." +msgstr "在Subversion 1.3.0和TSVN 1.3.0里，你可以设置环境变量 SVN_ASP_DOT_NET_HACK，来通知Subversion用 _svn 文件夹替代 .svn 文件夹。你必须重启你系统的外壳程序来使环境变量生效，一般意味着你要重启PC。在1.4.0里这项替代工作就变得非常简单，你只需从常规设置页面选择一个单选框: 使用“_svn”目录替代“.svn”目录。——参考 " -#: source/TortoiseSVN_en.xml:754(para) -msgid "Subversion is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." -msgstr "Subversion 是一种集中的分享信息的系统，它的核心是版本库，储存所有的数据，版本库按照文件树形式储存数据－包括文件和目录，任意数量的客户端可以连接到版本库，读写这些文件。通过写数据，别人可以看到这些信息；通过读数据，可以看到别人的修改。" +#: source/TortoiseSVN_en.xml:10011(para) +msgid "For more information, and other ways to avoid this problem in the first place, check out the article about this in our FAQ." +msgstr "若想获得更多信息，了解避免该问题的其他方法，请读读我们 FAQ 里的文章。" -#: source/TortoiseSVN_en.xml:7547(para) -msgid "To release a lock manually, select the file(s) in your working copy for which you want to release the lock, then select the command TortoiseSVNRelease Lock There is nothing further to enter so TortoiseSVN will contact the repository and release the locks. You can also use this command on a folder to release all locks recursively." -msgstr "要手动释放锁定，选中工作副本中要释放的文件，选择命令TortoiseSVN释放锁定。不需要输入什么 TortoiseSVN会联系版本库并释放锁。你可以对一个文件夹来使用这个命令释放其中的所有锁定项。" +#: source/TortoiseSVN_en.xml:10022(title) +msgid "Client Side Hook Scripts" +msgstr "客户端钩子脚本" -#: source/TortoiseSVN_en.xml:7560(title) -msgid "Checking Lock Status" -msgstr "检查锁定状态" +#: source/TortoiseSVN_en.xml:10024(primary) +msgid "client hooks" +msgstr "客户端钩子" -#: source/TortoiseSVN_en.xml:7561(para) -msgid " To see what locks you and others hold, you can use TortoiseSVNCheck for Modifications.... Locally held lock tokens show up immediately. To check for locks held by others (and to see if any of your locks are broken or stolen) you need to click on Check Repository." -msgstr "要查看你和他人所拥有的锁，你可以使用TortoiseSVN检查更新...命令。本地的锁定令牌会立即显示出来，要查看别人拥用的锁定(或是检查你的锁是否被破坏或窃取)你需要点击检查版本库。" +#: source/TortoiseSVN_en.xml:10027(primary) +msgid "hook scripts" +msgstr "钩子脚本" -#: source/TortoiseSVN_en.xml:7563(title) -msgid "The Check for Modifications Dialog" -msgstr "检查修改对话框" +#: source/TortoiseSVN_en.xml:10031(title) +msgid "The Settings Dialog, Hook Scripts Page" +msgstr "设置对话框，钩子脚本页" -#: source/TortoiseSVN_en.xml:7576(para) -msgid "From the context menu here, you can also get and release locks, as well as breaking and stealing locks held by others." -msgstr "从此处的右键菜单中，你可以获取锁或是释放锁，也可以破坏或是窃取别人的锁。" +#: source/TortoiseSVN_en.xml:10029(para) +msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Subversion actions are performed. As opposed to the hook scripts explained in , these scrips are executed locally on the client." +msgstr " 这个对话框允许你指定当特定 Subversion 动作执行时，自动执行的钩子脚本。与 中钩子脚本的解释相反，这些脚本在客户端本地执行。" -#: source/TortoiseSVN_en.xml:7581(title) -msgid "Avoid Breaking and Stealing Locks" -msgstr "避免破坏和窃取锁定" +#: source/TortoiseSVN_en.xml:10039(para) +msgid "One application for such hooks might be to call a program like SubWCRev.exe to update version numbers after a commit, and perhaps to trigger a rebuild." +msgstr "应用程序，例如钩子，可能调用如SubWCRev.exe这样的程序，来更新提交后的版本号，可能还会出发重新构建。" -#: source/TortoiseSVN_en.xml:7582(para) -msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Subversion doesn't lose data, but you have lost the team-working protection that locking gave you." -msgstr "如果你在破坏或是窃取某人的锁的时候没有告诉他，你可能会丢掉工作。如果你正在写一个不可合并的文件类型，并且你窃取了某人的锁，一旦你释放了锁，他们就可以随意检入他们的修改以覆盖你的。Subversion并不会丢弃数据，但你却失去了锁带来的对团队工作的保护。" +#: source/TortoiseSVN_en.xml:10044(para) +msgid "For various security and implementation reasons, hook scripts are defined locally on a machine, rather than as project properties. You define what happens, no matter what someone else commits to the repository. Of course you can always choose to call a script which is itself under version control." +msgstr "由于各种安全理由和实现问题，钩子脚本在本地机器定义，而不是象工程属性那样。不管是谁提交，都可以定义它做什么事情。当然，你也可以选择调用一个受版本控制的脚本。" -#: source/TortoiseSVN_en.xml:7594(title) -msgid "Making Non-locked Files Read-Only" -msgstr "让非锁定的文件变成只读" +#: source/TortoiseSVN_en.xml:10052(title) +msgid "The Settings Dialog, Configure Hook Scripts" +msgstr "设置对话框，配置钩子脚本页面" -#: source/TortoiseSVN_en.xml:7595(para) -msgid "As mentioned above, the most effective way to use locking is to set the svn:needs-lock property on files. Refer to for instructions on how to set properties. Files with this property set will always be checked out and updated with the read-only flag set unless your working copy holds a lock. As a reminder, TortoiseSVN uses a special overlay to indicate this." -msgstr "正如上面提到的，最有效的使用锁的方式是对一个文件设置svn:needs-lock属性。参考如何设置属性。带有此属性的文件将总被按只读的方式检出和更新(除非你的工作副本拥有锁定)。作为提醒的方式之一，TortoiseSVN使用一个特殊的图标表示。" +#: source/TortoiseSVN_en.xml:10050(para) +msgid " To add a new hook script, simply click Add and fill in the details." +msgstr " 要增加钩子脚本，直接点击 增加 ，然后输入脚本即可。" -#: source/TortoiseSVN_en.xml:7605(para) -msgid "If you operate a policy where every file has to be locked then you may find it easier to use Subversion's auto-props feature to set the property automatically every time you add new files. Read for further information." -msgstr "如果你管理的策略要求每个文件都必须被锁定，那么你会发现使用Subversion的auto-props功能，在你每次加入新文件的时候，自动设置属性是很方便的。请阅读。" +#: source/TortoiseSVN_en.xml:10062(term) source/TortoiseSVN_en.xml:10130(term) +msgid "Start-commit" +msgstr "开始提交" -#: source/TortoiseSVN_en.xml:7613(title) -msgid "The Locking Hook Scripts" -msgstr "锁定钩子脚本" +#: source/TortoiseSVN_en.xml:10064(para) +msgid "Called before the commit dialog is shown. You might want to use this if the hook modifies a versioned file and affects the list of files that need to be committed." +msgstr "在提交对话框之前调用。当钩子修改受版本控制的文件，影响了提交的文件列表的时候适用。" -#: source/TortoiseSVN_en.xml:7614(para) -msgid "When you create a new repository with Subversion 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." -msgstr "当你使用Suversion1.2或更新的版本建立新的版本库的时候，建立了四个钩子模板在版本库中的hooks目录下。这些钩子模板在取得/释放一个锁定之前和之后会被分别调用。" +#: source/TortoiseSVN_en.xml:10072(term) source/TortoiseSVN_en.xml:10138(term) +msgid "Pre-commit" +msgstr "提交之前" -#: source/TortoiseSVN_en.xml:7620(para) -msgid "It is a good idea to install a post-lock and post-unlock hook script on the server which sends out an email indicating the file which has been locked. With such a script in place, all your users can be notified if someone locks/unlocks a file. You can find an example hook script hooks/post-lock.tmpl in your repository folder." -msgstr "安装一个 post-lock和post-unlock钩子，在钩子中为锁定和解锁事件发送邮件，是个好主意 。有了这种脚本，你的所有用户都会在一个文件被锁定/解锁的时候被通知。在你的版本库文件夹下，你可以找到一个示例钩子脚本hooks/post-lock.tmpl。" +#: source/TortoiseSVN_en.xml:10074(para) +msgid "Called after the user clicks OK in the commit dialog, and before the actual commit begins." +msgstr "在提交对话框点击确认之后，实际提交之前调用。" -#: source/TortoiseSVN_en.xml:7628(para) -msgid "You might also use hooks to disallow breaking or stealing of locks, or perhaps limit it to a named administrator. Or maybe you want to email the owner when one of their locks is broken or stolen." -msgstr "你可能也使用hooks来拒绝破坏或是窃取锁定，或是限制只有管理员可以，或是当一个用户破坏或窃取锁定时通知原来的锁定拥有者。" +#: source/TortoiseSVN_en.xml:10081(term) source/TortoiseSVN_en.xml:10147(term) +msgid "Post-commit" +msgstr "提交之后" -#: source/TortoiseSVN_en.xml:7634(para) -msgid "Read to find out more." -msgstr "更多内容请参考 " +#: source/TortoiseSVN_en.xml:10083(para) +msgid "Called after the commit finishes (whether successful or not)." +msgstr "在提交结束后调用(无论成功或失败)" -#: source/TortoiseSVN_en.xml:7640(title) -msgid "Creating and Applying Patches" -msgstr "创建并应用补丁" +#: source/TortoiseSVN_en.xml:10089(term) source/TortoiseSVN_en.xml:10157(term) +msgid "Start-update" +msgstr "开始更新" -#: source/TortoiseSVN_en.xml:7642(primary) -msgid "patch" -msgstr "补丁" +#: source/TortoiseSVN_en.xml:10091(para) +msgid "Called before the update-to-revision dialog is shown." +msgstr "在更新到版本对话框显示之前调用" -#: source/TortoiseSVN_en.xml:7646(para) -msgid "For open source projects (like this one) everyone has read access to the repository, and anyone can make a contribution to the project. So how are those contributions controlled? If just anyone could commit changes, the project would be permanently unstable and probably permanently broken. In this situation the change is managed by submitting a patch file to the development team, who do have write access. They can review the patch first, and then either submit it to the repository or reject it back to the author." -msgstr "对开源工程(比如本工程)来说，每个人对仓库都有读访问权，并且任何人都可以对该工程做出修改。那么如何控制这些修改呢？如果任何人都可以提交自己的修改，那么这个工程可能永远都会处于不稳定状态，而且很有可能永远的瘫痪下去。在这种情况下，修改需要以补丁文件的形式先递交到有写访问权限的开发组。开发组可以先对该补丁文件进行审查，然后决定将其提交到仓库里或者是退还给作者。" +#: source/TortoiseSVN_en.xml:10097(term) source/TortoiseSVN_en.xml:10165(term) +msgid "Pre-update" +msgstr "更新之前" -#: source/TortoiseSVN_en.xml:7657(para) -msgid "Patch files are simply Unified-Diff files showing the differences between your working copy and the base revision." -msgstr "补丁文件只是简单地用统一的差异描述文件显示出你的工作副本和基础版本的不同点。" +#: source/TortoiseSVN_en.xml:10099(para) +msgid "Called before the actual Subversion update begins." +msgstr "在 Subversion 更新实际开始之前调用" -#: source/TortoiseSVN_en.xml:766(title) -msgid "A Typical Client/Server System" -msgstr "一个典型的客户/服务器系统" +#: source/TortoiseSVN_en.xml:10105(term) source/TortoiseSVN_en.xml:10173(term) +msgid "Post-update" +msgstr "更新之后" -#: source/TortoiseSVN_en.xml:7662(title) -msgid "Creating a Patch File" -msgstr "创建一个补丁文件" +#: source/TortoiseSVN_en.xml:10107(para) +msgid "Called after the update finishes (whether successful or not)." +msgstr "在更新之后调用(无论成功或失败)" -#: source/TortoiseSVN_en.xml:7663(para) -msgid "First you need to make and test your changes. Then instead of using TortoiseSVNCommit... on the parent folder, you select TortoiseSVNCreate Patch..." -msgstr "首先你需要做出修改并测试这个修改的内容。然后在父目录上使用TortoiseSVN创建补丁...代替TortoiseSVN提交...。" +#: source/TortoiseSVN_en.xml:10058(para) +msgid "There are currently six types of hook script available " +msgstr "现在有六种钩子脚本类型可用 " -#: source/TortoiseSVN_en.xml:7677(title) -msgid "The Create Patch dialog" -msgstr "创建补丁的对话框" +#: source/TortoiseSVN_en.xml:10114(para) +msgid "A hook is defined for a particular working copy path. You only need to specify the top level path; if you perform an operation in a sub-folder, TortoiseSVN will automatically search upwards for a matching path." +msgstr "为特定工作目录定义的钩子。你只要指定顶级路径；如果在子目录内执行提交，TortoiseSVN 会自动向上搜索匹配路径。" -#: source/TortoiseSVN_en.xml:7680(para) -msgid "you can now select the files you want included in the patch, just as you would with a full commit. This will produce a single file containing a summary of all the changes you have made to the selected files since the last update from the repository." -msgstr "现在你可以选择要包含在补丁中的文件了，就像你要做一个完整的提交一样。这样会产生一个单一的文件，该文件包括一份自从最后一次从仓库更新后你对所选择文件做的全部修改的摘要。" +#: source/TortoiseSVN_en.xml:10119(para) +msgid "Next you must specify the command line to execute, starting with the path to the hook script or executable. This could be a batch file, an executable file or any other file which has a valid windows file association, eg. a perl script." +msgstr "然后你要指定要执行的命令行，以钩子脚本或可执行文件的路径开始。它可以是批处理文件，可执行文件，或者有效的windows关联的其它文件类型，例如perl文件。" -#: source/TortoiseSVN_en.xml:769(para) -msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Subversion repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." -msgstr "所以为什么这很有趣呢？讲了这么多，让人感觉这是一种普通的文件服务器，但实际上，版本库是另一种文件服务器，而不是你常见的那一种。最特别的是 Subversion 会记录每一次的更改，不仅针对文件也包括目录本身，包括增加、删除和重新组织文件和目录。" +#: source/TortoiseSVN_en.xml:10133(literal) +#: source/TortoiseSVN_en.xml:10141(literal) +#: source/TortoiseSVN_en.xml:10160(literal) +#: source/TortoiseSVN_en.xml:10168(literal) +#: source/TortoiseSVN_en.xml:10176(literal) +#: source/TortoiseSVN_en.xml:10188(term) +msgid "%PATHS%" +msgstr "%PATHS%" -#: source/TortoiseSVN_en.xml:7691(para) -msgid "You can produce separate patches containing changes to different sets of files. Of course, if you create a patch file, make some more changes to the same files and then create another patch, the second patch file will include both sets of changes." -msgstr "你可以创建包含对不同文件集合修改的相互独立的补丁。当然如果你创建了一个补丁文件，对于同一份文件的更多修改会创建另外一个补丁文件，第二份补丁文件包含了全部的修改。" +#: source/TortoiseSVN_en.xml:10142(literal) +#: source/TortoiseSVN_en.xml:10150(literal) +#: source/TortoiseSVN_en.xml:10200(term) +msgid "%SELECTEDPATHS%" +msgstr "%SELECTEDPATHS%" -#: source/TortoiseSVN_en.xml:7697(para) -msgid "Just save the file using a filename of your choice. Patch files can have any extension you like, but by convention they should use the .patch or .diff extension. You are now ready to submit your patch file." -msgstr "你可以用一个自己选择的文件名来保存这个补丁文件，补丁文件可以有任意的扩展名，但是按人一般习惯，人们都是用.patch或者.diff作扩展名，你现在已经做好提交你的补丁文件的准备了。" +#: source/TortoiseSVN_en.xml:10151(literal) +#: source/TortoiseSVN_en.xml:10177(literal) +#: source/TortoiseSVN_en.xml:10210(term) +msgid "%REVISION%" +msgstr "%REVISION%" -#: source/TortoiseSVN_en.xml:7704(para) -msgid "You can also save the patch to the clipboard instead of to a file. You might want to do this so that you can paste it into an email for review by others. Or if you have two working copies on one machine and you want to transfer changes from one to the other, a patch on the clipboard is a convenient way of doing this." -msgstr "你也可以将补丁保存到剪贴板，而不是文件。这样你可以粘贴到电子邮件中，让他人审核。或者你在机器上有两个工作副本，想将修改传递到另外的副本。在剪贴板上的补丁就是为这些操作提供便利。" +#: source/TortoiseSVN_en.xml:10152(literal) +#: source/TortoiseSVN_en.xml:10178(literal) +#: source/TortoiseSVN_en.xml:10218(term) +msgid "%ERROR%" +msgstr "%ERROR%" -#: source/TortoiseSVN_en.xml:7713(title) -msgid "Applying a Patch File" -msgstr "应用一个补丁文件" +#: source/TortoiseSVN_en.xml:10125(para) +msgid "The command line can include several parameters which get filled in by TortoiseSVN. The parameters available depend upon which hook is called. " +msgstr "命令行可以包含被TortoiseSVN填写的几个参数。这些参数依赖于调用了什么脚本。" -#: source/TortoiseSVN_en.xml:7714(para) -msgid "Patch files are applied to your working copy. This should be done from the same folder level as was used to create the patch. If you are not sure what this is, just look at the first line of the patch file. For example, if the first file being worked on was doc/source/english/chapter1.xml and the first line in the patchfile is Index: english/chapter1.xml then you need to apply the patch to the english folder. However, provided you are in the correct working copy, if you pick the wrong folder level, TSVN will notice and suggest the correct level." -msgstr "当你对你的工作副本打补丁的时候，你应当在与创建补丁文件时相同的目录层次上。如果你不能确定在那个目录层次上，就看一下补丁文件的第一行。例如，如果补丁第一个要处理的文件是doc/source/english/chapter1.xml 并且补丁文件的第一行是Index: english/chapter1.xml说明你必须要对english目录应用这个补丁文件。尽管如此，倘若你在正确的工作副本上工作，如果你选择了一个错误的目录层次，TSVN会察觉到这个错误，并给出正确的建议。" +#: source/TortoiseSVN_en.xml:10190(para) +msgid "The paths which were selected when the operation was started, eg. the paths selected in Explorer when invoking the Commit dialog. If multiple paths were selected they are separated by a * character." +msgstr "当操作开始时选择的路径。例如当启动提交对话框是在资源管理器中选择的路径。如果选择了多个路径，它们用*自负隔开。" -#: source/TortoiseSVN_en.xml:7728(para) -msgid "In order to apply a patch file to your working copy, you need to have at least read access to the repository. The reason for this is that the merge program must reference the changes back to the revision against which they were made by the remote developer." -msgstr "为了给你的工作副本打补丁，你至少需要对代码库的读权限。因为合并程序必须要参考修订版本中其他开发人员做的修改。" +#: source/TortoiseSVN_en.xml:10202(para) +msgid "The paths which were selected within the Commit dialog. If multiple paths were selected they are separated by a * character." +msgstr "我们在提交对话框内选择的路径。如果选择了多个路径，那么它们用*字符分割。" -#: source/TortoiseSVN_en.xml:7735(para) -msgid "From the context menu for that folder, click on TortoiseSVNApply Patch... This will bring up a file open dialog allowing you to select the patch file to apply. By default only .patch or .diff files are shown, but you can opt for \"All files\". If you previously saved a patch to the clipboard, you can use Open from clipboard... in the file open dialog." -msgstr "从那个目录的上下文菜单，点击TortoiseSVN应用补丁... 系统会弹出一个打开文件的对话框，让你选择要应用的补丁文件。默认情况下只显示.patch或者.diff文件，但是你可以选择\"所有文件\"。如果你以前将补丁保存到了剪贴板，可以使用打开文件对话框的从剪贴板打开... " +#: source/TortoiseSVN_en.xml:10212(para) +msgid "The repository revision after a commit completes." +msgstr "在提交完成后的版本库的版本" -#: source/TortoiseSVN_en.xml:7749(para) -msgid "Alternatively, if the patch file has a .patch or .diff extension, you can right click on it directly and select TortoiseSVNApply Patch.... In this case you will be prompted to enter a working copy location." -msgstr "如果补丁文件以.patch 或者 .diff 为扩展名的话，你可以选择直接右键点击该补丁文件，选择TortoiseSVN应用补丁... 在这种情况下，系统会提示你输入工作副本的位置。" +#: source/TortoiseSVN_en.xml:10220(para) +msgid "Empty if the operation was successful, or the error message if the operation was unsuccessful." +msgstr "如果操作成功，它是空的，否则操作失败时就显示错误信息。" -#: source/TortoiseSVN_en.xml:7759(para) -msgid "These two methods just offer different ways of doing the same thing. With the first method you select the WC and browse to the patch file. With the second you select the patch file and browse to the WC." -msgstr "这两种方法只是提供了做同一件事的不同方式。第一种方法，你先选择工作副本，然后浏览补丁文件。第二种方法，你先选择补丁文件，然后浏览工作副本。" +#: source/TortoiseSVN_en.xml:10184(para) +msgid "The meaning of each of these variables is described here: " +msgstr "每个变量的含义如下: " -#: source/TortoiseSVN_en.xml:7764(para) -msgid "Once you have selected the patch file and working copy location, TortoiseMerge runs to merge the changes from the patch file with your working copy. A small window lists the files which have been changed. Double click on each one in turn, review the changes and save the merged files." -msgstr "一旦你选定了补丁文件和工作副本的位置，TortoiseMerge就会把布丁文件合并到你的工作副本中。系统会弹出一个小窗口列出所有被更改了的文件。依次双击每一个文件，检查所做的改变，然后保存合并后的文件。远程开发者的补丁现在已经应用到了你的工作副本上，你需要提交它以使每一个人都可以从代码库访问到这些修改。" +#: source/TortoiseSVN_en.xml:10228(para) +msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." +msgstr "如果你想Subversion 操作直到钩子完成才结束，就选择等待脚本结束。" -#: source/TortoiseSVN_en.xml:7771(para) -msgid "The remote developer's patch has now been applied to your working copy, so you need to commit to allow everyone else to access the changes from the repository." -msgstr "远程开发者的补丁现在已经应用到了你的工作副本上，你需要提交它以使每一个人都可以从代码库访问到这些修改。" +#: source/TortoiseSVN_en.xml:10232(para) +msgid "Normally you will want to hide ugly DOS boxes when the script runs, so Hide the script while running is checked by default. For debugging, you may want to watch what happens in the DOS window." +msgstr "通常脚本运行时，你会想隐藏丑陋的控制台窗口，所以默认选择运行时隐藏脚本。为了调试，你可能想观察控制台窗口的输出。" -#: source/TortoiseSVN_en.xml:7779(title) -msgid "Who Changed Which Line?" -msgstr "谁修改了哪一行？" +#: source/TortoiseSVN_en.xml:10240(title) +msgid "Final Step" +msgstr "最后步骤" -#: source/TortoiseSVN_en.xml:7781(primary) -msgid "blame" -msgstr "追溯" +#: source/TortoiseSVN_en.xml:10246(title) +msgid "Wishlist" +msgstr "愿望表" -#: source/TortoiseSVN_en.xml:7784(primary) -msgid "annotate" -msgstr "评注" +#: source/TortoiseSVN_en.xml:10247(para) +msgid "Even though TortoiseSVN and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers." +msgstr "尽管TSVN和TortoiseMerge是免费的，你也可以通过提交补丁和在项目开发中扮演一些积极角色，来支持我们的开发人员。你同样也可以给点鼓励，它们会让每天在计算机前没日没夜拼命工作的我们感到非常的振奋。" -#: source/TortoiseSVN_en.xml:7787(primary) -msgid "praise" -msgstr "称赞" +#: source/TortoiseSVN_en.xml:10253(para) +msgid "While working on TortoiseSVN we love to listen to music. And since we spend many hours on the project we need a lot of music. Therefore we have set up some wish-lists with our favourite music CD's and DVD's: http://tortoisesvn.tigris.org/donate.html Please also have a look at the list of people who contributed to the project by sending in patches or translations." +msgstr "我们很爱在做TSVN开发工作时听听音乐。也因为花了不少时候忙这个项目，我们就需要 非常多 的音乐。因此我们写了一些愿望表，把我们喜欢的音乐CD和DVD列在 http://tortoisesvn.tigris.org/donate.html。同时也请关注一下那些为项目提交补丁和翻译的贡献者们的愿望: )" -#: source/TortoiseSVN_en.xml:779(para) -msgid "When a client reads data from the repository, it normally sees only the latest version of the filesystem tree. But the client also has the ability to view previous states of the filesystem. For example, a client can ask historical questions like, \"what did this directory contain last Wednesday?\", or \"who was the last person to change this file, and what changes did they make?\" These are the sorts of questions that are at the heart of any version control system: systems that are designed to record and track changes to data over time." -msgstr "当一个客户端从版本库读取数据时，通常只会看到最新的版本，但是客户端也可以去看以前的任何一个版本。举个例子，一个客户端可以问这样的历史问题，上个星期三的目录是怎样的？，或者是谁最后一个修改了这个文件，改动了什么？，这些是任何版本控制系统的核心问题: 系统是设计用来记录和跟踪每次修改的。" +#: source/TortoiseSVN_en.xml:10267(title) +msgid "The SubWCRev Program" +msgstr "SubWCRev 程序" -#: source/TortoiseSVN_en.xml:7790(para) -msgid "Sometimes you need to know not only what lines have changed, but also who exactly changed specific lines in a file. That's when the TortoiseSVNBlame... command, sometimes also referred to as annotate command comes in handy." -msgstr "有时你不仅要知道哪一行做了修改，还要精确地知道谁修改了一个文件中的哪一行。这就是TortoiseSVN追溯...命令，有时候也叫做 评注 命令派上用场的时候了。" +#: source/TortoiseSVN_en.xml:10269(primary) +msgid "version extraction" +msgstr "版本抽取" -#: source/TortoiseSVN_en.xml:7800(para) -msgid "This command lists, for every line in a file, the author and the revision the line was changed." -msgstr "对一个文件中的每一行，这个命令列出了作者和该行修改时的版本。" +#: source/TortoiseSVN_en.xml:10272(para) +msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." +msgstr "SubWCRev是Windows的命令行工具，可以阅读Subversion工作副本的状态，可以在模版中随意执行关键字替换。这通常是构建过程的一部分，将工作副本信息结合到创建的对象当中。通常情况下，可能是用来将修订版本号存入关于窗口。" -#: source/TortoiseSVN_en.xml:7805(title) -msgid "Blame for Files" -msgstr "追溯文件" +#: source/TortoiseSVN_en.xml:10286(title) +msgid "The SubWCRev Command Line" +msgstr "SubWCRev 命令行" -#: source/TortoiseSVN_en.xml:7806(para) -msgid " If you're not interested in changes from earlier revisions you can set the revision from which the blame should start. Set this to 1, if you want the blame for every revision." -msgstr "如果对早期版本的修改不感兴趣，你可以设置从哪个版本开始追溯。如果你想追溯每一个版本，你可以把那个数值设置为1。" +#: source/TortoiseSVN_en.xml:10287(para) +msgid "SubWCRev reads the Subversion status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." +msgstr "SubWCRev阅读工作副本中所有文件的状态，缺省会忽略外部引用。它记录找到的最高修订版本号，以及那个修订版本的提交时间戳，它也会记录在本地工作副本是否有修改，或混合的修订版本。修订版本号码，更新修订版本范围和修改状态会显示在标准输出。" -#: source/TortoiseSVN_en.xml:7808(title) -msgid "The Annotate / Blame Dialog" -msgstr "评注/追溯对话框" +#: source/TortoiseSVN_en.xml:10295(para) +msgid "" +"SubWCRev.exe is called from the command line or a script, and is controlled using the command line parameters. \n" +"SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n" +"" +msgstr "" +"SubWCRev.exe从命令行或脚本中运行，使用命令行参数控制。\n" +"SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n" +"" -#: source/TortoiseSVN_en.xml:7815(para) -msgid "By default the blame file is viewed using TortoiseBlame, which highlights the different revisions to make it easier to read. If you wish to print or edit the blame file, select Use Text viewer to view blames" -msgstr "默认情况下，追溯文件使用TortoiseBlame,这个工具可以高亮显示不同版本从而使阅读更加容易。如果想打印或者编辑追溯文件，复选使用文字编辑器查看追溯信息。" +#: source/TortoiseSVN_en.xml:10302(para) +msgid "WorkingCopyPath is the path to the working copy being checked. You can only use SubWCRev on working copies, not directly on the repository. The path may be absolute or relative to the current working directory." +msgstr "WorkingCopyPath是要检查的工作副本路径，你可以只对工作副本使用SubWCRev，而不是直接对版本库，这个路径可以是绝对路径，也可以是工作目录的相对路径。" -#: source/TortoiseSVN_en.xml:7821(para) -msgid "Once you press OK TortoiseSVN starts retrieving the data to create the blame file. Please note: This can take several minutes to finish, depending on how much the file has changed and of course your network connection to the repository. Once the blame process has finished the result is written into a temporary file and you can view the results." -msgstr "一旦你按了 OK 按钮，TortoiseSVN就开始从版本库获取数据创建追溯文件。注意: 视修改的文件的多少和你的网络连接情况，可能会花掉几分钟到几十分钟不等。追溯过程完成后，其结果将会写到一个临时文件中，你可以读到这个结果文件。" +#: source/TortoiseSVN_en.xml:10308(para) +msgid "If you want SubWCRev to perform keyword substitution, so that fields like repository revision and URL are saved to a text file, you need to supply a template file SrcVersionFile and an output file DstVersionFile which contains the substituted version of the template." +msgstr "如果你想让SubWCRev执行关键字替换，象版本库版本，地址等字段保存到文本文件，就需要提供一个模版文件SrcVersionFile，输出文件DstVersionFile就是模版替换之后的版本。" -#: source/TortoiseSVN_en.xml:7829(para) -msgid " TortoiseBlame, which is included with TortoiseSVN, makes the blame file easier to read. When you hover the mouse over a line in the blame info column, all lines with the same revision are shown with a darker background. Lines from other revisions which were changed by the same author are shown with a light background. The colouring may not work as clearly if you have your display set to 256 colour mode." -msgstr " TortoiseBlame,包含在TortoiseSVN中,使得追溯文件更加容易阅读。当你的鼠标在追溯信息列的某一行上盘旋时，所有和该列具有相同版本号的行都会用一个比较暗的背景色显示。同一作者修改的其他版本的行会用一个亮一些的背景色显示。如果你的显示设置为256色模式，那么颜色显示的可能不会很清楚。" +#: source/TortoiseSVN_en.xml:10324(title) +#: source/TortoiseSVN_en.xml:10393(title) +msgid "List of available command line switches" +msgstr "列出可用的命令行开关" -#: source/TortoiseSVN_en.xml:7831(title) -msgid "TortoiseBlame" -msgstr "TortoiseBlame" +#: source/TortoiseSVN_en.xml:10330(entry) +#: source/TortoiseSVN_en.xml:12009(title) +#: source/TortoiseSVN_en.xml:12497(glossterm) +msgid "Switch" +msgstr "切换" -#: source/TortoiseSVN_en.xml:7842(para) -msgid "If you left click on a line, all lines with the same revision are highlighted, and lines from other revisions by the same author are highlighted in a lighter colour. This highlighting is sticky, allowing you to move the mouse without losing the highlights. Click on that revision again to turn off highlighting." -msgstr "如果在某一行上左击，具有同一版本号的所有行都会高亮显示，同一作者的其他版本的行会用一个更亮的颜色高亮显示。这个高亮具有粘性，也就是说允许你移动鼠标但原先高亮的地方仍然保持高亮。再次点击该版本将关闭高亮显示。" +#: source/TortoiseSVN_en.xml:10331(entry) +#: source/TortoiseSVN_en.xml:10400(entry) +#: source/TortoiseSVN_en.xml:11331(entry) +msgid "Description" +msgstr "描述" -#: source/TortoiseSVN_en.xml:7849(para) -msgid "The revision comments (log message) are shown in a hint box whenever the mouse hovers over the blame info column. If you want to copy the log message for that revision, use the context menu which appears when you right click on the blame info column." -msgstr "只要鼠标逗留在追溯信息列，版本注释(日志信息)就会作为提示出现。如果你想复制此版本的日志信息，使用在追溯信息列显示的右键菜单。" +#: source/TortoiseSVN_en.xml:10336(entry) +msgid "-n" +msgstr "-n" -#: source/TortoiseSVN_en.xml:7855(para) -msgid "You can search within the Blame report using EditFind.... This allows you to search for revision numbers, authors and the content of the file itself. Log messages are not included in the search - you should use the Log Dialog to search those." -msgstr "你可以在追溯报告里用编辑查找...来搜索想要的内容。它允许你搜索版本号，作者还有文件的内容。这个搜索不包含日志信息－你可以在日志对话框里搜索日志信息。" +#: source/TortoiseSVN_en.xml:10337(entry) +msgid "If this switch is given, SubWCRev will exit with ERRORLEVEL 7 if the working copy contains local modifications. This may be used to prevent building with uncommitted changes present." +msgstr "如果给出这个开关，当工作副本包含本地修改时，SubWCRev 就会以ERRORLEVEL 7退出。它可以用来在有未提交的修改时阻止构建。" -#: source/TortoiseSVN_en.xml:7865(para) -msgid "You can also jump to a specific line number using EditGo To Line...." -msgstr "你也可以使用 编辑转到行 ... 来跳到指定行。" +#: source/TortoiseSVN_en.xml:10345(entry) +msgid "-m" +msgstr "-m" -#: source/TortoiseSVN_en.xml:7872(para) -msgid "When the mouse is over the blame info columns, a context menu is available which helps with comparing revisions and examining history, using the revision number of the line under the mouse as a reference. Context menuBlame previous revision generates a blame report for the same file, but using the previous revision as the upper limit. This gives you the blame report for the state of the file just before the line you are looking at was last changed. Context menuShow changes starts your diff viewer, showing you what changed in the referenced revision. Context menuShow log displays the revision log dialog starting with the referenced revision." -msgstr "" +#: source/TortoiseSVN_en.xml:10346(entry) +msgid "If this switch is given, SubWCRev will exit with ERRORLEVEL 8 if the working copy contains mixed revisions. This may be used to prevent building with a partially updated working copy." +msgstr "如果给出这个开关，当工作副本包含混合版本时，SubWCRev 就会以ERRORLEVEL 8退出。它可以用来在部分更新本地目录时阻止构建。" -#: source/TortoiseSVN_en.xml:7894(para) -msgid "Although TortoiseBlame has no settings dialog of its own, it uses the same font as TortoiseMerge, so if you want to change it, start TortoiseMerge and use the settings dialog there." -msgstr "" +#: source/TortoiseSVN_en.xml:10354(entry) +msgid "-d" +msgstr "-d" -#: source/TortoiseSVN_en.xml:7901(title) source/TortoiseSVN_en.xml:7926(term) -msgid "Blame Differences" -msgstr "追溯不同点" +#: source/TortoiseSVN_en.xml:10355(entry) +msgid "If this switch is given, SubWCRev will exit with ERRORLEVEL 9 if the destination file already exists." +msgstr "如果给出这个开关，当目的文件存在时时，SubWCRev 就会以ERRORLEVEL 9退出。" -#: source/TortoiseSVN_en.xml:7902(para) -msgid "One of the limitations of the Blame report is that it only shows the file as it was in a particular revision, and shows the last person to change each line. Sometimes you want to know what change was made, as well as who made it. What you need here is a combination of the diff and blame reports." -msgstr "追溯报告的一个局限性就是它仅仅象显示一个特殊版本一样显示文件，并显示出修改每一行的最后一个人。有时候你想知道谁做了什么修改。你所需要的就是把差异和追溯报告结合起来。" +#: source/TortoiseSVN_en.xml:10362(entry) +msgid "-f" +msgstr "-f" -#: source/TortoiseSVN_en.xml:7908(para) -msgid "The revision log dialog includes several options which allow you to do this. " -msgstr "在版本日志对话框里包含了以下几个选项支持你做这样的操作。" +#: source/TortoiseSVN_en.xml:10363(entry) +msgid "If this switch is given, SubWCRev will include the last-changed revision of folders. The default behaviour is to use only files when getting the revision numbers." +msgstr "如果给出这个开关，SubWCRev 就会包含文件夹的最后修改版本。默认行为是取得版本号时只考虑文件。" -#: source/TortoiseSVN_en.xml:7912(term) -msgid "Blame Revisions" -msgstr "追溯版本" +#: source/TortoiseSVN_en.xml:10371(entry) +msgid "-e" +msgstr "-e" -#: source/TortoiseSVN_en.xml:7914(para) -msgid "In the top pane, select 2 revisions, then select Context menuBlame revisions. This will fetch the blame data for the 2 revisions, then use the diff viewer to compare the two blame files." -msgstr "在顶部窗口，选择两个版本，然后选择上下文菜单追溯版本。它将取出两个版本的追溯数据，然后使用差异察看器比较这两个追溯文件。" +#: source/TortoiseSVN_en.xml:10372(entry) +msgid "If this switch is given, SubWCRev will examine directories which are included with svn:externals, but only if they are from the same repository. The default behaviour is to ignore externals." +msgstr "如果给出这个开关，SubWCRev 就会检查包含svn:externals的目录，但是只限于在同一版本库。默认行为是忽略外部引用。" -#: source/TortoiseSVN_en.xml:7928(para) -msgid "Select one revision in the top pane, then pick one file in the bottom pane and select Context menuBlame differences. This will fetch the blame data for the selected revision and the previous revision, then use the diff viewer to compare the two blame files." -msgstr "在上面的面板里选择一个版本，然后在下面的面板选择一个文件然后选择上下文菜单追溯差异。这会为选定版本及其上一个版本获取追溯数据，然后用差异阅读器比较两份追溯文件。" +#: source/TortoiseSVN_en.xml:10317(para) +msgid "There are a number of optional switches which affect the way SubWCRev works. If you use more than one, they must be specified as a single group, eg. -nm, not -n -m. " +msgstr "有几个开关影响 SubWCRev工作。如果使用多个，必须用单个组指定，例如要用-nm，不能用-n -m。" -#: source/TortoiseSVN_en.xml:794(title) -msgid "Versioning Models" -msgstr "版本模型" +#: source/TortoiseSVN_en.xml:10388(title) +msgid "Keyword Substitution" +msgstr "关键字替换" -#: source/TortoiseSVN_en.xml:7942(term) -msgid "Compare and Blame with Working BASE" -msgstr "与工作副本比较并追溯" +#: source/TortoiseSVN_en.xml:10399(entry) +msgid "Keyword" +msgstr "关键字" -#: source/TortoiseSVN_en.xml:7944(para) -msgid "Show the log for a single file, and in the top pane, select a single revision, then select Context menuCompare and Blame with Working BASE. This will fetch the blame data for the selected revision, and for the file in the working BASE, then use the diff viewer to compare the two blame files." -msgstr "为一个单一文件显示日志，在上面的面板选择一个版本，然后选择上下文菜单与工作副本比较并追溯。这会为文件的选择版本和工作副本获取追溯数据，然后使用差异阅读器比较两份追溯文件。" +#: source/TortoiseSVN_en.xml:10405(entry) +msgid "$WCREV$" +msgstr "$WCREV$" -#: source/TortoiseSVN_en.xml:795(para) -msgid "All version control systems have to solve the same fundamental problem: how will the system allow users to share information, but prevent them from accidentally stepping on each other's feet? It's all too easy for users to accidentally overwrite each other's changes in the repository." -msgstr "所有的版本控制系统都需要解决这样一个基础问题: 怎样让系统允许用户共享信息，而不会让他们因意外而互相干扰？版本库里意外覆盖别人的更改非常的容易。" +#: source/TortoiseSVN_en.xml:10406(entry) +msgid "Replaced with the highest commit revision in the working copy." +msgstr "用工作副本中最高的提交版本来替换" -#: source/TortoiseSVN_en.xml:7962(title) source/TortoiseSVN_en.xml:7980(title) -msgid "The Repository Browser" -msgstr "版本库浏览器" +#: source/TortoiseSVN_en.xml:10412(entry) +msgid "$WCDATE$" +msgstr "$WCDATE$" -#: source/TortoiseSVN_en.xml:7964(primary) -msgid "repobrowser" -msgstr "版本库浏览器" +#: source/TortoiseSVN_en.xml:10417(literal) +msgid "yyyy-mm-dd hh:mm:ss" +msgstr "yyyy-mm-dd hh:mm:ss" -#: source/TortoiseSVN_en.xml:7967(primary) -msgid "server-side actions" -msgstr "服务器端动作" +#: source/TortoiseSVN_en.xml:10413(entry) +msgid "Replaced with the commit date/time of the highest commit revision. To avoid confusion, international format is used, ie. " +msgstr "用最高提交的版本的日期/时间替换。为了避免混淆，使用国际化格式，例如 " -#: source/TortoiseSVN_en.xml:7973(para) -msgid "Sometimes you need to work directly on the repository, without having a working copy. That's what the Repository Browser is for. Just as the explorer and the icon overlays allow you to view your working copy, so the Repository Browser allows you to view the structure and status of the repository. With the Repository Browser you can execute commands like copy, move, rename, ... directly on the repository." -msgstr "有时候我们需要在版本库中直接进行操作，而不是在工作副本中。这就是我们的版本库浏览器可以做到的。正如资源管理器和能浏览你的工作副本一样，版本库浏览器允许你浏览版本库的结构和状态。 在版本库浏览器中你可以执行比如复制，转移，重命名、、、直接操作在版本库上。" +#: source/TortoiseSVN_en.xml:10421(entry) +msgid "$WCNOW$" +msgstr "$WCNOW$" -#: source/TortoiseSVN_en.xml:7986(para) -msgid "The repository browser looks very similar to the Windows explorer, except that it is showing the content of the repository at a particular revision rather than files on your computer. In the left pane you can see a directory tree, and in the right pane are the contents of the selected directory. At the top of the Repository Browser Window you can enter the URL of the repository and the revision you want to browse." -msgstr "" +#: source/TortoiseSVN_en.xml:10422(entry) +msgid "Replaced with the current system date/time. This can be used to indicate the build time. International format is used as described above." +msgstr "用当前的系统日期/时间替换。它用来指出构建时间。同样为了避免混淆，使用国际化格式。" -#: source/TortoiseSVN_en.xml:7995(para) -msgid "Just like Windows explorer, you can click on the column headings in the right pane if you want to set the sort order. And as in explorer there are context menus available in both panes." -msgstr "" +#: source/TortoiseSVN_en.xml:10429(entry) +msgid "$WCRANGE$" +msgstr "$WCRANGE$" -#: source/TortoiseSVN_en.xml:8(edition) -msgid "First" -msgstr "首先" +#: source/TortoiseSVN_en.xml:10430(entry) +msgid "Replaced with the update revision range in the working copy. If the working copy is in a consistent state, this will be a single revision. If the working copy contains mixed revisions, either due to being out of date, or due to a deliberate update-to-revision, then the range will be shown in the form 100:200" +msgstr "在工作目录用更新版本范围替换。如果工作目录处于一致的状态，它是一个单一版本。如果工作目录包含混合版本，或者是过时，或者是故意更新到版本，那么这个范围会用象100:200这样的格式来显示。" -#: source/TortoiseSVN_en.xml:8000(para) -msgid "The context menu for a file allows you to: " -msgstr "" +#: source/TortoiseSVN_en.xml:10441(entry) +msgid "$WCMIXED?TText:FText$" +msgstr "$WCMIXED?TText:FText$" -#: source/TortoiseSVN_en.xml:8010(para) -msgid "Save an unversioned copy of the file to your hard drive." -msgstr "在你的硬盘上保存此文件的一个未版本控制的副本。" +#: source/TortoiseSVN_en.xml:10442(entry) +msgid "Replaced with TText if there are mixed update revisions, or FText if not." +msgstr "当有混合版本时用TText 替换，否则用FText替换。" -#: source/TortoiseSVN_en.xml:8015(para) -msgid "Show the revision log for that file, or show a graph of all revisions so you can see where the file came from." -msgstr "" +#: source/TortoiseSVN_en.xml:10448(entry) +msgid "$WCMODS?TText:FText$" +msgstr "$WCMODS?TText:FText$" -#: source/TortoiseSVN_en.xml:8021(para) -msgid "Blame the file, to see who changed which line and when." -msgstr "追溯这个文件，查看是谁在何时修改哪些行。" +#: source/TortoiseSVN_en.xml:10449(entry) +msgid "Replaced with TText if there are local modifications, or FText if not." +msgstr "若本地存在修改，就用正确提示文本 TText 替换，否则用失败提示文本 FText 替换。" -#: source/TortoiseSVN_en.xml:8026(para) -msgid "Delete or rename the file." -msgstr "删除或改名文件。" +#: source/TortoiseSVN_en.xml:10455(entry) +msgid "$WCURL$" +msgstr "$WCURL$" -#: source/TortoiseSVN_en.xml:8031(para) -msgid "Make a copy of the file, either to a different part of the repository, or to a working copy rooted in the same repository." -msgstr "" +#: source/TortoiseSVN_en.xml:10456(entry) +msgid "Replaced with the repository URL of the working copy path passed to SubWCRev." +msgstr "用传递给SubWCRev的工作目录的版本库地址替换。" -#: source/TortoiseSVN_en.xml:8037(para) -msgid "View the file's properties (you cannot edit properties directly in the repository)." -msgstr "查看文件的属性(你不能直接在版本库编辑属性)。" +#: source/TortoiseSVN_en.xml:10389(para) +msgid "If a source and destination files are supplied, SubWCRev copies source to destination, performing keyword substitution as follows: " +msgstr "如果提供了源文件和目的文件，SubWCRev 会复制源文件到目标文件，执行如下所属的关键字替换: " -#: source/TortoiseSVN_en.xml:804(title) -msgid "The Problem of File-Sharing" -msgstr "文件共享的问题" +#: source/TortoiseSVN_en.xml:10470(title) +msgid "Keyword Example" +msgstr "关键字例子" -#: source/TortoiseSVN_en.xml:8044(para) -msgid "The context menu for a folder allows you to: " -msgstr "" +#: source/TortoiseSVN_en.xml:10471(para) +msgid "The example below shows how keywords in a template file are substituted in the output file." +msgstr "下面的例子显示了模版文件中的关键字是如何在输出文件中被替换的。" -#: source/TortoiseSVN_en.xml:8048(para) -msgid "Show the revision log for that folder, or show a graph of all revisions so you can see where the folder came from." +#: source/TortoiseSVN_en.xml:10475(screen) +#, no-wrap +msgid "" +"\n" +"// Test file for SubWCRev\n" +"\n" +"char *Revision = \"$WCREV$\";\n" +"char *Modified = \"$WCMODS?Modified:Not modified$\";\n" +"char *Date = \"$WCDATE$\";\n" +"char *RevRange = \"$WCRANGE$\";\n" +"char *Mixed = \"$WCMIXED?Mixed revision WC:Not mixed$\";\n" +"char *URL = \"$WCURL$\";\n" +"\n" +"#if $WCMODS?1:0$\n" +"#error Source is modified\n" +"#endif\n" +"\n" +"// EndOfFile\n" msgstr "" +"\n" +"// Test file for SubWCRev\n" +"\n" +"char *Revision = \"$WCREV$\";\n" +"char *Modified = \"$WCMODS?Modified:Not modified$\";\n" +"char *Date = \"$WCDATE$\";\n" +"char *RevRange = \"$WCRANGE$\";\n" +"char *Mixed = \"$WCMIXED?Mixed revision WC:Not mixed$\";\n" +"char *URL = \"$WCURL$\";\n" +"\n" +"#if $WCMODS?1:0$\n" +"#error Source is modified\n" +"#endif\n" +"\n" +"// EndOfFile\n" -#: source/TortoiseSVN_en.xml:805(para) -msgid "Consider this scenario: suppose we have two co-workers, Harry and Sally. They each decide to edit the same repository file at the same time. If Harry saves his changes to the repository first, then it's possible that (a few moments later) Sally could accidentally overwrite them with her own new version of the file. While Harry's version of the file won't be lost forever (because the system remembers every change), any changes Harry made won't be present in Sally's newer version of the file, because she never saw Harry's changes to begin with. Harry's work is still effectively lost - or at least missing from the latest version of the file - and probably by accident. This is definitely a situation we want to avoid!" -msgstr "考虑这个情景，我们有两个共同工作者，Harry 和 Sally，他们想同时编辑版本库里的同一个文件，如果首先 Harry 保存它的修改，过了一会，Sally 可能凑巧用自己的版本覆盖了这些文件，Harry 的更改不会永远消失(因为系统记录了每次修改)，Harry 所有的修改不会出现在 Sally 的文件中，所以 Harry 的工作还是丢失了—至少是从最新的版本中丢失了—而且是意外的，这就是我们要明确避免的情况！" +#: source/TortoiseSVN_en.xml:10491(para) +msgid "After running SubWCRev.exe, the output file looks like this:" +msgstr "SubWCRev.exe运行完之后，输出文件类似: " -#: source/TortoiseSVN_en.xml:8054(para) -msgid "Export the folder to a local unversioned copy on your hard drive." +#: source/TortoiseSVN_en.xml:10494(screen) +#, no-wrap +msgid "" +"\n" +"// Test file for SubWCRev\n" +"\n" +"char *Revision = \"3701\";\n" +"char *Modified = \"Modified\";\n" +"char *Date = \"2005/06/15 11:15:12\";\n" +"char *RevRange = \"3699:3701\";\n" +"char *Mixed = \"Mixed revision WC\";\n" +"char *URL = \"http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/src/SubWCRev\";\n" +"\n" +"#if 1\n" +"#error Source is modified\n" +"#endif\n" +"\n" +"// EndOfFile\n" msgstr "" +"\n" +"// Test file for SubWCRev\n" +"\n" +"char *Revision = \"3701\";\n" +"char *Modified = \"Modified\";\n" +"char *Date = \"2005/06/15 11:15:12\";\n" +"char *RevRange = \"3699:3701\";\n" +"char *Mixed = \"Mixed revision WC\";\n" +"char *URL = \"http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/src/SubWCRev\";\n" +"\n" +"#if 1\n" +"#error Source is modified\n" +"#endif\n" +"\n" +"// EndOfFile\n" -#: source/TortoiseSVN_en.xml:8059(para) -msgid "Checkout the folder to produce a local working copy on your hard drive." -msgstr "" +#: source/TortoiseSVN_en.xml:10517(title) +msgid "Frequently Asked Questions (FAQ)" +msgstr "常见问题(FAQ)" -#: source/TortoiseSVN_en.xml:8064(para) -msgid "Create a new folder in the repository." -msgstr "在版本库创建新目录。" +#: source/TortoiseSVN_en.xml:10519(para) +msgid "Because TortoiseSVN is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an interactive online FAQ which contains a selection of the questions we are asked the most on the TortoiseSVN mailing lists dev@tortoisesvn.tigris.org and users@tortoisesvn.tigris.org." +msgstr "因为TortoiseSVN一直处于开发状态，所以有时很难保持文档完全是最新的。我们在维护了一份交互式的在线FAQ。那里面包括了TortoiseSVN邮件列表dev@tortoisesvn.tigris.org里最常被问到的问题。" -#: source/TortoiseSVN_en.xml:8069(para) -msgid "Add files or folders directly to the repository." -msgstr "直接向版本库增加文件或目录。" +#: source/TortoiseSVN_en.xml:10531(para) +msgid "We also maintain a project Issue Tracker which tells you about some of the things we have on our To-Do list, and bugs which have already been fixed. If you think you have found a bug, or want to request a new feature, check here first to see if someone else got there before you." +msgstr "我们还在维护了一个项目问题跟踪系统。在那里面可以查到哪些功能已经被加到了我们的To Do列表里，哪些错误已经被修正了。如果你认为发现了一个错误，或者需要一个新功能，请先到那里看看是否其他人已经在你之前提出过相同的内容了。" -#: source/TortoiseSVN_en.xml:8074(para) -msgid "Delete or rename the folder." -msgstr "删除或改名文件夹。" +#: source/TortoiseSVN_en.xml:10541(para) +msgid "If you have a question which is not answered anywhere else, the best place to ask it is on the mailing list." +msgstr "如果有一个问题在其他任何地方都找不到答案，提出这个问题的最好方式是通过邮件列表。" -#: source/TortoiseSVN_en.xml:8079(para) -msgid "Make a copy of the folder, either to a different part of the repository, or to a working copy rooted in the same repository." -msgstr "" +#: source/TortoiseSVN_en.xml:10552(title) +msgid "How Do I..." +msgstr "如何实现 …" -#: source/TortoiseSVN_en.xml:8085(para) -msgid "View the folder's properties (you cannot edit properties directly in the repository)." -msgstr "查看文件夹的属性(你不能直接在版本库编辑属性)。" +#: source/TortoiseSVN_en.xml:10554(para) +msgid "This appendix contains solutions to problems/questions you might have when using TortoiseSVN." +msgstr "这个附录包括了 TortoiseSVN 使用中可能碰到的一些困难或疑问的解决方法。" + +#: source/TortoiseSVN_en.xml:10560(title) +msgid "Move/copy a lot of files at once" +msgstr "一次移动或复制多个文件" -#: source/TortoiseSVN_en.xml:8091(para) -msgid "Mark the folder for comparison. A marked folder is shown in bold." -msgstr "" +#: source/TortoiseSVN_en.xml:10562(primary) +msgid "moving" +msgstr "移动" -#: source/TortoiseSVN_en.xml:8096(para) -#, fuzzy -msgid "Compare the folder with a previously marked folder, either as a unified diff, or as a list of changed files which can then be visually diffed using the default diff tool. This can be particularly useful for comparing two tags, or trunk and branch to see what changed." -msgstr "如果你选择两个版本，你可以以单一差异文件显示修改，或者可以使用自带的比较工具清晰地显示整个列表的差异。这个对比较两个日志信息的修改很适用。" +#: source/TortoiseSVN_en.xml:10564(para) +msgid "Moving/Copying single files can be done by using TortoiseSVNRename.... But if you want to move/copy a lot of files, this way is just too slow and too much work." +msgstr "移动或复制单个文件可以通过 TortoiseSVN 重命名…实现。但是如果想移动或复制很多文件，这种方法就显得太慢而且工作量太大了。" -#: source/TortoiseSVN_en.xml:8105(para) -#, fuzzy -msgid "If you select two folders in the right pane, you can view the differences either as a unified-diff, or as a list of files which can be visually diffed using the default diff tool." -msgstr "如果你选择两个版本，你可以以单一差异文件显示修改，或者可以使用自带的比较工具清晰地显示整个列表的差异。这个对比较两个日志信息的修改很适用。" +#: source/TortoiseSVN_en.xml:10573(para) +msgid "The recommended way is by right-dragging the files to the new location. Simply right-click on the files you want to move/copy without releasing the mouse button. Then drag the files to the new location and release the mouse button. A context menu will appear where you can either choose Context MenuCopy in Subversion to here. or Context MenuMove in Subversion to here." +msgstr "推荐的方法是: 用鼠标右键拖拽这些文件到新的位置。就是用鼠标右键选中想要移动或复制的文件，不要释放鼠标右键。把选中的文件拖拽到新的位置后释放鼠标右键。在出现的右键菜单里可以选择右键菜单SVN 复制版本控制文件到当前位置或右键菜单SVN 移动版本控制文件到当前位置。" -#: source/TortoiseSVN_en.xml:8110(para) -msgid "If you select multiple folders in the right pane, you can checkout all of them at once into a common parent folder." -msgstr "" +#: source/TortoiseSVN_en.xml:10596(title) +msgid "Force users to enter a log message" +msgstr "强制用户写日志" -#: source/TortoiseSVN_en.xml:8114(para) -msgid "If you select 2 tags which are copied from the same root (typically /trunk/), you can use Context MenuShow Log... to view the list of revisions between the two tag points." -msgstr "如果你选择两个拥有相同历史的标签(特别是/主干/)，你可以使用右键菜单显示日志...来查看" +#: source/TortoiseSVN_en.xml:10598(primary) +msgid "log message" +msgstr "日志信息" -#: source/TortoiseSVN_en.xml:8123(para) -msgid "You can use F5 to refresh the view as usual. This will refresh everything which is currently displayed. If you want to pre-fetch or refresh the information for nodes which have not been opened yet, use CTRL-F5. After that, expanding any node will happen instantly without a network delay while the information is fetched." -msgstr "" +#: source/TortoiseSVN_en.xml:10600(para) +msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseSVN, the other works for all Subversion clients, but requires access to the server directly." +msgstr "有两种方法可以防止用户在不写日志的情况下进行提交操作。一种方式只对TortoiseSVN有效，另外一种方法对任何Subversion的客户端都有效，但是需要直接访问服务器。" -#: source/TortoiseSVN_en.xml:8130(para) -msgid "You can also use the repository browser for drag-and-drop operations. If you drag a folder from explorer into the repo browser, it will be imported into the repository. Note that if you drag multiple items, they will be imported in separate commits." -msgstr "你也可以在版本库浏览器中使用拖拽的操作。如果你把一个文件夹从资源管理器中拖拽到版本库浏览器中，那就实现该文件夹的导入功能。有一点要注意，在导入多个文件时，必须分开一个一个地拖进去。" +#: source/TortoiseSVN_en.xml:10606(title) +msgid "Hook-script on the server" +msgstr "服务器端的钩子脚本(Hook-script)" -#: source/TortoiseSVN_en.xml:8136(para) -msgid "If you want to move an item within the repository, just left drag it to the new location. If you want to create a copy rather than moving the item, Ctrl left drag instead. When copying, the cursor has a plus symbol on it, just as it does in Explorer." -msgstr "如果要在版本库浏览器中移动一个文件，只用左键拖到它要去的位置。如果你更愿意去复制该文件的话，使用这个按住左键拖 。操作就像在资源管理器中一样，复制时指针加 来标记。" +#: source/TortoiseSVN_en.xml:10607(para) +msgid "If you have direct access to the repository server, you can install a pre-commit hook script which rejects all commits with an empty or too short log message." +msgstr "如果能够直接访问服务器，可以安装一个pre-commit钩子脚本，通过这个脚本可以阻止所有空白日志或者日志太简短的提交操作。" -#: source/TortoiseSVN_en.xml:8142(para) -msgid "If you want to copy/move a file or folder to another location and also give it a new name at the same time, you can right drag or ctrl right drag the item instead of using left drag. In that case, a rename dialog is shown where you can enter a new name for the file or folder." -msgstr "如果你要复制/移动一个文件或文件夹到一个新的位置并重命名，你可以右键拖 或者 按住右键拖这个文件，而不用左键拖。这样，就会显示对话框来为该文件或文件夹重命名。" +#: source/TortoiseSVN_en.xml:10612(para) +msgid "In the repository folder on the server, there's a subfolder hooks which contains some example hook scripts you can use. The file pre-commit.tmpl contains a sample script which will reject commits if no log message is supplied, or the message is too short. The file also contains comments on how to install/use this script. Just follow the instructions in that file." +msgstr "在服务器端的版本库目录下有一个hooks子目录，这个子目录下有一些钩子脚本的例子。在 pre-commit.tmpl 这个例子里，示范了当日志是空白或者过于简短的时候如何拒绝提交。这个例子的注释里包括了安装和使用这个脚本的说明，按照那里面的指示做就能够使用了。" -#: source/TortoiseSVN_en.xml:8149(para) -msgid "Whenever you make changes in the repository using one of these methods, you will be presented with a log message entry dialog. If you dragged something by mistake, this is also your chance to cancel the action." -msgstr "无论什么时候对版本库的任意操作，都要求加入它的操作日志。这为你操作失误提供了返回的机会。" +#: source/TortoiseSVN_en.xml:10622(para) +msgid "This method is the recommended way if your users also use other Subversion clients than TortoiseSVN. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseSVN have the OK button disabled until the log message is long enough then please use the method described below." +msgstr "除了TortoiseSVN，如果还要同时使用其他的Subversion客户端，推荐使用这种方法。缺点是提交是被服务器端拒绝的，因此用户会看到一个错误消息。客户端无法在提交之前就知道会被拒绝。如果希望在日志的内容达到足够长之前，TortoiseSVN 的 OK 按钮处于无效的状态，请使用下面的方法。" -#: source/TortoiseSVN_en.xml:8154(para) -msgid "Sometimes when you try to open a path you will get an error message in place of the item details. This might happen if you specified an invalid URL, or if you don't have access permission, or if there is some other server problem. If you need to copy this message to include it in an email, just right click on it and use Context MenuCopy error message to clipboard, or simply use CTRL+C." -msgstr "有时候当你访问一个路径时，会跳出一个错误信息。也许是不可用的URL，也许是你没有访问权限，或者其他的一些原因，如果你要把这些信息发送出去，只用点击它然后右键复制错误信息到剪贴板，或者简单地用CTRL+C。" +#: source/TortoiseSVN_en.xml:10633(title) +msgid "Project properties" +msgstr "工程(Project)属性" -#: source/TortoiseSVN_en.xml:8169(title) -msgid "Revision Graphs" -msgstr "版本分支图" +#: source/TortoiseSVN_en.xml:10634(para) +msgid "TortoiseSVN uses properties to control some of its features. One of those properties is the tsvn:logminsize property." +msgstr "TortoiseSVN 使用属性来控制它的一些特性。这其中有一个 tsvn:logminsize 属性。" -#: source/TortoiseSVN_en.xml:8174(primary) -msgid "graph" -msgstr "分支" +#: source/TortoiseSVN_en.xml:10638(para) +msgid "If you set that property on a folder, then TortoiseSVN will disable the OK button in all commit dialogs until the user has entered a log message with at least the length specified in the property." +msgstr "如果给一个文件夹设置了这个属性，在提交对话框里的日志信息达到属性里定义的长度之前，提交对话框的 OK 按钮会处于无效状态。" -#: source/TortoiseSVN_en.xml:8176(para) -msgid " Sometimes you need to know where branches and tags were taken from the trunk, and the ideal way to view this sort of information is as a graph or tree structure. That's when you need to use TortoiseSVNRevision Graph..." -msgstr "有时候，我们需要知道从哪开始有了分支和标签，同时想知道这条支路是单独的分支还是树型结构。如果需要你可以使用TortoiseSVN版本分支图...。" +#: source/TortoiseSVN_en.xml:10643(para) +msgid "For detailed information on those project properties, please refer to " +msgstr "关于工程属性的具体信息，请参照 " -#: source/TortoiseSVN_en.xml:8178(title) -msgid "A Revision Graph" -msgstr "一个版本分支" +#: source/TortoiseSVN_en.xml:10650(title) +msgid "Update selected files from the repository" +msgstr "从版本库里更新选定的文件到本地" -#: source/TortoiseSVN_en.xml:8189(para) -msgid "This command analyses the revision history and attempts to create a tree showing the points at which copies were taken, and when branches/tags were deleted." -msgstr "这个版本历史分析图能够显示分支/标签从什么地方开始创建，以及什么时候删除。" +#: source/TortoiseSVN_en.xml:10654(para) +msgid "Normally you update your working copy using TortoiseSVNUpdate. But if you only want to pick up some new files that a colleague has added without merging in any changes to other files at the same time, you need a different approach." +msgstr "通常，我们可以使用TortoiseSVN更新把工作副本更新到最新版。但是，如果只想更新某位同事添加的文件，而保留工作副本里其他文件的状态，就必须使用其它的方法。" -#: source/TortoiseSVN_en.xml:8195(para) -msgid "In order to generate the graph, TortoiseSVN must fetch all log messages from the repository root. Needless to say this can take several minutes even with a repository of a few thousand revisions, depending on server speed, network bandwidth, etc. If you try this with something like the Apache project which currently has over 300,000 revisions you could be waiting for some time." -msgstr "要实现版本分支图，TortoiseSVN必须从版本库中获取所有的日志信息。一个有上千版本号的版本库会需要几分钟的时间，这个主要有服务器速度，网络带宽等因素决定。如果你使用的是Apache的方式而且版本号超过300，000的话估计要等上比较长的时间了。" +#: source/TortoiseSVN_en.xml:10664(para) +msgid "Use TortoiseSVNCheck for Modifications. and click on Check repository to see what has changed in the repository. Select the files you want to update locally, then use the context menu to update just those files." +msgstr "选择TortoiseSVN查看更新，然后点击查看版本库按钮，就能够看到上次更新以后版本库里发生了哪些变化。选中想更新到本地的文件，然后用右键菜单更新这些文件。" -#: source/TortoiseSVN_en.xml:8204(para) -msgid "The revision graph shows several types of node: Note that by default the graph only shows the points at which items were added or deleted. Showing every revision of a project will generate a very large graph for non-trivial cases. If you really want to see all revisions where changes were made, there is an option to do this in the View menu and on the toolbar." -msgstr "版本分支图将显示以下内容: 默认的分支信息只会显示那些有增加或删除文件的节点。要显示一个项目的所有版本将会产生一个庞大的毫无价值的版本图。如果你呀看到所有的版本，在视图工具栏里可以找到实现该功能的选项。" +#: source/TortoiseSVN_en.xml:10676(title) +msgid "Roll back revisions in the repository" +msgstr "回滚版本库里的版本" -#: source/TortoiseSVN_en.xml:8208(term) -msgid "Added file/folder" -msgstr "增加文件/文件夹" +#: source/TortoiseSVN_en.xml:10678(primary) +msgid "rollback" +msgstr "回滚" -#: source/TortoiseSVN_en.xml:821(title) -msgid "The Problem to Avoid" -msgstr "需要避免的问题" +#: source/TortoiseSVN_en.xml:10681(title) +msgid "Use the revision log dialog" +msgstr "使用版本日志对话框" -#: source/TortoiseSVN_en.xml:8210(para) -msgid "Items which have been added, or created by copying another file/folder are shown using a rounded rectangle." -msgstr "已增加或通过复制生成的文件/文件夹以圆圈的方式标记。" +#: source/TortoiseSVN_en.xml:10682(para) +msgid "The easiest way to revert the changes from a single revision, or from a range of revisions, is to use the revision log dialog. This is also the method to use of you want to discard recent changes and make an earlier revision the new HEAD." +msgstr "如果想恢复某个版本或者版本范围的变更，最简单的方法是使用版本日志对话框。这种方法也可以用来撤销最近的若干次变更，把以前的某个版本变成最新版。" -#: source/TortoiseSVN_en.xml:8217(term) -msgid "Deleted file/folder" -msgstr "已删除文件/文件夹" +#: source/TortoiseSVN_en.xml:10691(para) +msgid "Select the file or folder in which you need to revert the changes. If you want to revert all changes, this should be the top level folder." +msgstr "选中想要恢复变更的文件或者文件夹。如果想要恢复所有的变更，需要选中最顶层的文件夹。" -#: source/TortoiseSVN_en.xml:8219(para) -msgid "Deleted items eg. a branch which is no longer required, are shown using an octagon (rectangle with corners cut off)." -msgstr "已删除文件，比如说一个不在需要的分支，将显示octagon(rectangle with corners cut off)。" +#: source/TortoiseSVN_en.xml:10698(para) +msgid "Select TortoiseSVNShow Log to display a list of revisions. You may need to use Get All or Next 100 to show the revision(s) you are interested in." +msgstr "选择TortoiseSVN显示日志，显示出版本列表。有可能需要使用全部显示或者下100 按钮，把想要恢复的版本显示出来。" -#: source/TortoiseSVN_en.xml:8226(term) -msgid "Branch tip revision" -msgstr "分支最新版本" +#: source/TortoiseSVN_en.xml:10711(para) +msgid "Select the revision you wish to revert. If you want to undo a range of revisions, select the first one and hold the shift key while selecting the last one. Note that for multiple revisions, the range must be unbroken with no gaps. Right click on the selected revision(s), then select Context MenuRevert changes from this revision." +msgstr "选中想要恢复的版本。如果想要恢复一个版本范围，选中想要恢复的第一个版本，按住shift键，然后选中想要恢复的最后一个版本。注意，当恢复多个版本的时候，这些版本必须在列表中是连续的。用鼠标右键点击选中的版本(段)，然后选择右键菜单恢复这些版本的变更。" -#: source/TortoiseSVN_en.xml:8228(para) -msgid "Where a branch (or trunk or tag) has been modified since the last branch node, this is shown using an ellipse. This means that the latest revision on every branch is always shown on the graph." -msgstr "当一个分支(或者主干或者标签)从最新的节点开始以来有了新的更改，将有一个插件显示出来。也就是说，任意分支的最新版本都会显示在分支图上。" +#: source/TortoiseSVN_en.xml:10726(para) +msgid "Or if you want to make an earlier revision the new HEAD revision, right click on the selected revision(s), then select Context MenuRevert to this revision. This will discard all changes after the selected revision." +msgstr "如果想要把以前的某个版本变成最新版本，右键点击选中的版本(范围)，然后选择右键菜单恢复到此版本。就能够撤销被选中版本后面所有的变更。" -#: source/TortoiseSVN_en.xml:8237(term) -msgid "Normal file/folder" -msgstr "一般的文件/文件夹" +#: source/TortoiseSVN_en.xml:10739(para) source/TortoiseSVN_en.xml:10796(para) +msgid "You have reverted the changes within your working copy. Check the results, then commit the changes." +msgstr "工作副本已经恢复到了变更以前的状态。检查恢复后的结果，然后提交变更。" -#: source/TortoiseSVN_en.xml:8239(para) -msgid "All other items are shown using a plain rectangle." -msgstr "其他一般的文件用plain rectangle标示。" +#: source/TortoiseSVN_en.xml:10745(title) +msgid "Use the merge dialog" +msgstr "使用合并对话框" -#: source/TortoiseSVN_en.xml:8251(para) -msgid "There is also an option to arrange the graph by path. This attempts to sort the branches from the tags. Paths which contain no modifications after copying are assumed to be tags and are stacked in a single column. Branches (which contain modifications after creation) each have their own column, so you can see how the branch develops." -msgstr "这也有一个功能来排列版本分支旁支。它根据日志来对分支排序。如果分支从副本创建后都没有修改过一般被认为是一个标签而独立保存起来。每个分支(创建后有过修改的)会有它们自己的列，所以你可以看到分支延展到什么情况了。" +#: source/TortoiseSVN_en.xml:10746(para) +msgid "To undo a larger range of revisions, you can use the Merge dialog. The previous method uses merging behind the scenes; this method uses it explicitly." +msgstr "如果要撤销更大版本范围的变更，可以使用合并对话框。上一个方法在后台使用了合并的机制，在这个方法里我们直接使用合并功能。" -#: source/TortoiseSVN_en.xml:8258(para) -msgid "Sometimes the revision graph contains more detail than you want to see. ViewFilter opens a dialog which allows you to restrict the range of revisions displayed, and to hide particular paths by name." -msgstr "有时候版本图包含的信息比你想看到的多。视图过滤器打开对话框，允许你限制显示的版本范围，隐藏指定的路径名称模式。" +#: source/TortoiseSVN_en.xml:10753(para) +msgid "In your working copy select TortoiseSVNMerge." +msgstr "在工作副本上选择TortoiseSVN合并。" -#: source/TortoiseSVN_en.xml:826(title) source/TortoiseSVN_en.xml:842(title) -msgid "The Lock-Modify-Unlock Solution" -msgstr "锁定-修改-解锁 方案" +#: source/TortoiseSVN_en.xml:10762(para) +msgid "In the From: field enter the full folder url of the branch or tag containing the changes you want to revert in your working copy. This should come up as the default URL." +msgstr "在起始: 文本框里输入想要恢复的变更所在的分支或标签的URL。它也将作为默认URL。" -#: source/TortoiseSVN_en.xml:8267(para) -msgid "To make it easier to navigate a large graph, use the overview window. This shows the entire graph in a small window, with the currently displayed portion highlighted. You can drag the highlighted area to change the displayed region." -msgstr "" +#: source/TortoiseSVN_en.xml:10770(para) +msgid "In the From Revision field enter the revision number that you are currently at. If you are sure there is no-one else making changes, you can use the HEAD revision." +msgstr "在起始版本文本框里输入当前工作副本的版本号。如果能够保证没有其他人会提交变更，可以使用最新版本。" -#: source/TortoiseSVN_en.xml:827(para) -msgid "Many version control systems use a lock-modify-unlock model to address this problem, which is a very simple solution. In such a system, the repository allows only one person to change a file at a time. First Harry must \"lock\" the file before he can begin making changes to it. Locking a file is a lot like borrowing a book from the library; if Harry has locked a file, then Sally cannot make any changes to it. If she tries to lock the file, the repository will deny the request. All she can do is read the file, and wait for Harry to finish his changes and release his lock. After Harry unlocks the file, his turn is over, and now Sally can take her turn by locking and editing." -msgstr "许多版本控制系统使用锁定-修改-解锁这种机制解决这种问题，在这样的模型里，在一个时间段里版本库的一个文件只允许被一个人修改。首先在修改之前，Harry 要“锁定”住这个文件，锁定很像是从图书馆借一本书，如果 Harry 锁住这个文件，Sally 不能做任何修改，如果 Sally 想请求得到一个锁，版本库会拒绝这个请求。在 Harry 结束编辑并且放开这个锁之前，她只可以阅读文件。Harry 解锁后，就要换班了，Sally 得到自己的轮换位置，锁定并且开始编辑这个文件。" +#: source/TortoiseSVN_en.xml:10778(para) +msgid "make sure the Use \"From:\" URL checkbox is checked." +msgstr "确认使用“起始: ”的 URL检查框处于被选中的状态。" -#: source/TortoiseSVN_en.xml:8273(para) -msgid "The revision date, author and comments are shown in a hint box whenever the mouse hovers over a revision box." -msgstr "任何时候只要鼠标在版本框上滑过，都会显示该版本的日期、作者和备注信息。" +#: source/TortoiseSVN_en.xml:10784(para) +msgid "In the To Revision field enter the revision number that you want to revert to, ie. the one before the first revision to be reverted." +msgstr "在结束版本里输入想要恢复到的版本号。比如，想要恢复的最小版本号的前一个版本号。" -#: source/TortoiseSVN_en.xml:8277(para) -msgid "If you select two revisions (Use Ctrl left click), you can use the context menu to show the differences between these revisions. You can choose to show differences as at the branch creation points, but usually you will want to show the differences at the branch end points, i.e. at the HEAD revision." -msgstr "选择两个版本(用ctrl+左击)，你可以在右键菜单下查看这两个版本的差异。你可以在分支的起始点查看差异，但一般你会在一个分支的结束点来查看，比如，在最新版本。" +#: source/TortoiseSVN_en.xml:10802(title) +msgid "Use svndumpfilter" +msgstr "使用 svndumpfilter" -#: source/TortoiseSVN_en.xml:8284(para) -msgid "You can view the differences as a Unified-Diff file, which shows all differences in a single file with minimal context. If you opt to Context MenuCompare Revisions you will be presented with a list of changed files. Double click on a file name to fetch both revisions of the file and compare them using the visual difference tool." -msgstr "你可以用查看单一差异文件的方式来查看差异，它在单一的文件中显示差异。如果你选右键菜单比较版本所有修改过的文件都会呈现在列表中。双击一个文件名可以返回文件版本号和他们差异。" +#: source/TortoiseSVN_en.xml:10803(para) +msgid "Since TortoiseSVN never loses data, your rolled back revisions still exist as intermediate revisions in the repository. Only the HEAD revision was changed to a previous state. If you want to make revisions disappear completely from your repository, erasing all trace that they ever existed, you have to use more extreme measures. Unless there is a really good reason to do this, it is not recommended. One possible reason would be that someone committed a confidential document to a public repository." +msgstr "因为TortoiseSVN绝不会丢弃数据，所以那些被回滚的版本仍然以中间版本的形式被保留在版本库里。只是最新版本已经回到了以前的状态。如果想让版本库里的某些版本彻底消失，擦去这些版本曾经存在过的所有痕迹，就必须采取更极端的手段。不推荐使用这种方法，除非有很好的理由。比如某人向一个公开的版本库里提交了一份机密文件。" -#: source/TortoiseSVN_en.xml:8295(para) -msgid "If you right click on a revision you can use Context MenuShow Log to view the history." -msgstr "如果右击一个版本你可以使用右键菜单显示日志 来查看它的历史。" +#: source/TortoiseSVN_en.xml:10814(para) +msgid "The only way to remove data from the repository is to use the Subversion command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." +msgstr "从版本库里删除数据的唯一方法就是使用svnadmin这个Subversion命令行工具。具体如何实现请参考版本库维护。" -#: source/TortoiseSVN_en.xml:8304(para) -msgid "Because Subversion cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." -msgstr "因为Subversion不能支持提供所有请求的信息，在有大量请求信息时，有时它能提供强大的返回信息。但无论如何，主干都会产生有用的输出。" +#: source/TortoiseSVN_en.xml:10825(title) +msgid "Compare two revisions of a file" +msgstr "比较一个文件的两个版本" -#: source/TortoiseSVN_en.xml:8313(title) -msgid "Exporting a Subversion Working Copy" -msgstr "导出一个Subversion工作副本" +#: source/TortoiseSVN_en.xml:10827(primary) +msgid "compare files" +msgstr "比较文件" -#: source/TortoiseSVN_en.xml:8315(primary) -msgid "export" -msgstr "导出" +#: source/TortoiseSVN_en.xml:10829(para) +msgid "If you want to compare two revisions in a file's history, for example revisions 100 and 200 of the same file, just use TortoiseSVNShow Log to list the revision history for that file. Pick the two revisions you want to compare then use Context MenuCompare Revisions." +msgstr "如果希望比较某个文件的两个历史版本，比如同一个文件修订版本100和200，可以用TortoiseSVN显示日志列出这个文件的历史版本纪录，选择希望比较的两个版本，然后使用右键菜单比较版本差异。" -#: source/TortoiseSVN_en.xml:8317(para) -msgid "Sometimes you may want a copy of your working tree without any of those .svn directories, e.g. to create a zipped tarball of your source, or to export to a web server. Instead of making a copy and then deleting all those .svn directories manually, TortoiseSVN offers the command TortoiseSVNExport.... Exporting from a URL and exporting from a working copy are treated slightly differently." -msgstr "有时候你需要一个没有.svn目录的工作目录树，例如，创建一份源代码的压缩文件，或者导出一份用作WEB服务器。不用先复制，然后手工删除所有.svn目录。TortoiseSVN提供命令TortoiseSVN导出...。如果你要用这个功能操作拥有一份工作副本，将会在要求你保存一份干净的文件。从URL或工作副本导出有少许不同。" +#: source/TortoiseSVN_en.xml:10843(para) +msgid "If you want to compare the same file in two different trees, for example the trunk and a branch, you can use the repository browser to open up both trees, select the file in both places, then use Context MenuCompare Revisions." +msgstr "如果希望比较两个不同目录树下的同一个文件，比如主干和分支，可以使用版本库浏览器打开两个目录树，在两个目录树下选择同一个文件，然后使用 右键菜单比较版本差异。" -#: source/TortoiseSVN_en.xml:8330(para) -msgid " If you execute this command on an unversioned folder, TortoiseSVN will assume that the selected folder is the target, and open a dialog for you to enter the URL and revision to export from. This dialog has options to export only the top level folder, to omit external references, and to override the line end style for files which have the svn:eol-style property set." -msgstr " 如果你在未版本控制的目录执行此命令，TortoiseSVN会假定此目录是目标，弹出对话框让你输入要导出的URL和版本。这个对话框有只导出顶级目录，省略外部引用，以及不管svn:eol-style的取值，重新设置行结束样式等选项。" +#: source/TortoiseSVN_en.xml:10853(para) +msgid "If you want to compare two trees to see what has changed, for example the trunk and a tagged release, you can use TortoiseSVNRevision Graph Select the two nodes to compare, then use Context MenuCompare HEAD Revisions. This will show a list of changed files, and you can then select individual files to view the changes in detail. Alternatively use Context MenuUnified Diff of HEAD Revisions to see a summary of all differences, with minimal context." +msgstr "如果希望比较两个目录树下的所有变化，比如主干和某个发布标签，可以使用TortoiseSVN版本分支图。选择两个想要比较的节点，然后使用右键菜单比较最新版本，就会列出一个变更文件列表。在列表上选择单个文件就能够浏览该文件的具体变更内容。另外一个方法是使用右键菜单最新版本的标准差异(Unified diff)显示所有变更的汇总和最少限度的上下文。" -#: source/TortoiseSVN_en.xml:8332(title) -msgid "The Export-from-URL Dialog" -msgstr "从 URL 导出对话框" +#: source/TortoiseSVN_en.xml:10876(title) +msgid "Include a common sub-project" +msgstr "包含一个普通的子项目" + +#: source/TortoiseSVN_en.xml:10878(primary) +msgid "common projects" +msgstr "普通项目" -#: source/TortoiseSVN_en.xml:8342(para) -msgid "Of course you can export directly from the repository too. Use the Repository Browser to navigate to the relevant subtree in your repository, then use Context MenuExport. You will get the Export from URL dialog described above." -msgstr "当然，你也可以直接从版本库导出。使用版本库浏览器浏览有关子树，然后使用右键菜单导出。就会出现上面所说的从URL导出对话框。" +#: source/TortoiseSVN_en.xml:10880(para) +msgid "Sometimes you will want to include another project within your working copy, perhaps some library code. You don't want to make a duplicate of this code in your repository because then you would lose connection with the original (and maintained) code. Or maybe you have several projects which share core code. There are at least 3 ways of dealing with this." +msgstr "有时候你希望在你的工作副本中引入另一个项目，或许是一些库代码，你不必在你的版本库复制一份，因为你会失去与原始(且维护的)代码的联系，或者你可能有多个项目共享同一份核心代码，有至少三种方法处理这个问题。" -#: source/TortoiseSVN_en.xml:8352(para) -msgid "If you execute this command on your working copy you'll be asked for a place to save the clean working copy without the .svn folders. By default, only the versioned files are exported, but you can use the Export unversioned files too checkbox to include any other unversioned files which exist in your WC and not in the repository. External references using svn:externals can be omitted if required." -msgstr "如果你要用这个功能操作工作副本，将会询问你要保存干净而没有.svn目录的副本到何处。默认情况下，只导出被版本控制的文件，但你可以使用同时导出未受版本控制的文件来将版本库中没有但在你的本地副本中存在的文件导出来。另外可以使用svn:externals来忽略外部引用。" +#: source/TortoiseSVN_en.xml:10890(title) +msgid "Use svn:externals" +msgstr "使用 svn:externals" -#: source/TortoiseSVN_en.xml:8362(para) -msgid "Another way to export from a working copy is to right drag the working copy folder to another location and choose Context MenuSVN Export here or Context MenuSVN Export all here. The second option includes the unversioned files as well." -msgstr "另外一个导出的方法是 右键拖工作副本到另外的保存位置，然后选择右键菜单SVN导出到这儿或者右键菜单SVN 导出全部到这儿。后者可以把未受版本控制的文件也导出。" +#: source/TortoiseSVN_en.xml:10891(para) +msgid "Set the svn:externals property for a folder in your project. This property consists of one or more lines; each line has the name of a subfolder which you want the use as the checkout folder for common code, and the repository URL that you want to be checked out there. For full details refer to ." +msgstr "在你的项目的一个目录设置svn:externals属性，这个属性包含一到多行；每一行都有一个用作检出的子目录的名字，和一个你希望检出的版本库URL，细节请参考。" -#: source/TortoiseSVN_en.xml:8376(para) -msgid "When exporting from a working copy, if the target folder already contains a folder of the same name as the one you are exporting, you will be given the option to overwrite the existing content, or to create a new folder with an automatically generated name, eg. Target (1)." -msgstr "导出工作副本时，如果目标目录包含了和你导出的名称相同的目录，你需要使用此选项重写已经存在的内容，或者使用自动生成的名称，例如目标 (1)。" +#: source/TortoiseSVN_en.xml:10899(para) +msgid "Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The subfolders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." +msgstr "提交新的目录，然后当你更新时，Subversion会将那个项目的一个副本从它的版本库检出到工作目录，如果需要，子目录会自动创建，每当你更新你的工作副本，你会得到所有外部项目的最新版本。" -#: source/TortoiseSVN_en.xml:8385(title) -msgid "Relocating a working copy" -msgstr "重新定位工作副本" +#: source/TortoiseSVN_en.xml:10920(title) +msgid "Use a nested working copy" +msgstr "使用嵌套工作副本" -#: source/TortoiseSVN_en.xml:8387(primary) -msgid "relocate" -msgstr "重新定位" +#: source/TortoiseSVN_en.xml:10921(para) +msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" +msgstr "在你的项目创建一个包含普通代码的新目录，但不将其添加到Subversion" -#: source/TortoiseSVN_en.xml:8390(para) -msgid " If your repository has for some reason changed it's location (IP/URL). Maybe you're even stuck and can't commit and you don't want to checkout your working copy again from the new location and to move all your changed data back into the new working copy, TortoiseSVNRelocate is the command you are looking for. It basically does very little: it scans all \"entries\" files in the .svn folder and changes the URL of the entries to the new value." -msgstr "如果你的版本库因为某些原因而重定位了(IP/URL).也许你不能进行操作，不能提交，不能从新的定位检出副本，也不能将修改的数据提交到新位置的版本库中，TortoiseSVN重新定位也许正是你需要的。它的做法很简单: 查找所有 .svn 文件的接口然后把URL值改为新的版本库地址。" +#: source/TortoiseSVN_en.xml:10925(para) +msgid "Select TortoiseSVNCheckout for the new folder and checkout a copy of the common code into it. You now have a separate working copy nested within your main working copy." +msgstr "在新目录下选择TortoiseSVN检出，在其中检出普通代码的副本，现在你在主要的工作副本有了一个独立的嵌套的工作副本。" -#: source/TortoiseSVN_en.xml:8392(title) -msgid "The Relocate Dialog" -msgstr "重定位对话框" +#: source/TortoiseSVN_en.xml:10935(para) +msgid "The two working copies are independent. When you commit changes to the parent, changes to the nested WC are ignored. Likewise when you update the parent, the nested WC is not updated." +msgstr "两个工作副本是独立的，当你在父目录提交修改，嵌套的工作副本会被忽略，同样当你更新你的父目录，嵌套的工作副本不会被更新。" -#: source/TortoiseSVN_en.xml:84(title) -msgid "Reading Guide" -msgstr "阅读指南" +#: source/TortoiseSVN_en.xml:10942(title) +msgid "Use a relative location" +msgstr "使用相对位置" -#: source/TortoiseSVN_en.xml:8410(para) -msgid "This is a very infrequently used operation. The relocate command is only used if the URL of the repository root has changed. Possible reasons are: Put another way, you need to relocate when your working copy is referring to the same location in the same repository, but the repository itself has moved." -msgstr "这是一个极少使用的操作.重定位只能 在版本库路径更改时使用。可能的原因是: 换种说法，如果你要重定位，只有当你的工作副本仍然还在同一个版本库中定位，但版本库本身已经没有了。" +#: source/TortoiseSVN_en.xml:10943(para) +msgid "" +"If you use the same common core code in several projects, and you do not want to keep multiple working copies of it for every project that uses it, you can just check it out to a separate location which is related to all the other projects which use it. For example: \n" +"C:\\Projects\\Proj1\n" +"C:\\Projects\\Proj2\n" +"C:\\Projects\\Proj3\n" +"C:\\Projects\\Common\n" +" and refer to the common code using a relative path, eg. ..\\..\\Common\\DSPcore." +msgstr "" +"如果你在多个项目中使用共同的代码，而你不想为每个项目保存一份副本，你可以将其检出到一个单独的位置，与其他项目关联，例如: \n" +"C:\\Projects\\Proj1\n" +"C:\\Projects\\Proj2\n" +"C:\\Projects\\Proj3\n" +"C:\\Projects\\Common\n" +"然后使用相对路径例如..\\..\\Common\\DSPcore引用通用代码。" -#: source/TortoiseSVN_en.xml:8416(para) -msgid "The IP address of the server has changed." -msgstr "服务器的IP地址已更改。" +#: source/TortoiseSVN_en.xml:10958(para) +msgid "" +"If your projects are scattered in unrelated locations you can use a variant of this, which is to put the common code in one location and use drive letter substitution to map that location to something you can hard code in your projects, eg. Checkout the common code to D:\\Documents\\Framework or C:\\Documents and Settings\\{login}\\My Documents\\framework then use \n" +"SUBST X: \"D:\\Documents\\framework\"\n" +" to create the drive mapping used in your source code. Your code can then use absolute locations. \n" +"#include \"X:\\superio\\superio.h\"\n" +"" +msgstr "" +"如果你的项目分散到不相关的位置，你可以使用一个变种方式，可以将通用代码放到一个位置，且使用盘符映射到你可以在项目硬编码的内容，例如将通用代码检出到D:\\Documents\\Framework或C:\\Documents and Settings\\{login}\\My Documents\\framework，然后使用\n" +"SUBST X: \"D:\\Documents\\framework\"\n" +"在你的源代码创建磁盘映射，你的代码可以使用绝对位置。\n" +"#include \"X:\\superio\\superio.h\"\n" +"" -#: source/TortoiseSVN_en.xml:8419(para) -msgid "The protocol has changed (e.g. http:// to https://)." -msgstr "协议已更改(比如从http://改为 https://)。" +#: source/TortoiseSVN_en.xml:10976(para) +msgid "This method will only work in an all-PC environment, and you will need to document the required drive mappings so your team know where these mysterious files are. This method is strictly for use in closed development environments, and not recommended for general use." +msgstr "这个方法职能工作在完全PC的环境，你所做的就是记录必须的磁盘映射，所以你的团队知道这些神秘文件的位置，这个方法只能用于紧密地开发环境，在普通的使用中并不推荐。" -#: source/TortoiseSVN_en.xml:8422(para) -msgid "The repository root path in the server setup has changed." -msgstr "版本库在服务器的路径已更改。" +#: source/TortoiseSVN_en.xml:10986(title) +msgid "Create a shortcut to a repository" +msgstr "创建到版本库的快捷方式" -#: source/TortoiseSVN_en.xml:8429(para) -msgid "It does not apply if: " -msgstr "以下情况不支持: " +#: source/TortoiseSVN_en.xml:10988(primary) +msgid "shortcut" +msgstr "快捷方式" -#: source/TortoiseSVN_en.xml:8433(para) -msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location." -msgstr "你要移到一个完全不同的版本库。这种情况下，你必须从新的版本库里执行一次干净的检出。" +#: source/TortoiseSVN_en.xml:10990(para) +msgid "" +"If you frequently need to open the repository browser at a particular location, you can create a desktop shortcut using the automation interface to TortoiseProc. Just create a new shortcut and set the target to: \n" +"TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n" +" Of course you need to include the real repository URL." +msgstr "" +"如果你经常需要从某个位置打开版本库浏览器，你可以使用 TortoiseProc 自动化接口创建一个快捷方式。只需要创建一个新的快捷方式，将目标设置为: \n" +"TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n" +" 当然你需要包含真实的版本库 URL。" -#: source/TortoiseSVN_en.xml:8439(para) -msgid "You want to switch to a different branch or directory within the same repository. To do that you should use TortoiseSVNSwitch.... Read for more information." -msgstr "你要在同一个版本库中切换一个分支或目录。这么做你可以用TortoiseSVN切换.... " +#: source/TortoiseSVN_en.xml:11002(title) +msgid "Ignore files which are already versioned" +msgstr "忽略已经版本控制的文件" -#: source/TortoiseSVN_en.xml:845(para) -msgid "The problem with the lock-modify-unlock model is that it's a bit restrictive, and often becomes a roadblock for users:" -msgstr "锁定-修改-解锁模型有一点问题就是限制太多，经常会成为用户的障碍: " +#: source/TortoiseSVN_en.xml:11004(primary) +msgid "unversion" +msgstr "没有版本控制" -#: source/TortoiseSVN_en.xml:8451(para) -msgid "If you use relocate in either of the cases above, it will corrupt your working copy and you will get many unexplainable error messages while updating, committing, etc. Once that has happened, the only fix is a fresh checkout." -msgstr "如果你使用以上任意一种重定位方式，它将破坏你的工作副本，在你更新、提交等操作时会提示一些令人费解的错误信息。一旦发生这种情况，唯一的办法就是检出最新版本。" +#: source/TortoiseSVN_en.xml:11006(para) +msgid "If you accidentally added some files which should have been ignored, how do you get them out of version control without losing them? Maybe you have your own IDE configuration file which is not part of the project, but which took you a long time to set up just the way you like it." +msgstr "如果你不小心添加了一些应该被忽略的文件，你如何将它们从版本控制中去除而不会丢失它们？或许你有自己的IDE配置文件，不是项目的一部分，但将会花费很多时间使之按照自己的方式工作。" -#: source/TortoiseSVN_en.xml:8460(title) -msgid "Integration with Bugtracking Systems / Issue trackers" -msgstr "与 BUG 跟踪系统/问题跟踪集成" +#: source/TortoiseSVN_en.xml:11013(para) +msgid "If you have not yet committed the add, then all you have to do is use TortoiseSVNRevert... to undo the add. You should then add the file(s) to the ignore list so they don't get added again later by mistake." +msgstr "如果你还没有提交，你只需要TortoiseSVNRevert...来取消添加，你需要将这个文件添加到忽略列表，这样它们才不会被再次误添加近来。" -#: source/TortoiseSVN_en.xml:8462(primary) -msgid "bugtracking" -msgstr "BUG 跟踪" +#: source/TortoiseSVN_en.xml:11028(para) +msgid "Move the file to somewhere safe, not inside your working copy." +msgstr "把文件移动到其它安全的位置，不在你的工作副本的目录内。" -#: source/TortoiseSVN_en.xml:8465(primary) -msgid "bugtracker" -msgstr "BUG 跟踪者" +#: source/TortoiseSVN_en.xml:11034(para) +msgid "TortoiseSVNCommit the parent folder. TortoiseSVN will see that the file is missing and you can mark it for deletion from the repository." +msgstr "TortoiseSVN提交父目录，TortoiseSVN会查看遗失文件和你从版本库标记删除的文件。" -#: source/TortoiseSVN_en.xml:8468(primary) -msgid "issuetracker" -msgstr "问题跟踪者" +#: source/TortoiseSVN_en.xml:11045(para) +msgid "Move the file back to its original location." +msgstr "将文件移到原始位置" -#: source/TortoiseSVN_en.xml:8470(para) -msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Subversion with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." -msgstr "在软件开发中，修改依赖于一个bug或问题编号是很常见的。bug跟踪系统的用户(问题跟踪者)喜欢在问题跟踪中将Subversion的修改与一个指定编号联系起来。因此很多问题跟踪者提供了一个预提交钩子脚本，分析日志，查找提交相关的bug编号。这稍微有些不可靠，因为它依赖于用户写完全的日志，预提交钩子才能正确分析。" +#: source/TortoiseSVN_en.xml:11050(para) +msgid "Add the file to the ignore list so you don't get into the same trouble again." +msgstr "将文件添加到忽略文件，所以你不必再为此烦心。" -#: source/TortoiseSVN_en.xml:8479(para) -msgid "TortoiseSVN can help the user in two ways: " -msgstr "TortoiseSVN可以在两个方面帮助用户: " +#: source/TortoiseSVN_en.xml:11023(para) +msgid "If the files are already in the repository, you have to do a little more work. " +msgstr "如果文件已经存在于版本库，你需要做更多的工作。" -#: source/TortoiseSVN_en.xml:8483(para) -msgid "When the user enters a log message, a well defined line including the issue number associated with the commit can be added automatically. This reduces the risk that the user enters the issue number in a way the bug tracking tools can't parse correctly." -msgstr "当用户输入日志信息时，一个定义良好，包含问题编号，与此提交相关的的行，会自动增加。这样减少了用户输入的问题编号不能比bug跟踪系统正确分析的风险。" +#: source/TortoiseSVN_en.xml:11062(para) +msgid "TortoiseSVNExport the folder to somewhere safe, not inside your working copy." +msgstr "TortoiseSVN导出文件夹到某个安全的地方而不是你的工作副本。" -#: source/TortoiseSVN_en.xml:8489(para) -msgid "Or TortoiseSVN can highlight the part of the entered log message which is recognized by the issue tracker. That way the user knows that the log message can be parsed correctly." -msgstr "或者TortoiseSVN高亮显示日志消息中能被问题跟踪者识别的部分。这样，用户就知道日志消息能被正确解析。" +#: source/TortoiseSVN_en.xml:11072(para) +msgid "TortoiseSVNDelete the folder from your working copy." +msgstr "TortoiseSVN删除，从你的工作副本中删除该文件夹。" -#: source/TortoiseSVN_en.xml:8496(para) -msgid "When the user browses the log messages, TortoiseSVN creates a link out of each bug ID in the log message which fires up the browser to the issue mentioned." -msgstr "当用户浏览日志信息，TortoiseSVN在日志信息中创建指向每个bug标示的链接，它可以用浏览器打开。" +#: source/TortoiseSVN_en.xml:11081(para) +msgid "TortoiseSVNCommit the deleted folder to remove it from the repository." +msgstr "TortoiseSVN提交对文件夹的删除操作，将它从版本库中移除。" -#: source/TortoiseSVN_en.xml:85(para) -msgid "This Preface explains a little about the TortoiseSVN project, the community of people who work on it, and the licensing conditions for using it and distributing it." -msgstr "在前言里简单介绍了 TortoiseSVN 项目，以及其开发团体，还介绍了使用及分发该软件应遵循的许可证。" +#: source/TortoiseSVN_en.xml:11090(para) +msgid "Move the exported folder back to its original location in your working copy." +msgstr "将导出的文件复制回工作副本原来的位置。" -#: source/TortoiseSVN_en.xml:8504(para) -msgid "You can integrate a Bugtracking Tool of your choice in TortoiseSVN. To do this, you have to define some properties, which start with bugtraq:. They must be set on Folders: ()" -msgstr "你可以在TortoiseSVN中集成bug跟踪工具。为了使用这个特性，你要定义一些以bugtraq:开始的属性，它们只能在文件夹上设置 ()。" +#: source/TortoiseSVN_en.xml:11096(para) +msgid "Add the folder to the ignore list so you don't get into the same trouble again." +msgstr "将文件添加到忽略文件，所以你不必再为此烦心。" -#: source/TortoiseSVN_en.xml:8510(para) -msgid "There are two ways to integrate TortoiseSVN with issue trackers. One is based on simple strings, the other is based on regular expressions. The properties used by both approaches are: " -msgstr "有两个方法集成TortoiseSVN 和问题跟踪。一个基于简单字符串，另一个基于正则表达式。它们的用法是: " +#: source/TortoiseSVN_en.xml:11057(para) +msgid "If you need to remove a whole folder/hierarchy from version control, the procedure is different again. " +msgstr "如果你需要将整个目录从版本控制中删除，过程会有一点区别。" -#: source/TortoiseSVN_en.xml:8516(term) -msgid "bugtraq:url" -msgstr "bugtraq:url" +#: source/TortoiseSVN_en.xml:11106(title) +msgid "Administrators" +msgstr "管理员" -#: source/TortoiseSVN_en.xml:8518(para) -msgid "Set this property to the url of your bugtracking tool. It must be properly URI encoded and it has to contain %BUGID%. %BUGID% is replaced with the Issuenumber you entered. This allows TortoiseSVN to display a link in the log dialog, so when you are looking at the revision log you can jump directly to your bugtracking tool. You do not have to provide this property, but then TortoiseSVN shows only the issuenumber and not the link to it. e.g the TortoiseSVN project is using http://issues.tortoisesvn.net/?do=details&id=%BUGID%" -msgstr "将这个属性设置为你的bug跟踪工具的地址。它必须编码并且包含%BUGID%。%BUGID%用你输入的问题编号替换。它允许TortoiseSVN 在日志对话框中显示链接，于是你可以在察看版本日志时直接进入bug跟踪工具。你可以不提供这个属性，但是这样TortoiseSVN就不能显示链接了，只能显示问题编号。例如TortoiseSVN 使用http://issues.tortoisesvn.net/?do=details&id=%BUGID%。" +#: source/TortoiseSVN_en.xml:11108(para) +msgid "This appendix contains solutions to problems/questions you might have when you are responsible for deploying TortoiseSVN to multiple client computers." +msgstr "附录包含了将TortoiseSVN部署到多个客户端电脑时可能发生问题的解决方案。" -#: source/TortoiseSVN_en.xml:852(para) -msgid "Locking may cause administrative problems. Sometimes Harry will lock a file and then forget about it. Meanwhile, because Sally is still waiting to edit the file, her hands are tied. And then Harry goes on vacation. Now Sally has to get an administrator to release Harry's lock. The situation ends up causing a lot of unnecessary delay and wasted time." -msgstr "锁定可能导致管理问题。有时候 Harry 会锁住文件然后忘了此事，这就是说 Sally 一直等待解锁来编辑这些文件，她在这里僵住了。然后 Harry 去旅行了，现在 Sally 只好去找管理员放开锁，这种情况会导致不必要的耽搁和时间浪费。" +#: source/TortoiseSVN_en.xml:11115(title) +msgid "Deploy TortoiseSVN via group policies" +msgstr "通过组策略部署 TortoiseSVN" -#: source/TortoiseSVN_en.xml:8536(term) -msgid "bugtraq:warnifnoissue" -msgstr "bugtraq:warnifnoissue" +#: source/TortoiseSVN_en.xml:11117(primary) +msgid "group policies" +msgstr "组策略" -#: source/TortoiseSVN_en.xml:8538(para) -msgid "Set this to true, if you want TortoiseSVN to warn you because of an empty issuenumber textfield. Valid values are true/false. If not defined, false is assumed. " -msgstr "如果你想TortoiseSVN给出空问题编号的警告，就设置为 真。有效取值是 真/假。如果没有定义，那么假定为 假。" +#: source/TortoiseSVN_en.xml:11120(primary) +#: source/TortoiseSVN_en.xml:12305(glossterm) +msgid "GPO" +msgstr "GPO" -#: source/TortoiseSVN_en.xml:8551(para) -msgid "In the simple approach, TortoiseSVN shows the user a separate input field where a bug ID can be entered. Then a separate line is appended/prepended to the log message the user entered. " -msgstr "在最简单的方法里，TortoiseSVN为用户显示了一个单独的bug ID输入字段，然后后面预计会追加一个用户输入日志信息的行。" +#: source/TortoiseSVN_en.xml:11122(para) +msgid "The TortoiseSVN installer comes as an msi file, which means you should have no problems adding that msi file to the group policies of your domain controller." +msgstr "TortoiseSVN安装程序使用msi文件，意味着你必须能够将msi文件添加到你的域控制器的组策略中。" -#: source/TortoiseSVN_en.xml:8557(term) -msgid "bugtraq:message" -msgstr "bugtraq:message" +#: source/TortoiseSVN_en.xml:11127(para) +msgid "A good walkthrough on how to do that can be found in the knowledge base article 314934 from Microsoft: http://support.microsoft.com/?kbid=314934." +msgstr "你可以从微软的知识库文章314934中看到如何做的方法: http://support.microsoft.com/?kbid=314934。" -#: source/TortoiseSVN_en.xml:8559(para) -msgid " This property activates the Bugtracking System in Input field mode. If this property is set, then TortoiseSVN will prompt you to enter an issue number when you commit your changes. It's used to add a line at the end of the logmessage. It must contain %BUGID%, which is replaced with the issuenumber on commit. This ensures that your commit log contains a reference to the issuenumber which is always in a consistent format and can be parsed by your Bugtracking tool to associate the issuenumber with a particular commit. e.g the TortoiseSVN project is using Issue : %BUGID%, but this depends on your Tool." -msgstr "这个属性将问题追踪系统激活为输入框模式。 如果设置了这个属性，在拟提交时，TortoiseSVN会提示你输入问题单号码。它通常会在日志信息后面添加一行。必须包含%BUGID%，在提交时会被替换为问题单号。这确保了你的提交日志包含了问题单号，保证了单号可以被问题追踪工具解析，从而与提交关联。例如TortoiseSVN项目使用Issue : %BUGID%，但是这依赖于你的工具。" +#: source/TortoiseSVN_en.xml:11134(para) +msgid "Versions 1.3.0 and later of TortoiseSVN must be installed under Computer Configuration and not under User Configuration. This is because those versions need the new CRT and MFC dlls, which can only be deployed per computer and not per user. If you really must install TortoiseSVN on a per user basis, then you must first install the MFC and CRT package version 8 from Microsoft on each computer you want to install TortoiseSVN as per user." +msgstr "TortoiseSVN的1.3和之后的版本，必须安装在电脑配置下，而不是用户配置。这是因为那些版本需要新的CRT和MFC的dll，只能部署在每电脑，而不是每用户。如果你必须以每用户防是安装TortoiseSVN，你必须在每个需要安装TortoiseSVN电脑上为每个用户安装MFC和CRT包。" -#: source/TortoiseSVN_en.xml:8580(term) -msgid "bugtraq:append" -msgstr "bugtraq:append" +#: source/TortoiseSVN_en.xml:11146(title) +msgid "Redirect the upgrade check" +msgstr "重定向升级检查" -#: source/TortoiseSVN_en.xml:8582(para) -msgid "This property defines if the bug-ID is appended (true) to the end of the log message or inserted (false) at the start of the log message. Valid values are true/false. If not defined, true is assumed, so that existing projects don't break. " -msgstr "这个属性定义了bug-ID。是追加到(true)日志信息的末尾，还是插入到(false)日志信息的开始。有效的值包括true/false，如果没有定义，默认是true ，所以现存的项目不会被打破。" +#: source/TortoiseSVN_en.xml:11148(primary) +msgid "upgrade check" +msgstr "升级检查" -#: source/TortoiseSVN_en.xml:8595(term) -msgid "bugtraq:label" -msgstr "bugtraq:label" +#: source/TortoiseSVN_en.xml:11150(para) +msgid "TortoiseSVN checks if there's a new version available every few days. If there is a newer version available, a dialog shows up informing the user about that." +msgstr "TortoiseSVN会每隔几天检查是否有新版本可以下载，如果有新版本存在，会给用户显示相关信息的对话框。" -#: source/TortoiseSVN_en.xml:8597(para) -msgid "This text is shown by TortoiseSVN on the commit dialog to label the edit box where you enter the issuenumber. If it's not set, Bug-ID / Issue-Nr: will be displayed. Keep in mind though that the window will not be resized to fit this label, so keep the size of the label below 20-25 characters." -msgstr "是TortoiseSVN的提交对话框中用来输入问题单号码的输入项，如果没有设置，将会显示Bug-ID / Issue-Nr:，要记住窗口不会为适应标签而改变大小，所以请保持标签的小于20-25个字符。" +#: source/TortoiseSVN_en.xml:11156(title) +msgid "The upgrade dialog" +msgstr "升级对话框" -#: source/TortoiseSVN_en.xml:8609(term) -msgid "bugtraq:number" -msgstr "bugtraq:number" +#: source/TortoiseSVN_en.xml:11159(para) +msgid "If you're responsible for a lot of users in your domain, you might want your users to use only versions you have approved and not have them install always the latest version. You probably don't want that upgrade dialog to show up so your users don't go and upgrade immediately." +msgstr "如果你为你的域中的许多用户负责，你或许希望所有的用户使用你允许的版本，而不是最新的版本，你可能不希望显示升级对话框而使得用户立刻升级。" -#: source/TortoiseSVN_en.xml:8611(para) -msgid "If set to true only numbers are allowed in the issuenumber textfield. An exception is the comma, so you can comma separate several numbers. Valid values are true/false. If not defined, true is assumed. " -msgstr "如果设置为true，问题单号文本框只能输入数字，一个例外是逗号，所以你可以使用逗号分割输入的多个号码。合法的值包括true/false， 如果没有设置，默认是true。" +#: source/TortoiseSVN_en.xml:11165(para) +msgid "" +"Versions 1.4.0 and later of TortoiseSVN allow you to redirect that upgrade check to your intranet server. You can set the registry key HKCU\\Software\\TortoiseSVN\\UpdateCheckURL (string value) to an URL pointing to a text file in your intranet. That textfile must have the following format: \n" +"1.4.1.6000\n" +"A new version of TortoiseSVN is available for you to download!\n" +"http://192.168.2.1/downloads/TortoiseSVN-1.4.1.6000-svn-1.4.0.msi\n" +" The first line in that file is the version string. You must make sure that it matches the exact version string of the TortoiseSVN installation package. The second line is a custom text, shown in the upgrade dialog. You can write there whatever you want. Just note that the space in the upgrade dialog is limited. Too long messages will get truncated! The third line is the URL to the new installation package. This URL is opened when the user clicks on the custom message label in the upgrade dialog. You can also just point the user to a webpage instead of the msi file directly. The URL is opened with the default web browser, so if you specify a webpage, that page is opened and shown to the user. If you specify the msi package, the browser will ask the user to save the msi file locally." +msgstr "" +"Versions 1.4.0和之后的TortoiseSVN允许你重定向你的升级检查到本地服务器，你可以设置注册表HKCU\\Software\\TortoiseSVN\\UpdateCheckURL(字符串值)指向本地网的文本文件。这个文本文件必须是下面的格式: screen>\n" +"1.4.1.6000\n" +"A new version of TortoiseSVN is available for you to download!\n" +"http://192.168.2.1/downloads/TortoiseSVN-1.4.1.6000-svn-1.4.0.msi\n" +"文件的第一行是版本串，你必须确定这与TortoiseSVN安装包的信息完全一致。第二行是自定义字符，显示在省级对话框，你可以在里面写任何信息，只是要注意升级对话框中的数据长度是有限制的，过长的信息会被截断。第三行是最新安装包的位置，当用户选择升级时就会打开这个URL。你可以将文件指向网页，而不是msi文件，如果你指向了msi包，浏览器会询问用户在本地保存msi文件。" -#: source/TortoiseSVN_en.xml:8624(para) -msgid "In the approach with regular expressions, TortoiseSVN doesn't show a separate input field but marks the part of the log message the user enters which is recognized by the issue tracker. This is done while the user writes the log message. This also means that the bug ID can be anywhere inside a log message! This method is much more flexible, and is the one used by the TortoiseSVN project itself. " -msgstr "在使用正则表达式的方法中，TortoiseSVN不会显示一个单独的输入框，而是标记用户输入的日志信息，认为这些标志可以被问题追踪工具识别。这是在用户编写日志信息的时候完成的，这也意味着bug ID可以出现在日志信息的任何位置！这种方法非常灵活，也是TortoiseSVN项目本身使用的方法。" +#: source/TortoiseSVN_en.xml:11190(title) +msgid "Setting the SVN_ASP_DOT_NET_HACK environment variable" +msgstr "设置 SVN_ASP_DOT_NET_HACK 环境变量" -#: source/TortoiseSVN_en.xml:863(para) -msgid "Locking may cause unnecessary serialization. What if Harry is editing the beginning of a text file, and Sally simply wants to edit the end of the same file? These changes don't overlap at all. They could easily edit the file simultaneously, and no great harm would come, assuming the changes were properly merged together. There's no need for them to take turns in this situation." -msgstr "锁定可能导致不必要的线性化开发。如果 Harry 编辑一个文件的开始，Sally 想编辑同一个文件的结尾，这种修改不会冲突，设想修改可以正确的合并到一起，他们可以轻松的并行工作而没有太多的坏处，没有必要让他们轮流工作。" +#: source/TortoiseSVN_en.xml:11192(primary) +msgid "SVN_ASP_DOT_NET_HACK" +msgstr "SVN_ASP_DOT_NET_HACK" -#: source/TortoiseSVN_en.xml:8633(term) -msgid "bugtraq:logregex" -msgstr "bugtraq:logregex" +#: source/TortoiseSVN_en.xml:11194(para) +msgid "As of version 1.4.0 and later, the TortoiseSVN installer doesn't provide the user with the option to set the SVN_ASP_DOT_NET_HACK environment variable anymore, since that caused many problems and confusions with users which always install everything no matter if they know what it is for." +msgstr "1.4及之后的版本，TortoiseSVN安装包不会支持用户在环境变量中使用SVN_ASP_DOT_NET_HACK，因为这样导致许多问题，也会使一直安装任何事情，而不管是什么的用户感到迷惑。" -#: source/TortoiseSVN_en.xml:8635(para) -msgid " This property activates the Bugtracking System in Regex mode. It contains one or two regular expressions, separated by a newline." -msgstr "这个属性会以正则表达式模式激活问题追踪系统。它会包含一个或两个正则表达式，以新行作为分割。" +#: source/TortoiseSVN_en.xml:11201(para) +msgid "" +"But that option is only hidden for the user. You still can force the TortoiseSVN installer to set that environment variable by setting the ASPDOTNETHACK property to TRUE. For example, you can start the installer like this: \n" +"msiexec /i TortoiseSVN-1.4.0.msi ASPDOTNETHACK=TRUE\n" +"" +msgstr "" +"但是这个选项只是对用户隐藏了，你仍然可以通过设置ASPDOTNETHACK属性为TRUE强制TortoiseSVN安装程序设置这个环境变量。例如，你可以这样启动安装脚本: \n" +"msiexec /i TortoiseSVN-1.4.0.msi ASPDOTNETHACK=TRUE\n" +"" -#: source/TortoiseSVN_en.xml:8642(para) -msgid "If only one expression is set, then the bare bug ID's must be matched in the groups of the regex string. Example: [Ii]ssue(?:s)? #?(\\d+)" -msgstr "如果只是设置了一个表达式，然后bug ID必须匹配正则表达式的组，例如[Ii]ssue(?:s)? #?(\\d+)。" +#: source/TortoiseSVN_en.xml:11212(title) +msgid "Automating TortoiseSVN" +msgstr "TortoiseSVN 操作" -#: source/TortoiseSVN_en.xml:8647(para) -msgid "If two expressions are set, then the first expression is used to find a string which relates to the bug ID but may contain more than just the bug ID (e.g. \"Issue #123\" or \"resolves issue 123\"). The second expression is then used to extract the bare bug ID from the string extracted with the first expression. An example:" -msgstr "如果设置了两个表达式，则第一个表达式用来用来查找bug ID相关的字符串，可能会不仅仅包含bug ID(例如\"Issue #123\" or \"resolves issue 123\")。第二个表达式则用来从第一个表达式抽取的字符串中抽取bug的ID，例如: " +#: source/TortoiseSVN_en.xml:11214(para) +msgid "Since all commands for TortoiseSVN are controlled through command line parameters, you can automate it with batch scripts or start specific commands and dialogs from other programs (e.g. your favourite text editor)." +msgstr "因为所有的命令使用命令行参数控制，你可以使用特定的批处理脚本或从其它程序(例如你喜欢的文本编辑器)启动。" -#: source/TortoiseSVN_en.xml:8655(para) -msgid "If you want to catch every pattern \"issue #XXX\" and \"issue #890, #789\" inside a log message you could use the following regex strings: [Ii]ssue #?(\\d+)(,? ?#(\\d+))* and the second expression as (\\d+)" -msgstr "如果你希望捕获日志中所有形式为\"issue #XXX\"和\"issue #890, #789\"字符串，你可以使用如下的正则表达式: [Ii]ssue #?(\\d+)(,? ?#(\\d+))*，而第二个表达式为(\\d+)。" +#: source/TortoiseSVN_en.xml:11220(para) +msgid "Remember that TortoiseSVN is a GUI client, and this automation guide shows you how to make the TortoiseSVN dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Subversion command line client instead." +msgstr "请记住TortoiseSVN是一个GUI客户端，这个自动化指导为你展示了让TortoiseSVN对话框显示并收集客户输入，如果你希望编写不需要输入的脚本，你应该使用官方的Subversion命令行客户端。" -#: source/TortoiseSVN_en.xml:8661(para) -msgid "If you are unfamiliar with regular expressions, take a look at the online documentation and tutorial at http://www.regular-expressions.info/." -msgstr "如果你不熟悉正则表达式，可以看一下http://www.regular-expressions.info/上的在线文档和教程。" +#: source/TortoiseSVN_en.xml:11232(title) +#: source/TortoiseSVN_en.xml:11701(title) +msgid "TortoiseSVN Commands" +msgstr "TortoiseSVN 命令" -#: source/TortoiseSVN_en.xml:8672(para) -msgid "If both the bugtraq:message and bugtraq:logregex properties are set, logregex takes precedence." -msgstr "如果同时设置了bugtraq:message和bugtraq:logregex属性，日志正则表达式会优先使用。" +#: source/TortoiseSVN_en.xml:11234(primary) +msgid "automation" +msgstr "自动化" -#: source/TortoiseSVN_en.xml:8677(para) -msgid "Even if you don't have an issue tracker with a pre-commit hook parsing your log messages, you still can use this to turn the issues mentioned in your log messages into links!" -msgstr "即使你的问题追踪工具没有pre-commit钩子来解析日志信息，你仍然可以使用这个功能将日志信息中的问题单转化为链接！" +#: source/TortoiseSVN_en.xml:11237(primary) +msgid "command line" +msgstr "命令行" -#: source/TortoiseSVN_en.xml:8690(title) source/TortoiseSVN_en.xml:8792(title) -msgid "Set the Properties on Folders" -msgstr "设置文件夹的属性" +#: source/TortoiseSVN_en.xml:11239(para) +msgid "The TortoiseSVN GUI program is called TortoiseProc.exe. All commands are specified with the parameter where abcd is the required command name. Most of these commands need at least one path argument, which is given with . In the following table the command refers to the parameter and the path refers to the parameter." +msgstr "TortoiseSVN的GUI程序叫做TortoiseProc.exe。所有的命令通过参数指定，其中abcd是必须的命令名。大多数此类命令至少需要一个路径参数，使用指定。在下面的命令表格中，命令引用的是参数，余下的代表了参数。" -#: source/TortoiseSVN_en.xml:8691(para) source/TortoiseSVN_en.xml:8793(para) -msgid "These properties must be set on folders for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseSVN will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. C:\\) is found. If you can be sure that each user checks out only from e.g trunk/ and not some subfolder, then it's enough if you set the properties on trunk/. If you can't be sure, you should set the properties recursively on each subfolder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to trunk/)." -msgstr "为了系统能够工作，这个属性必须设置到文件夹上。当你提交文件或文件夹，属性会从文件夹上读取。如果没有发现属性，TortoiseSVN会向上级查找，直到发现一个没有版本控制的文件夹或根目录(例如C:\\)才会停止，如果你能够确定每个用户只从trunk/检出，而不是其他目录，你可以直接在trunk/上使用这个属性，而不必每个子目录都设置。如果你不能确定，你必须为每个子目录设置这些属性。一个深级目录的设置会覆盖高级目录(离trunk/更近的)。" +#: source/TortoiseSVN_en.xml:11248(para) +msgid "Since some of the commands can take a list of target paths (e.g. committing several specific files) the parameter can take several paths, separated by a * character." +msgstr "因为一些命令需要一个目标路径的列表(例如提交一些特定的文件)，参数可以接收多个路径，使用*分割。" -#: source/TortoiseSVN_en.xml:8712(para) -msgid "This issue tracker integration is not restricted to TortoiseSVN; it can be used with any Subversion client. For more information, read the full Issuetracker Integration Specification." -msgstr "问题追踪集成并没有限制在TortoiseSVN，可以用于所有的Subversion客户端，更多信息可以看Issuetracker Integration Specification。" +#: source/TortoiseSVN_en.xml:11253(para) +msgid "TortoiseSVN uses temporary files to pass multiple arguments between the shell extension and the main program. From TortoiseSVN 1.5.0 on and later, parameter is obsolete and there is no need to add it anymore." +msgstr "TortoiseSVN 使用临时文件在 shell 扩展和主程序之间传递多个参数。从 TortoiseSVN 1.5.0 开始，废弃参数，不再需要增加此参数。" -#: source/TortoiseSVN_en.xml:8721(title) -msgid "Integration with Web-based Repository Viewers" -msgstr "与基于 WEB 的版本库浏览器集成" +#: source/TortoiseSVN_en.xml:11259(para) +msgid "The progress dialog which is used for commits, updates and many more commands usually stays open after the command has finished until the user presses the OK button. This can be changed by checking the corresponding option in the settings dialog. But using that setting will close the progress dialog, no matter if you start the command from your batchfile or from the TortoiseSVN context menu." +msgstr "进度对话框用来显示提交，更新等命令，结束后通常需要用户点确认按钮才退出，这个可以通过检查对应的对话框选项中设置。但是使用那个设置会关闭进度窗口，无论你是使用批处理文件还是用TortoiseSVN右键菜单。" -#: source/TortoiseSVN_en.xml:8723(primary) -msgid "webview" -msgstr "webview" +#: source/TortoiseSVN_en.xml:11267(para) +msgid "To specify a different location of the configuration file, use the param . This will override the default path, including any registry setting." +msgstr "为了指定另外一个的配置文件，可以使用参数，这将会覆盖默认的路径和注册表设置。" -#: source/TortoiseSVN_en.xml:8726(primary) -msgid "repoviewer" -msgstr "版本库浏览器" +#: source/TortoiseSVN_en.xml:11278(para) +msgid " don't close the dialog automatically" +msgstr " 不自动关闭对话框" -#: source/TortoiseSVN_en.xml:8728(para) -msgid "There are several web-based repository viewers available for use with Subversion such as ViewVC and WebSVN. TortoiseSVN provides a means to link with these viewers." -msgstr "有许多web为基础的版本库浏览器，例如ViewVC and WebSVN，TortoiseSVN提供了链接这些浏览器的方法。" +#: source/TortoiseSVN_en.xml:11283(para) +msgid " auto close if no errors" +msgstr " 如果没发生错误则自动关闭对话框" -#: source/TortoiseSVN_en.xml:8740(para) -msgid "You can integrate a repoviewer of your choice in TortoiseSVN. To do this, you have to define some properties which define the linkage. They must be set on Folders: ()" -msgstr "你可以通过TortoiseSVN选择集成一种版本库浏览器，为此，你需要定义一些链接的属性，必须设置在文件夹: ()" +#: source/TortoiseSVN_en.xml:11288(para) +msgid " auto close if no errors and conflicts" +msgstr " 如果没发生错误和冲突则自动关闭对话框" -#: source/TortoiseSVN_en.xml:8748(term) -msgid "webviewer:revision" -msgstr "webviewer:revision" +#: source/TortoiseSVN_en.xml:11293(para) +msgid " auto close if no errors, conflicts and merges" +msgstr "如果没有错误、冲突和合并，会自动关闭" -#: source/TortoiseSVN_en.xml:875(para) -msgid "Locking may create a false sense of security. Pretend that Harry locks and edits file A, while Sally simultaneously locks and edits file B. But suppose that A and B depend on one another, and the changes made to each are semantically incompatible. Suddenly A and B don't work together anymore. The locking system was powerless to prevent the problem - yet it somehow provided a sense of false security. It's easy for Harry and Sally to imagine that by locking files, each is beginning a safe, insulated task, and thus inhibits them from discussing their incompatible changes early on." -msgstr "锁定可能导致错误的安全状态。假设 Harry 锁定和编辑一个文件 A，同时 Sally 锁定并编辑文件 B，如果 A 和 B 互相依赖，这种变化是必须同时作的，这样 A 和 B 不能正确的工作了，锁定机制对防止此类问题将无能为力—从而产生了一种处于安全状态的假相。很容易想象 Harry 和 Sally 都以为自己锁住了文件，而且从一个安全，孤立的情况开始工作，因而没有尽早发现他们不匹配的修改。" +#: source/TortoiseSVN_en.xml:11298(para) +msgid " auto close if no errors, conflicts and merges for local operations" +msgstr "如果没有错误、冲突和合并，会自动关闭" -#: source/TortoiseSVN_en.xml:8750(para) -msgid "Set this property to the url of your repoviewer to view all changes in a specific revision. It must be properly URI encoded and it has to contain %REVISION%. %REVISION% is replaced with the revision number in question. This allows TortoiseSVN to display a context menu entry in the log dialog Context MenuView revision in webviewer" -msgstr "将这个属性设置为版本库浏览器显示所有本版本修改内容的url，它必须是URI编码的，也必须包含%REVISION%。在问题单中%REVISION%将会被替换成版本号。这允许TortoiseSVN在日志对话框的增加这样的条目右键菜单在版浏览器中查看此修订" +#: source/TortoiseSVN_en.xml:11272(para) +msgid "To close the progress dialog at the end of a command automatically without using the permanent setting you can pass the parameter. " +msgstr "如果想在进度对话框执行完毕后自动关闭，而又不必设置永久性的参数，可以传递参数。" -#: source/TortoiseSVN_en.xml:8767(term) -msgid "webviewer:pathrevision" -msgstr "webviewer:pathrevision" +#: source/TortoiseSVN_en.xml:11305(para) +msgid "The table below lists all the commands which can be accessed using the TortoiseProc.exe command line. As described above, these should be used in the form /command:abcd. In the table, the /command prefix is omitted to save space." +msgstr "下面的列表列出了所有可以使用TortoiseProc.exe访问的命令，就像上面的描述，必须使用/command:abcd的形式，在列表中，因为节省空间的关系省略了/command的前缀。" -#: source/TortoiseSVN_en.xml:8769(para) -msgid "Set this property to the url of your repoviewer to view changes to a specific file in a specific revision. It must be properly URI encoded and it has to contain %REVISION% and %PATH%. %PATH% is replaced with the path relative to the repository root. This allows TortoiseSVN to display a context menu entry in the log dialog Context MenuView revision and path in webviewer For example, if you right-click in the log dialog bottom pane on a file entry /trunk/src/file then the %PATH% in the url will be replaced with /trunk/src/file." -msgstr "设置" +#: source/TortoiseSVN_en.xml:11324(title) +msgid "List of available commands and options" +msgstr "有效命令及选项列表" -#: source/TortoiseSVN_en.xml:8816(title) -msgid "TortoiseSVN's Settings" -msgstr "TortoiseSVN的设置" +#: source/TortoiseSVN_en.xml:11330(entry) +msgid "Command" +msgstr "命令" -#: source/TortoiseSVN_en.xml:8818(primary) -msgid "settings" -msgstr "设置" +#: source/TortoiseSVN_en.xml:11337(entry) +msgid "Shows the About-dialog. This is also shown if no command is given." +msgstr "显示关于对话框。如果没有给命令也会显示。" -#: source/TortoiseSVN_en.xml:8820(para) -msgid "To find out what the different settings are for, just leave your mouse pointer a second on the editbox/checkbox... and a helpful tooltip will popup." -msgstr "想知道不同的设置是干什么用的，你只需将鼠标指针在编辑框/选项框上停留一秒钟...一个帮助提示气泡就会弹出来。" +#: source/TortoiseSVN_en.xml:11348(option) +msgid "/startrev:xxx" +msgstr "/startrev:xxx" -#: source/TortoiseSVN_en.xml:8829(title) -msgid "General Settings" -msgstr "常规设置" +#: source/TortoiseSVN_en.xml:11349(option) +msgid "/endrev:xxx" +msgstr "/endrev:xxx" -#: source/TortoiseSVN_en.xml:8831(primary) -msgid "sounds" -msgstr "声音" +#: source/TortoiseSVN_en.xml:11350(option) +msgid "/strict" +msgstr "/strict" -#: source/TortoiseSVN_en.xml:8833(para) -msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." -msgstr " 这个对话框允许你指定自己喜欢的语言，同时也可做那些与Subversion相关的特殊设置。" +#: source/TortoiseSVN_en.xml:11344(entry) +msgid "Opens the log dialog. The path specifies the file or folder for which the log should be shown. Three additional options can be set: , and " +msgstr "打开日志对话框，路径指定了日志显示的文件或目录，另外还有三个选项可以设置: 、和" + +#: source/TortoiseSVN_en.xml:11356(option) +#: source/TortoiseSVN_en.xml:11371(option) +#: source/TortoiseSVN_en.xml:11399(option) +#: source/TortoiseSVN_en.xml:11407(option) +#: source/TortoiseSVN_en.xml:11415(option) +#: source/TortoiseSVN_en.xml:11422(option) +#: source/TortoiseSVN_en.xml:11431(option) +#: source/TortoiseSVN_en.xml:11444(option) +#: source/TortoiseSVN_en.xml:11445(option) +#: source/TortoiseSVN_en.xml:11447(option) +#: source/TortoiseSVN_en.xml:11466(option) +#: source/TortoiseSVN_en.xml:11479(option) +#: source/TortoiseSVN_en.xml:11486(option) +#: source/TortoiseSVN_en.xml:11496(option) +#: source/TortoiseSVN_en.xml:11502(option) +#: source/TortoiseSVN_en.xml:11510(option) +#: source/TortoiseSVN_en.xml:11516(option) +#: source/TortoiseSVN_en.xml:11538(option) +#: source/TortoiseSVN_en.xml:11549(option) +#: source/TortoiseSVN_en.xml:11558(option) +#: source/TortoiseSVN_en.xml:11573(option) +#: source/TortoiseSVN_en.xml:11583(option) +#: source/TortoiseSVN_en.xml:11590(option) +#: source/TortoiseSVN_en.xml:11599(option) +#: source/TortoiseSVN_en.xml:11606(option) +#: source/TortoiseSVN_en.xml:11623(option) +msgid "/path" +msgstr "/path" -#: source/TortoiseSVN_en.xml:8835(title) -msgid "The Settings Dialog, General Page" -msgstr "设置对话框，常规设置页面" +#: source/TortoiseSVN_en.xml:11357(option) +msgid "/url" +msgstr "/url" -#: source/TortoiseSVN_en.xml:8843(term) -msgid "Language" -msgstr "语言" +#: source/TortoiseSVN_en.xml:11355(entry) +msgid "Opens the checkout dialog. The specifies the target directory and the specifies the URL to checkout from." +msgstr "打开检出对话框，指定了目标路径，而制定了检出的URL。" -#: source/TortoiseSVN_en.xml:8845(para) -msgid "Selects your user interface language. What else did you expect?" -msgstr "选择你TSVN的用户界面语言。不然你还期望从这里得到啥别的？" +#: source/TortoiseSVN_en.xml:11363(entry) +msgid "Opens the import dialog. The path specifies the directory with the data to import." +msgstr "打开导入对话框，路径制定了数据导入路径。" -#: source/TortoiseSVN_en.xml:8852(term) -msgid "Automatically check for newer versions every week" -msgstr "每周自动检查新版本" +#: source/TortoiseSVN_en.xml:11372(option) +msgid "/rev" +msgstr "/rev" -#: source/TortoiseSVN_en.xml:8854(para) -msgid "If checked, TortoiseSVN will contact its download site once a week to see if there is a newer version of the program available. Use Check now if you want an answer right away. The new version will not be downloaded; you simply receive an information dialog telling you that the new version is available." -msgstr "如果检查过，TSVN将每周联系它的下载站点一次，来看看程序是否有个可用的新版本。若你想马上得到结果，使用 立即检查 按钮。无论如何，新版本不会被自动下载，而只是你将收到一条提示信息对话框，告诉你有新版本可用。" +#: source/TortoiseSVN_en.xml:11375(option) +msgid "/rev:1234" +msgstr "/rev:1234" -#: source/TortoiseSVN_en.xml:8865(term) -msgid "System sounds" -msgstr "系统声音" +#: source/TortoiseSVN_en.xml:11376(option) +msgid "/nonrecursive" +msgstr "/nonrecursive" -#: source/TortoiseSVN_en.xml:8867(para) -msgid "TortoiseSVN has three custom sounds which are installed by default. You can select different sounds (or turn these sounds off completely) using the Windows Control Panel. Configure is a shortcut to the Control Panel." -msgstr "TSVN已经默认安装了三个自定义声音。 你可以使用Windows控制面板中的声音属性，来选择不同的声音(或是把这些声音完全关掉)。配置 按钮是一个打开控制面板声音属性的快捷方式。" +#: source/TortoiseSVN_en.xml:11377(option) +msgid "/ignoreexternals" +msgstr "/ignoreexternals" -#: source/TortoiseSVN_en.xml:8871(para) -msgid "Error" -msgstr "错误" +#: source/TortoiseSVN_en.xml:11370(entry) +msgid "Updates the working copy in to HEAD. If the option is given then a dialog is shown to ask the user to which revision the update should go. To avoid the dialog specify a revision number . Other options are and ." +msgstr "将工作副本的更新到HEAD，如果给定参数，就会弹出一个对话框询问用户需要更新到哪个修订版本。为了防止指定修订版本号的对话框，需要选项和。" -#: source/TortoiseSVN_en.xml:8876(para) -msgid "Notice" -msgstr "提示" +#: source/TortoiseSVN_en.xml:11388(option) +msgid "path" +msgstr "path" -#: source/TortoiseSVN_en.xml:8881(para) -msgid "Warning" -msgstr "警告" +#: source/TortoiseSVN_en.xml:11392(option) +msgid "/bugid:\"the bug id here\"" +msgstr "/bugid:\"the bug id here\"" -#: source/TortoiseSVN_en.xml:8893(term) -msgid "Global ignore pattern" -msgstr "全局忽略样式" +#: source/TortoiseSVN_en.xml:11382(entry) +msgid "Opens the commit dialog. The path specifies the target directory or the list of files to commit. You can also specify the /logmsg switch to pass a predefined log message to the commit dialog. Or, if you don't want to pass the log message on the command line, use /logmsgfile:path, where points to a file containing the log message. To prefill the bug ID box (in case you've set up integration with bugtrackers properly), you can use the to do that." +msgstr "打开提交对话框，路经指定了目标路径或需要提交的文件列表，你也可以使用参数/logmsg给提交窗口传递预定义的日志信息，或者你不希望将日志传递给命令行，你也可以使用/logmsgfile:path，指向了保存日志信息的文件。为了预先填入bug的ID(如果你设置了集成bug追踪属性)，你可以使用完成这个任务。" -#: source/TortoiseSVN_en.xml:8896(primary) -msgid "exclude pattern" -msgstr "排斥样式" +#: source/TortoiseSVN_en.xml:11398(entry) +msgid "Adds the files in to version control." +msgstr "将的文件添加到版本控制 。" -#: source/TortoiseSVN_en.xml:8899(primary) -msgid "global ignore" -msgstr "全局忽略" +#: source/TortoiseSVN_en.xml:11405(entry) +msgid "Reverts local modifications of a working copy. The tells which items to revert." +msgstr "恢复工作副本的本地修改，说明恢复哪些条目。" -#: source/TortoiseSVN_en.xml:8901(para) -msgid "Global ignore patterns are used to prevent unversioned files from showing up e.g. in the commit dialog. Files matching the patterns are also ignored by an import. Ignore files or directories by typing in the names or extensions. Patterns are separated by spaces e.g. */bin */obj *.bak *.~?? *.jar *.[Tt]mp. Remember that these patterns may be used against paths which include N levels of parent directory. Setting ignore patterns for anything other than simple file extensions is not as trivial as it first appears, so be sure to read for more information on the pattern-matching syntax, and how paths are checked." -msgstr "全局忽略模式被用来防止非版本控制的文件在例如提交时的对话框中被列出来。那些符合模式的文件，在执行导入操作时同样被忽略。通过在模式框中输入文件名或扩展名来忽略文件或文件夹。不同的模式之间以空格分隔，例如 */bin */obj *.bak *.~?? *.jar *.[Tt]mp。请记得这些模式可以用来处理含有 N 级父目录的路径。设置忽略模式并非象刚才显示的那么简单，所以请务必阅读 以获得更多模式匹配语法信息，和如何检查路径。" +#: source/TortoiseSVN_en.xml:11413(entry) +msgid "Cleans up interrupted or aborted operations and unlocks the working copy in ." +msgstr "清理中断和终止的操作，将工作副本的解锁。" -#: source/TortoiseSVN_en.xml:8915(para) -msgid "Note that the ignore patterns you specify here will also affect other Subversion clients running on your PC, including the command line client." -msgstr "值得注意的是，你在这里指定的忽略样式将同样作用于你本机上的其他Subversion客户端，包括命令行客户端。" +#: source/TortoiseSVN_en.xml:11423(option) +#: source/TortoiseSVN_en.xml:11489(option) +#: source/TortoiseSVN_en.xml:11616(option) +msgid "/noquestion" +msgstr "/noquestion" -#: source/TortoiseSVN_en.xml:8921(para) -msgid "If you use the Subversion configuration file to set a global-ignores pattern, it will override the settings you make here. The Subversion configuration file is accessed using the Edit as described below." -msgstr "如果你象下面段落那样使用Subversion配置文件来设置一个 全局－忽略 样式，那么它将覆盖你在这里做的设置。该Subversion配置文件可以象下面段落描述的那样，通过 编辑 按钮来访问。" +#: source/TortoiseSVN_en.xml:11420(entry) +msgid "Marks a conflicted file specified in as resolved. If is given, then resolving is done without asking the user first if it really should be done." +msgstr "将指定文件的冲突标示为解决，如果给定，解决不会向用户确认操作。" -#: source/TortoiseSVN_en.xml:8929(para) -msgid "This ignore pattern will affect all your projects. It is not versioned, so it will not affect other users. By contrast you can also use the versioned svn:ignore property to exclude files or directories from version control. Read for more information." -msgstr "忽略样式将作用于你所有的项目工程。因为它是非版本控制的，所以它将不会对其他的用户起作用。相对而言，你也可以使用可版本控制的 svn:ignore 属性来把要忽略的文件或文件夹排斥在版本控制之外。阅读 以获得更多信息。" +#: source/TortoiseSVN_en.xml:11430(entry) +msgid "Creates a repository in " +msgstr "在创建一个版本库。" -#: source/TortoiseSVN_en.xml:893(title) source/TortoiseSVN_en.xml:921(title) -msgid "The Copy-Modify-Merge Solution" -msgstr "复制-修改-合并 方案" +#: source/TortoiseSVN_en.xml:11436(entry) +msgid "Opens the switch dialog. The path specifies the target directory." +msgstr "打开选项对话框。路径参数指定目标目录。" -#: source/TortoiseSVN_en.xml:894(para) -msgid "Subversion, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." -msgstr "Subversion，CVS 和一些版本控制系统使用复制-修改-合并模型，在这种模型里，每一个客户读取项目版本库建立一个私有工作副本—版本库中文件和目录的本地映射。用户并行工作，修改各自的工作副本，最终，各个私有的复制合并在一起，成为最终的版本，这种系统通常可以辅助合并操作，但是最终要靠人工去确定正误。" +#: source/TortoiseSVN_en.xml:11443(entry) +msgid "Exports the working copy in to another directory. If the points to an unversioned directory, a dialog will ask for an URL to export to the dir in ." +msgstr "将的工作副本导出到另一个目录，如果指向另一个未版本控制目录，对话框会询问要导出到的URL。" -#: source/TortoiseSVN_en.xml:8941(term) -msgid "Set filedates to the \"last commit time\"" -msgstr "将文件日期设置为“最后提交时间”" +#: source/TortoiseSVN_en.xml:11456(option) +msgid "/mergefrom:xxx" +msgstr "/mergefrom:xxx" -#: source/TortoiseSVN_en.xml:8943(para) -msgid "This option tells TortoiseSVN to set the filedates to the last commit time when doing a checkout or an update. Otherwise TortoiseSVN will use the current date. If you are developing software it is generally best to use the current date because build systems normally look at the datestamps to decide which files need compiling. If you use \"last commit time\" and revert to an older file revision, your project may not compile as you expect it to." -msgstr "该选项通知TSVN在做检出或更新操作时，把文件日期设置为最后提交的时间。否则TSVN将使用当前日期。如果你在做软件开发的话，使用当前日期是总体上最好的选择，因为那些软件构建器通常通过查看时间戳来决定需要编译哪些文件。如果你使用了“最后提交时间”并把代码文件还原到了一个旧版本，你的工程可能就不会像你期望的那样被编译了。" +#: source/TortoiseSVN_en.xml:11457(option) +msgid "/mergeto:xxx" +msgstr "/mergeto:xxx" -#: source/TortoiseSVN_en.xml:8957(term) -msgid "Subversion configuration file" -msgstr "Subversion配置文件" +#: source/TortoiseSVN_en.xml:11458(option) +msgid "/fromurl:URL" +msgstr "/fromurl:URL" -#: source/TortoiseSVN_en.xml:8959(para) -msgid "Use Edit to edit the Subversion configuration file directly. Some settings cannot be modified directly by TortoiseSVN, and need to be set here instead. For more information about the Subversion config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Subversion can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." -msgstr "使用 编辑 按钮来直接编译Subversion配置文件。有些设置不能被TSVN直接修改，就需要在这里完成。可以阅读 运行时配置 来获得有关Subversion 配置 文件的更多信息。在 设置自动属性 中的章节介绍了可以在这里配置的特殊偏好部分。值得注意的是，Subversion可以从许多不同的位置读取配置信息，因此你也就需要了解哪一个将优先起作用。阅读 配置与Windows注册表 来获取更多信息。" +#: source/TortoiseSVN_en.xml:11452(entry) +msgid "Opens the merge dialog. The path specifies the target directory. Three additional options can be set: , and . These pre-fill the relevant fields in the merge dialog." +msgstr "打开合并对话框，路经指定了目标目录，可以设置另外三个参数: 、和，这些值将会预先填入相关的字段。" -#: source/TortoiseSVN_en.xml:8984(term) -msgid "Use \"_svn\" instead of \".svn\" directories" -msgstr "使用“_svn”目录替代“.svn”目录" +#: source/TortoiseSVN_en.xml:11464(entry) +msgid "Brings up the branch/tag dialog. The is the working copy to branch/tag from." +msgstr "带来branch/tag对话框，是branch/tag在工作副本中的出处。" -#: source/TortoiseSVN_en.xml:8986(para) -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." -msgstr "在使用VS.NET环境做web工程时，将无法处理 .svn 文件夹，但Subversion是要用这些文件夹来储存自己的内部信息的。这可不是Subversion的bug，这bug是VS.NET和它使用的frontpage扩展带来的。阅读 来获得有关此问题的更多信息。" +#: source/TortoiseSVN_en.xml:11472(entry) +msgid "Opens the settings dialog." +msgstr "打开设置对话框。" -#: source/TortoiseSVN_en.xml:8993(para) -msgid "If you want to change the behaviour of Subversion and TortoiseSVN, you can use this checkbox to set the environment variable which controls this." -msgstr "若你想改变Subversion和TSVN的这些行为，就可以使用这个选项框来设置控制这些的环境变量。" +#: source/TortoiseSVN_en.xml:11478(entry) +msgid "Removes the file(s) in from version control." +msgstr "从版本控制里移除中的文件。" -#: source/TortoiseSVN_en.xml:8998(para) -msgid "You should note that changing this option will not automatically convert existing working copies to use the new admin directory. You will have to do that yourself using a script (See our FAQ) or simply check out a fresh working copy." -msgstr "你应该注意到: 改变该选项将不会使已存在的工作副本中的管理文件夹从“_svn”自动转换到“.svn”。你需要使用一个脚本(查看我们的FAQ)来自行完成这项工作，或是简单地重新检出一个新的工作副本。" +#: source/TortoiseSVN_en.xml:11485(entry) +msgid "Renames the file in . The new name for the file is asked with a dialog. To avoid the question about renaming similar files in one step, pass ." +msgstr "重命名的文件，会在对话框中询问新文件，为了防止一个步骤中询问相似文件，传递。" -#: source/TortoiseSVN_en.xml:90(para) -msgid "The Introduction explains what TortoiseSVN is, what it does, where it comes from and the basics for installing it on your PC." -msgstr "在简介一章里解释了 TortoiseSVN 是什么，能够做什么，它的开发过程以及安装相关的基础知识。" +#: source/TortoiseSVN_en.xml:11498(option) +#: source/TortoiseSVN_en.xml:11500(option) +msgid "/path2" +msgstr "/path2" -#: source/TortoiseSVN_en.xml:9009(title) -msgid "Look and Feel Settings" -msgstr "外观与样式设置" +#: source/TortoiseSVN_en.xml:11494(entry) +msgid "Starts the external diff program specified in the TortoiseSVN settings. The specifies the first file. If the option is set, then the diff program is started with those two files. If is ommitted, then the diff is done between the file in and its BASE." +msgstr "启动TortoiseSVN设置的外置比较程序，指定了第一个文件，如果设置了，比较程序会启动两个文件，如果省略，比较程序会比较和它的BASE。" -#: source/TortoiseSVN_en.xml:9011(para) -msgid " This page allows you to specify which of the TortoiseSVN context menu entries will show up in the main context menu, and which will appear in the TortoiseSVN submenu. By default most items are unchecked and appear in the submenu." -msgstr " 该页面允许你指定: 在TortoiseSVN的主上下文菜单中哪些条目可以直接在鼠标右键菜单显示，哪些在TortoiseSVN子菜单显示。默认情况下很多项未被勾选，只在子菜单显示。" +#: source/TortoiseSVN_en.xml:11507(entry) +msgid "Starts the conflicteditor specified in the TortoiseSVN settings with the correct files for the conflicted file in ." +msgstr "打开TortoiseSVN设置的冲突工具，在中需要设置冲突文件的正确文件。" -#: source/TortoiseSVN_en.xml:9013(title) source/TortoiseSVN_en.xml:9094(title) -msgid "The Settings Dialog, Look and Feel Page" -msgstr "设置对话框，外观与样式页面" +#: source/TortoiseSVN_en.xml:11515(entry) +msgid "Opens the relocate dialog. The specifies the working copy path to relocate." +msgstr "打开重定位对话框，指定了重定位的工作副本路径。" -#: source/TortoiseSVN_en.xml:9021(para) -msgid "There is a special case for Get Lock. You can of course promote it to the top level using the list above, but as most files don't need locking this just adds clutter. However, a file with the svn:needs-lock property needs this action every time it is edited, so in that case it is very useful to have at the top level. Checking the box here means that when a file is selected which has the svn:needs-lock property set, Get Lock will always appear at the top level." -msgstr "获得锁会有一个特别的情况，你可以将其提升到顶级带但，但是大多数文件不需要锁定，这样做只是添加了混乱。然而，一个标记为svn:needs-lock属性的文件每次编辑前都需要那个操作，所以这个菜单会进入顶级菜单会比较方便。选定这个选项，会使设置svn:needs-lock属性的文件的Get Lock出现在顶级菜单中。" +#: source/TortoiseSVN_en.xml:11522(entry) +msgid "Opens the help file." +msgstr "打开帮助文件" -#: source/TortoiseSVN_en.xml:9031(para) -msgid "If you have a very large number of files in your working copy folders, it can take a long time before the context menu appears when you right click on a folder. This is because Subversion fetches the status for all files when you ask for folder status. To avoid this delay you can uncheck the Fetch status for context menu box. Be warned that the context menu for folders will not always be correct, and may include items which should not really be there. For example, you will see TortoiseSVNShow Log for an Added folder, which will not work because the folder is not yet in the repository." -msgstr "如果在你的工作副本下有大量的文件，那么你 右键点击 该文件夹的时候将花费较长的时间使上下文菜单显示出来。这是因为在你查询文件夹状态的时候，Subversion要去获取其下所有文件的状态。你可以在这里取消对 为右键菜单获取SVN状态 选项的勾选以避免这种延迟。要注意的是，文件夹的上下文菜单有时不太正确，可能会包含一些本来不该在那儿的条目。举个例子，右键点击一个新 添加 的文件夹，你可能会看到 TortoiseSVN显示日志 的操作选项，但那个是不会起作用的，因为该文件夹还没真正提交到版本库里。" +#: source/TortoiseSVN_en.xml:11528(entry) +msgid "Opens the check-for-modifications dialog. The path specifies the working copy directory." +msgstr "打开为修改检出对话框，路经指定了工作副本目录。" -#: source/TortoiseSVN_en.xml:9048(para) -msgid "The option Enable accelerators on the top level menu has three states: " -msgstr "选项 使用顶级菜单的快捷键 有三种状态: " +#: source/TortoiseSVN_en.xml:11540(option) +#: source/TortoiseSVN_en.xml:11542(option) +msgid "/rev:xxx" +msgstr "/rev:xxx" -#: source/TortoiseSVN_en.xml:9053(term) -msgid "Unchecked (default)" -msgstr "未勾选(默认)" +#: source/TortoiseSVN_en.xml:11535(entry) +msgid "Starts the repository browser dialog, pointing to the URL of the working copy given in or points directly to an URL. An additional option can be used to specify the revision which the repository browser should show. If the is omitted, it defaults to HEAD." +msgstr "打开版本库浏览对话框，URL为工作副本指向的或直接指出的，另外一个选项是，可以用来指定要显示的修订版本号，如果省略，缺省是HEAD。" -#: source/TortoiseSVN_en.xml:9055(para) -msgid "In this state the menu items are all drawn by TortoiseSVN. No accelerator keys are shown." -msgstr "这种状态下，菜单项全部是由TSVN画出的，不会显示任何快捷键。" +#: source/TortoiseSVN_en.xml:11548(entry) +msgid "Adds all targets in to the ignore list, i.e. adds the svn:ignore property to those files." +msgstr "将中的对象加入到忽略列表，也就是将这些文件添加到svn:ignore属性。" -#: source/TortoiseSVN_en.xml:906(para) -msgid "Here's an example. Say that Harry and Sally each create working copies of the same project, copied from the repository. They work concurrently, and make changes to the same file \"A\" within their copies. Sally saves her changes to the repository first. When Harry attempts to save his changes later, the repository informs him that his file A is out-of-date. In other words, that file A in the repository has somehow changed since he last copied it. So Harry asks his client to merge any new changes from the repository into his working copy of file A. Chances are that Sally's changes don't overlap with his own; so once he has both sets of changes integrated, he saves his working copy back to the repository." -msgstr "这是一个例子，Harry 和 Sally 为同一个项目各自建立了一个工作副本，工作是并行的，修改了同一个文件 A，Sally 首先保存修改到版本库，当 Harry 想去提交修改的时候，版本库提示文件 A 已经过期，换句话说，A 在他上次更新之后已经更改了，所以当他通过客户端请求合并版本库和他的工作副本之后，碰巧 Sally 的修改和他的不冲突，所以一旦他把所有的修改集成到一起，他可以将工作副本保存到版本库。" +#: source/TortoiseSVN_en.xml:11559(option) +msgid "startrev" +msgstr "startrev" -#: source/TortoiseSVN_en.xml:9062(term) -msgid "Checked" -msgstr "已勾选" +#: source/TortoiseSVN_en.xml:11560(option) +msgid "endrev" +msgstr "endrev" -#: source/TortoiseSVN_en.xml:9064(para) -msgid "This activates the accelerators for TortoiseSVN commands, but of course these may conflict with the accelerators for anything else in the explorer context menu. Pressing the shortcut key multiple times will cycle through the matching context menu items. In this state, the menu items are drawn by Windows which makes the icons look ugly." -msgstr "这种状态激活了TSVN命令的快捷键，但这些与浏览器右键菜单中的其他快捷键显然存在起冲突的可能。多次按下快捷键将循环匹配右键菜单中共享同个快捷键的条目。这种状态下，菜单项是被Windows画出来的，而且看上去丑的要命。" +#: source/TortoiseSVN_en.xml:11564(option) +msgid "/line:nnn" +msgstr "/line:nnn" -#: source/TortoiseSVN_en.xml:9075(term) -msgid "Indeterminate" -msgstr "半勾选(灰色)" +#: source/TortoiseSVN_en.xml:11556(entry) +msgid "Opens the blame dialog for the file specified in . If the options and are set, then the dialog asking for the blame range is not shown but the revision values of those options are used instead. If the option is set, TortoiseBlame will open with the specified line number showing." +msgstr "打开指定文件的追溯对话框，如果设置了和，对话框询问追溯范围的对话框不会显示，如果设置了，TortoiseBlame会打开特定文件的某一行。" -#: source/TortoiseSVN_en.xml:9077(para) -msgid "In this mode the accelerator keys are active and the menu items are drawn in text only mode without icons." -msgstr "这种模式下快捷键被激活，同时菜单项将以纯文本的形式被画出，不显示任何图标。" +#: source/TortoiseSVN_en.xml:11574(option) +msgid "/savepath:path" +msgstr "/savepath:path" -#: source/TortoiseSVN_en.xml:9084(para) -msgid "Windows Vista has an improved user interface for context menu entries, which means that ownerdrawn icons are not required. This option is therefore not shown in Vista as we can have both pretty icons and accelerators :-)" -msgstr "Windows Vista 提供了上下文菜单的改良接口，从而不再需要自我绘制图标。由于我们已经具有漂亮的图标和加速键，此选项不在Vista中出现:-)" +#: source/TortoiseSVN_en.xml:11575(option) +msgid "/revision:xxx" +msgstr "/revision:xxx" -#: source/TortoiseSVN_en.xml:9090(title) -msgid "Icon Overlay Settings" -msgstr "图标叠加设置" +#: source/TortoiseSVN_en.xml:11571(entry) +msgid "Saves a file from an URL or working copy path given in to the location given in . The revision is given in . This can be used to get a file with a specific revision." +msgstr "将指定的工作副本或URL的文件保存到，修订版本号在，这样可以得到特定修订版本的文件。" -#: source/TortoiseSVN_en.xml:9092(para) -msgid " This page allows you to choose the items for which TortoiseSVN will display icon overlays. Network drives can be very slow, so by default icons are not shown for working copies located on network shares. You can even disable all icon overlays, but where's the fun in that?" -msgstr " 此页面允许你选择TSVN为哪些条目显示图标覆盖。选择网络磁盘可能会非常慢，所以默认情况下不为定位于网络共享中的工作副本显示图标覆盖。你甚至可以取消所有的图标覆盖，但那样做还剩下什么好玩儿的呢？" +#: source/TortoiseSVN_en.xml:11581(entry) +msgid "Creates a patch file for the path given in ." +msgstr "创建下的补丁文件。" -#: source/TortoiseSVN_en.xml:9102(para) -msgid "USB Flash drives appear to be a special case in that the drive type is identified by the device itself. Some appear as fixed drives, and some as removable drives." -msgstr "USB闪存看上去是个特殊情况，因为驱动类型是设备自主标识的。于是有些显示为固定驱动器，而有些显示为可移动磁盘。" +#: source/TortoiseSVN_en.xml:11588(entry) +msgid "Shows the revision graph for the path given in ." +msgstr "显示目录下的版本变化图。" -#: source/TortoiseSVN_en.xml:9107(para) -msgid "By default, overlay icons will appear in all open/save dialogs as well as in Windows Explorer. If you want them to appear only in Windows Explorer, check the Show overlays only in explorer box." -msgstr "默认情况下，图标覆盖将不止显示在Windows资源浏览器下，同样会显示在所有的打开/保存对话框里。如果你想让它们 仅仅 显示在Windows资源浏览器下，勾选 仅在资源管理器中显示图标覆盖 选项。" +#: source/TortoiseSVN_en.xml:11595(entry) +msgid "Locks a file or all files in a directory. The 'lock' dialog is shown so the user can enter a comment for the lock. " +msgstr "锁定一个文件或一个目录内的所有文件。它会显示‘锁定’对话框，所以用户可以为锁定输入注释。" -#: source/TortoiseSVN_en.xml:9113(para) -msgid "Since it takes quite a while to fetch the status of a working copy, TortoiseSVN uses a cache to store the status in so the explorer doesn't get hogged too much when showing the overlays. You can choose which type of cache TortoiseSVN should use according to your system and working copy size here: " -msgstr "因为它要花费一段时间来获取工作副本的状态，TSVN将使用一个缓存来存储这些状态，从而使浏览器在显示图标覆盖时，资源占用的不太厉害。你可以根据你的系统和工作副本的大小来在这里选择让TSVN使用哪种类型的缓存: " +#: source/TortoiseSVN_en.xml:11604(entry) +msgid "Unlocks a file or all files in a directory.. " +msgstr "解锁一个文件或一个目录内的所有文件... " -#: source/TortoiseSVN_en.xml:9121(term) -msgid "Default" -msgstr "默认" +#: source/TortoiseSVN_en.xml:11611(entry) +msgid "Rebuilds the windows icon cache. Only use this in case the windows icons are corrupted. A side effect of this (which can't be avoided) is that the icons on the desktop get rearranged. " +msgstr "重建windows的图标缓存，只有windows的图标缓存出了问题才需要这样做，一个副作用就是(不可避免)桌面的图标会重新组织。" -#: source/TortoiseSVN_en.xml:9123(para) -msgid "Caches all status information in a separate process (TSVNCache.exe). That process watches all drives for changes and fetches the status again if files inside a working copy get modified. The process runs with the least possible priority so other programs don't get hogged because of it. That also means that the status information is not realtime but it can take a few seconds for the overlays to change." -msgstr "把所有状态信息缓存在一个独立进程中(TSVNCache.exe)。该进程监视所有驱动器的更改，并在工作副本中的文件被修改时重新获取其状态。该进程以最低优先级运行，所以其他程序不会被它挤兑。这同样意味着状态信息并不是 实时 的，因为它需要几秒钟时间处理图标覆盖的变化。" +#: source/TortoiseSVN_en.xml:11621(entry) +msgid "Shows the properties dialog for the path given in ." +msgstr "显示 给出的路径之属性对话框。" -#: source/TortoiseSVN_en.xml:9134(para) -msgid "Advantage: the overlays show the status recursively, i.e. if a file deep inside a working copy is modified, all folders up to the working copy root will also show the modified overlay. And since the process can send notifications to the shell, the overlays on the left treeview usually change too." -msgstr "优点: 图标覆盖递归地显示状态，就是说，如果一个处在工作副本深处的文件被修改了，所有途径的文件夹包括工作副本的根目录都会显示出修改的图标覆盖。也因为该进程可以向Windows外壳发送通知，资源管理器左面的树形图通常也会更改。" +#: source/TortoiseSVN_en.xml:11630(para) +msgid "" +"Examples (which should be entered on one line): \n" +"TortoiseProc.exe /command:commit /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n" +" /logmsg:\"test log message\" /closeonend\n" +"\n" +"TortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend\n" +"\n" +"TortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n" +" /startrev:50 /endrev:60 /closeonend\n" +"" +msgstr "" +"例子(必须在一行输入): \n" +"TortoiseProc.exe /command:commit /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n" +" /logmsg:\"test log message\" /closeonend\n" +"\n" +"TortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend\n" +"\n" +"TortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n" +" /startrev:50 /endrev:60 /closeonend\n" +"" -#: source/TortoiseSVN_en.xml:9142(para) -msgid "Disadvantage: the process runs constantly, even if you're not working on your projects. It also uses around 10-50 MB of RAM depending on number and size of your working copies." -msgstr "缺点: 即使你已经不在项目下工作了，该进程仍然持续运行。取决于你工作副本的数量和大小，它将占用10-50 MB的RAM内存空间。" +#: source/TortoiseSVN_en.xml:11645(title) +msgid "Command Line Interface Cross Reference" +msgstr "命令行交叉索引" -#: source/TortoiseSVN_en.xml:9150(term) -msgid "Shell" -msgstr "Windows外壳" +#: source/TortoiseSVN_en.xml:11647(primary) +msgid "command line client" +msgstr "命令行客户端" -#: source/TortoiseSVN_en.xml:9152(para) -msgid "Caching is done directly inside the shell extension dll, but only for the currently visible folder. Each time you navigate to another folder, the status information is fetched again." -msgstr "缓存在外壳扩展dll中直接完成，但仅仅是为那些当前可见的文件夹。每次你浏览到其他文件夹，状态信息就会被重新获取。" +#: source/TortoiseSVN_en.xml:11650(primary) +msgid "CLI" +msgstr "CLI" -#: source/TortoiseSVN_en.xml:9158(para) -msgid "Advantage: needs only very little memory (around 1 MB of RAM) and can show the status in realtime." -msgstr "优点: 仅仅需要很少的内存(大约1 MB)，并且可以 实时 显示状态。" +#: source/TortoiseSVN_en.xml:11653(para) +msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseSVN is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseSVN's GUI operations." +msgstr "有时候，本手册会参考Subversion的文档，会以命令行方式(CLI)描述Subversion术语，为了理解TortoiseSVN后台的操作，我们编辑了一份列表，用来展示命令行命令和对应的TortoiseSVN的GUI操作的关系。" -#: source/TortoiseSVN_en.xml:9162(para) -msgid "Disadvantage: Since only one folder is cached, the overlays don't show the status recursively. For big working copies, it can take more time to show a folder in explorer than with the default cache. Also the mime-type column is not available." -msgstr "缺点: 因为仅有一个文件夹被缓存，图标覆盖不会递归地显示状态。在大一些的工作副本下，它在浏览器中显示一个文件夹将比默认缓存模式花费更多时间。而且 mime-type 列将无效。" +#: source/TortoiseSVN_en.xml:11662(para) +msgid "Even though there are CLI equivalents to what TortoiseSVN does, remember that TortoiseSVN does not call the CLI but uses the Subversion library directly." +msgstr "即使有命令行对应TortoiseSVN的操作，请记住TortoiseSVN没有调用命令行，而是直接使用了Subversion库。" -#: source/TortoiseSVN_en.xml:9172(term) -msgid "None" -msgstr "无" +#: source/TortoiseSVN_en.xml:11668(para) +msgid "If you think you have found a bug in TortoiseSVN, we may ask you to try to reproduce it using the CLI, so that we can distinguish TSVN issues from Subversion issues. This reference tells you which command to try." +msgstr "如果你发现了TortoiseSVN的bug，我们会希望你能用命令行重现它，这样我们可以区分这是TSVN还是Subversion的问题，这个参考告诉你该找那个命令。" -#: source/TortoiseSVN_en.xml:9174(para) -msgid "With this setting, the TortoiseSVN does not fetch the status at all in Explorer. Because of that, files don't get an overlay and folders only get a 'normal' overlay if they're versioned. No other overlays are shown, and no extra columns are available either." -msgstr "在这种设置下，TSVN在浏览器里就完全不去获取状态了。因此，版本控制下的文件将不会获得任何图标覆盖。文件夹也仅仅有个“正常”状态的图标覆盖，其他的不会显示，也不会有其他额外的列可用。" +#: source/TortoiseSVN_en.xml:11676(title) +msgid "Conventions and Basic Rules" +msgstr "约定和基本规则" -#: source/TortoiseSVN_en.xml:9181(para) -msgid "Advantage: uses absolutely no additional memory and does not slow down the Explorer at all while browsing." -msgstr "优点: 绝对不会占用任何额外的内存，也完全不会减慢浏览器的浏览速度。" +#: source/TortoiseSVN_en.xml:11677(para) +msgid "In the descriptions which follow, the URL for a repository location is shown simply as URL, and an example might be http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk. The working copy path is shown simply as PATH, and an example might be C:\\TortoiseSVN\\trunk." +msgstr "在这个描述里，版本库位置URL使用URL显示，一个例子是http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk，工作副本使用PATH显示，一个例子是C:\\TortoiseSVN\\trunk。" -#: source/TortoiseSVN_en.xml:9185(para) -msgid "Disadvantage: Status information of files and folders is not shown in Explorer. To see if your working copies are modified, you have to use the \"Check for modifications\" dialog." -msgstr "缺点: 文件、文件夹的状态信息不会显示在浏览器中。要获知你的工作副本是否被修改了，你需要使用“检查更新”对话框。" +#: source/TortoiseSVN_en.xml:11687(para) +msgid "Because TortoiseSVN is a Windows Shell Extension, it is not able to use the notion of a current working directory. All working copy paths must be given using the absolute path, not a relative path." +msgstr "因为TortoiseSVN是一个Windows外壳扩展，它不能使用当前工作副本的概念，所有的工作副本必须使用绝对路径，而不是相对的。" -#: source/TortoiseSVN_en.xml:9194(para) -msgid "If you select the default option, you can also choose to mark folders as modified if they contain unversioned items. This could be useful for reminding you that you have created new files which are not yet versioned." -msgstr "若你选择了默认选项，将同样决定如下选择: 在文件夹包含非版本控制的项目时，把文件夹图标覆盖标记为已修改。这个有用的设置可以提醒你已经创建了非版本控制的新文件。" +#: source/TortoiseSVN_en.xml:11694(para) +msgid "Certain items are optional, and these are often controlled by checkboxes or radio buttons in TortoiseSVN. These options are shown in [square brackets] in the command line definitions." +msgstr "特定项目是可选的，TortoiseSVN里这是通过多选项和单选项控制的，这些选项是在命令行定义的[方括号]里显示的。" -#: source/TortoiseSVN_en.xml:9199(para) -msgid "The Exclude Paths are used to tell TortoiseSVN those paths for which it should not show icon overlays and status columns. This is useful if you have some very big working copies containing only libraries which you won't change at all and therefore don't need the overlays. For example:" -msgstr "排除路径 是被用来告诉TSVN 不用 在哪些路径下显示图标覆盖和状态列。如果你有些很大的工作副本，而这些工作副本仅仅包含你完全不想改变的库文件，从而你也不需要显示图标覆盖，这时该功能将会很有用。举个例子: " +#: source/TortoiseSVN_en.xml:11703(title) +#: source/TortoiseSVN_en.xml:12205(glossterm) +msgid "Checkout" +msgstr "检出" -#: source/TortoiseSVN_en.xml:9207(para) -msgid "f:\\development\\SVN\\Subversion will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." -msgstr "填写 f:\\development\\SVN\\Subversion 将 仅仅 在这个特殊文件夹上取消图标覆盖。 你仍然可以在该路径下的所有文件、文件夹上看到图标覆盖。" +#: source/TortoiseSVN_en.xml:11704(screen) +#, no-wrap +msgid "" +"\n" +"svn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n" +msgstr "" +"\n" +"svn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n" -#: source/TortoiseSVN_en.xml:9212(para) -msgid "f:\\development\\SVN\\Subversion* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Subversion. That means you won't see overlays for any files and folders below that path." -msgstr "填写 f:\\development\\SVN\\Subversion* 将在路径以 f:\\development\\SVN\\Subversion 开始的 所有 文件和文件夹上取消图标覆盖。这意味着你在该路径下的任何文件/文件夹上都将看不到图标覆盖了。" +#: source/TortoiseSVN_en.xml:11707(para) +msgid "If Only checkout the top folder is checked, use the -N switch." +msgstr "如果希望只检出顶级目录被选中，使用-N选项。" -#: source/TortoiseSVN_en.xml:9219(para) -msgid "The same applies to the Include Paths. Except that for those paths the overlays are shown even if the overlays are disabled for that specific drive type, or by an exclude path specified above." -msgstr "包含路径 也使用同样的语法。除了有些反例: 即使该路径处在某个取消图标覆盖显示的特定驱动类型下，或是处在上面的排除路径之下， 也依然会显示图标覆盖。" +#: source/TortoiseSVN_en.xml:11711(para) source/TortoiseSVN_en.xml:11754(para) +msgid "If Omit externals is checked, use the --ignore-externals switch." +msgstr "如果希望忽略外部被选中，使用--ignore-externals选型。" -#: source/TortoiseSVN_en.xml:9224(para) -msgid "TSVNCache.exe also uses these paths to restrict its scanning. If you want it to look only in particular folders, disable all drive types and include only the folders you specifically want to be scanned." -msgstr "TSVNCache.exe 同样使用这些路径来限制它的扫描。如果你想让它仅仅在某些特定文件夹里监视，就取消所有的驱动器类型，并仅仅包含你允许被扫描的文件夹。" +#: source/TortoiseSVN_en.xml:11715(para) +msgid "If you are checking out a specific revision, specify that after the URL using -r switch." +msgstr "如果你正在检出特定的修订版本，在URL后使用-r指定。" -#: source/TortoiseSVN_en.xml:9231(title) -msgid "Icon Set Selection" -msgstr "图标集选择" +#: source/TortoiseSVN_en.xml:11721(title) +#: source/TortoiseSVN_en.xml:12511(glossterm) +msgid "Update" +msgstr "更新" -#: source/TortoiseSVN_en.xml:9233(para) -msgid " You can change the overlay icon set to the one you like best. Note that if you change overlay set, you may have to restart your computer for the changes to take effect." -msgstr " 你可以选择你最喜欢的覆盖图标集。要注意的是，倘若改变了覆盖图标集，你可能需要重启计算机使更改生效。" +#: source/TortoiseSVN_en.xml:11722(screen) +#, no-wrap +msgid "" +"\n" +"svn info URL_of_WC\n" +"svn update [-r rev] PATH\n" +msgstr "" +"\n" +"svn info URL_of_WC\n" +"svn update [-r rev] PATH\n" -#: source/TortoiseSVN_en.xml:9235(title) -msgid "The Settings Dialog, Icon Set Page" -msgstr "设置对话框，图标集页面" +#: source/TortoiseSVN_en.xml:11726(para) +msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseSVN first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." +msgstr "更新多个项目在Subversion还不是原子操作，所以TortoiseSVN会首先找到版本库的HEAD修订版本，然后将所有项目更新到特定修订版本，防止出现混合修订版本的工作副本。" -#: source/TortoiseSVN_en.xml:9244(title) -msgid "TortoiseSVN Dialog Settings 1" -msgstr "TSVN对话框设置一" +#: source/TortoiseSVN_en.xml:11733(para) +msgid "If only one item is selected for updating or the selected items are not all from the same repository, TortoiseSVN just updates to HEAD." +msgstr "如果只有一个项目被选中更新，或选中的项目来自不同的版本库，TortoiseSVN只会更新到HEAD。" -#: source/TortoiseSVN_en.xml:9246(para) -msgid " This dialog allows you to configure some of TortoiseSVN's dialogs the way you like them." -msgstr " 此对话框允许你按照喜欢的方式去配置一些TSVN的对话框。" +#: source/TortoiseSVN_en.xml:11738(para) +msgid "No command line options are used here. Update to revision also implements the update command, but offers more options." +msgstr "没有使用命令行选项，更新到修订版本也实现了更新命令，但提供了更多的选项。" -#: source/TortoiseSVN_en.xml:9248(title) -msgid "The Settings Dialog, Dialogs 1 Page" -msgstr "设置对话框，对话框一页面" +#: source/TortoiseSVN_en.xml:11745(title) +msgid "Update to Revision" +msgstr "更新到版本" -#: source/TortoiseSVN_en.xml:925(title) -msgid "...Copy-Modify-Merge Continued" -msgstr "复制-修改-合并 方案(续)" +#: source/TortoiseSVN_en.xml:11746(screen) +#, no-wrap +msgid "" +"\n" +"svn info URL_of_WC\n" +"svn update [-r rev] [-N] [--ignore-externals] PATH\n" +msgstr "" +"\n" +"svn info URL_of_WC\n" +"svn update [-r rev] [-N] [--ignore-externals] PATH\n" -#: source/TortoiseSVN_en.xml:9256(term) -msgid "Default number of log messages" -msgstr "默认的日志信息数" +#: source/TortoiseSVN_en.xml:11750(para) +msgid "If Only update the top folder is checked, use the -N switch." +msgstr "如果希望只更新顶级目录，使用-N选项。" -#: source/TortoiseSVN_en.xml:9258(para) -msgid "Limits the number of log messages that TortoiseSVN fetches when you first select TortoiseSVNShow Log Useful for slow server connections. You can always use Get All or Next 100 to get more messages." -msgstr "限制你第一次选择 TortoiseSVN显示日志 时，TSVN向服务器获取的日志信息数。在服务器连接缓慢时很有用。你可以使用 全部显示 或 下100(条) 来获得更多信息。" +#: source/TortoiseSVN_en.xml:11760(title) +#: source/TortoiseSVN_en.xml:12231(glossterm) +msgid "Commit" +msgstr "提交" -#: source/TortoiseSVN_en.xml:9272(term) -msgid "Font for log messages" -msgstr "日志信息字体" +#: source/TortoiseSVN_en.xml:11761(para) +msgid "In TortoiseSVN, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." +msgstr "在TortoiseSVN，提交对话框使用Subversion命令，第一部分是检查工作副本哪些文件可能被提交，然后你可以检查列表，比较与BASE的区别，选择你希望提交包含的项目。" -#: source/TortoiseSVN_en.xml:9274(para) -msgid "Selects the font face and size used to display the log message itself in the middle pane of the Revision Log dialog, and when composing log messages in the Commit dialog." -msgstr "选择日志信息显示的字体样式和大小，作用域为版本日志对话框的中间窗格，以及提交对话框时填写日志信息的窗格。" +#: source/TortoiseSVN_en.xml:11768(screen) +#: source/TortoiseSVN_en.xml:11930(screen) +#: source/TortoiseSVN_en.xml:11958(screen) +#, no-wrap +msgid "" +"\n" +"svn status -v PATH\n" +msgstr "" +"\n" +"svn status -v PATH\n" + +#: source/TortoiseSVN_en.xml:11771(para) source/TortoiseSVN_en.xml:11859(para) +msgid "If Show unversioned files is checked, TortoiseSVN will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the svn status command does not descend into unversioned folders." +msgstr "如果选择了显示未版本控制的文件，TortoiseSVN会遵循忽略规则显示工作目录中所有未版本控制的文件和文件夹。这个特性在Subversion中没有等价操作，因为svn status 命令不扫描未版本控制的文件夹。" -#: source/TortoiseSVN_en.xml:9283(term) -msgid "Short date / time format in log messages" -msgstr "日志信息使用短日期/时间格式" +#: source/TortoiseSVN_en.xml:11779(para) +msgid "If you check any unversioned files and folders, those items will first be added to your working copy." +msgstr "如果你选择了未版本控制的文件和文件夹，这些项目都会先增加到你的工作副本。" -#: source/TortoiseSVN_en.xml:9285(para) -msgid "If the standard long messages use up too much space on your screen use the short format." -msgstr "如果标准长度的日期/时间信息占在用了过多的屏幕空间，可以使用短格式。" +#: source/TortoiseSVN_en.xml:11783(screen) +#: source/TortoiseSVN_en.xml:12073(screen) +#, no-wrap +msgid "" +"\n" +"svn add PATH...\n" +msgstr "" +"\n" +"svn add PATH...\n" -#: source/TortoiseSVN_en.xml:9292(term) -msgid "Progress Dialog" -msgstr "进程对话框" +#: source/TortoiseSVN_en.xml:11786(para) +msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseSVN uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." +msgstr "当你点击确认，开始执行Subversion提交。如果你不修改所有的文件检查框，TortoiseSVN 会递归提交工作副本。如果你取消选择一些文件，那么就必须使用非递归提交 (-N) ，每个路径都必须在命令行上单独指定。" -#: source/TortoiseSVN_en.xml:9294(para) -msgid "TortoiseSVN can automatically close all progress dialogs when the action is finished without error. This setting allows you to select the conditions for closing the dialogs. The default (recommended) setting is Close manually which allows you to review all messages and check what has happened. However, you may decide that you want to ignore some types of message and have the dialog close automatically if there are no critical changes." -msgstr "当一个动作正确无误地完成时，TSVN可以自动关闭所有的进程对话框。这项设置允许你选择在何种情况下关闭对话框。默认(推荐)的设置是 手动关闭 ，允许你重新浏览所有信息并检查发生了什么。当然，你可能会决定忽略某些类型的信息并在你的操作没做出什么重大改变的情况下让对话框自动关闭。" +#: source/TortoiseSVN_en.xml:11794(screen) +#, no-wrap +msgid "" +"\n" +"svn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n" +msgstr "" +"\n" +"svn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n" -#: source/TortoiseSVN_en.xml:9305(para) -msgid "Auto-close if no merges, adds or deletes means that the progress dialog will close if there were simple updates, but if changes from the repository were merged with yours, or if any files were added or deleted, the dialog will remain open. It will also stay open if there were any conflicts or errors during the operation." -msgstr "如无合并、添加、删除操作，自动关闭 意味着如果有简单更新的话，进程对话框将关闭。但如果版本库的更改和你的内容进行了合并，或若有任何文件被添加或删除，对话框将保持打开。若操作中发生什么冲突和错误这些对话框也将同样保持打开。" +#: source/TortoiseSVN_en.xml:11797(para) source/TortoiseSVN_en.xml:12003(para) +#: source/TortoiseSVN_en.xml:12086(para) +msgid "LogMessage here represents the contents of the log message edit box. This can be empty." +msgstr "日志消息是日志编辑框的内容。它可以为空。" -#: source/TortoiseSVN_en.xml:931(para) -msgid "But what if Sally's changes do overlap with Harry's changes? What then? This situation is called a conflict, and it's usually not much of a problem. When Harry asks his client to merge the latest repository changes into his working copy, his copy of file A is somehow flagged as being in a state of conflict: he'll be able to see both sets of conflicting changes, and manually choose between them. Note that software can't automatically resolve conflicts; only humans are capable of understanding and making the necessary intelligent choices. Once Harry has manually resolved the overlapping changes (perhaps by discussing the conflict with Sally!), he can safely save the merged file back to the repository." -msgstr "但是如果 Sally 和 Harry 的修改重叠了该怎么办？这种情况叫做冲突，这通常不是个大问题，当 Harry 告诉他的客户端去合并版本库的最新修改到自己的工作副本时，他的文件 A 就会处于冲突状态: 他可以看到一对冲突的修改集，并手工的选择保留一组修改。需要注意的是软件不能自动的解决冲突，只有人可以理解并作出智能的选择，一旦 Harry 手工的解决了冲突(也许需要与 Sally 讨论)，他就可以安全的把合并的文件保存到版本库。" +#: source/TortoiseSVN_en.xml:11801(para) +msgid "If Keep locks is checked, use the --no-unlock switch." +msgstr "如果选择了保持锁，就使用--no-unlock开关。" -#: source/TortoiseSVN_en.xml:9313(para) -msgid "Auto-close if no merges, adds or deletes for local operations means that the progress dialog will close as for Auto-close if no merges, adds or deletes but only for local operations like adding files or reverting changes. For remote operations the dialog will stay open." -msgstr "对本地操作自动关闭(如无合并、添加或删除操作，自动关闭) 意味着进程对话框当 如无合并、添加或删除操作 时自动关闭，但仅限于那些如添加文件、还原等本地的操作。在做远程操作时对话框将保持打开。" +#: source/TortoiseSVN_en.xml:11807(title) +#: source/TortoiseSVN_en.xml:12277(glossterm) +msgid "Diff" +msgstr "差异" -#: source/TortoiseSVN_en.xml:9321(para) -msgid "Auto-close if no conflicts relaxes the criteria further and will close the dialog even if there were merges, adds or deletes. However, if there were any conflicts or errors, the dialog remains open." -msgstr "无冲突时自动关闭 更放宽了标准，即使在无合并、添加、删除操作时也同样关闭对话框。当然，如果操作发生了任何冲突或错误，对话框将保持打开。" +#: source/TortoiseSVN_en.xml:11808(screen) +#, no-wrap +msgid "" +"\n" +"svn diff PATH\n" +msgstr "" +"\n" +"svn diff PATH\n" -#: source/TortoiseSVN_en.xml:9328(para) -msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Subversion is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." -msgstr "如无错误，自动关闭 即使在有冲突发生时也会关闭。维持对话框打开的唯一条件是发生了错误，使得Subversion无法完成任务。举个例子，一个更新操作由于服务器不可达而失败了，或是一个提交操作因为工作副本已经过期而失败。" +#: source/TortoiseSVN_en.xml:11811(para) +msgid "If you use Diff from the main context menu, you are diffing a modified file against its BASE revision. The output from the CLI command above also does this and produces output in unified-diff format. However, this is not what TortoiseSVN is using. TortoiseSVN uses TortoiseMerge (or a diff program of your choosing) to display differences visually between fulltext files, so there is no direct CLI equivalent." +msgstr "如果你在右键菜单使用差异，就会将修改的文件与基础版本比较。控制台的命令输出也是执行这个操作，输出统一差异格式。然而，TortoiseSVN不使用它。TortoiseSVN 使用TortoiseMerge (或者你选择的比较差异程序)可视化的全文显示差异，所以它没有控制台等价操作。" -#: source/TortoiseSVN_en.xml:9340(term) -msgid "Use URL of WC as the default \"From:\" URL" -msgstr "使用工作副本的URL作为默认的来源URL" +#: source/TortoiseSVN_en.xml:11820(para) +msgid "You can also diff any 2 files using TortoiseSVN, whether or not they are version controlled. TortoiseSVN just feeds the two files into the chosen diff program and lets it work out where the differences lie." +msgstr "你可以使用TortoiseSVN,比较任意两个文件的差异，不管他们是否受版本控制。TortoiseSVN只是把这两个文件传递给已经选择的比较差异程序，让它比较差异。" -#: source/TortoiseSVN_en.xml:9342(para) -msgid "In the merge dialog, the default behaviour is for the From: URL to be remembered between merges. However, some people like to perform merges from many different points in their hierarchy, and find it easier to start out with the URL of the current working copy. This can then be edited to refer to a parallel path on another branch." -msgstr "在合并对话框里，默认行为是在每次合并中记忆 起始: 的URL。无论如何，都有某些人喜欢在他们的版本进化树中从很多不同的位置执行合并操作，他们发现从当前工作副本的URL开始更方便些。该URL可以随后被编辑来指向一个同级路径或另一个分支。" +#: source/TortoiseSVN_en.xml:11828(title) +msgid "Show Log" +msgstr "显示日志" -#: source/TortoiseSVN_en.xml:9354(term) -msgid "Default checkout path" -msgstr "缺省检出路径" +#: source/TortoiseSVN_en.xml:11829(screen) +#, no-wrap +msgid "" +"\n" +"svn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n" +" or\n" +"svn log -v -r M:N [--stop-on-copy] PATH\n" +msgstr "" +"\n" +"svn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n" +" 或者\n" +"svn log -v -r M:N [--stop-on-copy] PATH\n" -#: source/TortoiseSVN_en.xml:9356(para) -msgid "You can specify the default path for checkouts. If you keep all your checkouts in one place, it is useful to have the drive and folder pre-filled so you only have to add the new folder name to the end." -msgstr "你可以指定缺省的检出路径。如果你保持所有检出在同一个地方，那么预先填写的路径是极为有用的，这样你只需要在路径末尾增加新的目录名称即可。" +#: source/TortoiseSVN_en.xml:11834(para) +msgid "By default, TortoiseSVN tries to fetch 100 log messages using the --limit method. If the settings instruct it to use old APIs, then the second form is used to fetch the log messages for 100 repository revisions." +msgstr "默认情况下，TortoiseSVN尝试用--limit方法取得100个日志消息。如果设置了让它使用旧借口，那么就使用第二种个是获得100个日志消息。" -#: source/TortoiseSVN_en.xml:9365(term) -msgid "Default checkout URL" -msgstr "缺省检出URL" +#: source/TortoiseSVN_en.xml:11840(para) +msgid "If Stop on copy/rename is checked, use the --stop-on-copy switch." +msgstr "如果选择了停止于复制/改名，就使用--stop-on-copy开关。" -#: source/TortoiseSVN_en.xml:9367(para) -msgid "You can also specify the default URL for checkouts. If you often checkout sub-projects of some very large project, it can be useful to have the URL pre-filled so you only have to add the sub-project name to the end." -msgstr "你可以指定缺省的检出URL。如果你经常检出一些大项目的子工程，那么预先填写的URL是极为有用的，这样你只需要在路径末尾增加新的工程名称即可。" +#: source/TortoiseSVN_en.xml:11847(screen) +#, no-wrap +msgid "" +"\n" +"svn status -v PATH\n" +" or\n" +"svn status -u -v PATH\n" +msgstr "" +"\n" +"svn status -v PATH\n" +" 或者\n" +"svn status -u -v PATH\n" -#: source/TortoiseSVN_en.xml:9378(title) -msgid "TortoiseSVN Dialog Settings 2" -msgstr "TSVN对话框设置二" +#: source/TortoiseSVN_en.xml:11852(para) +msgid "The initial status check looks only at your working copy. If you click on Check repository then the repository is also checked to see which files would be changed by an update, which requires the -u switch." +msgstr "只在你的工作副本执行初始的状态检查。如果你点击检查版本库，那么也检查版本库，察看哪些文件会被更新操作修改，它需要-u开关。" -#: source/TortoiseSVN_en.xml:9382(title) -msgid "The Settings Dialog, Dialogs 2 Page" -msgstr "设置对话框，对话框二页面" +#: source/TortoiseSVN_en.xml:11869(title) +msgid "Revision Graph" +msgstr "版本图" -#: source/TortoiseSVN_en.xml:9388(term) -msgid "Recurse into unversioned folders" -msgstr "递归处理未进行版本控制的文件夹" +#: source/TortoiseSVN_en.xml:11870(para) +msgid "The revision graph is a feature of TortoiseSVN only. There's no equivalent in the command line client." +msgstr "版本图是TortoiseSVN特有的，命令行客户端没有等价实现。" -#: source/TortoiseSVN_en.xml:9390(para) -msgid "If this box is checked (default state), then whenever the status of an unversioned folder is shown in the Add, Commit or Check for Modifications dialog, every child file and folder is also shown. If you uncheck this box, only the unversioned parent is shown. Unchecking reduces clutter in these dialogs. In that case if you select an unversioned folder for Add, it is added recursively." -msgstr "若这个选项框被选中(默认状态)，那么一个非版本控制的文件夹，不论在 添加，提交 或 检查更新 时显示的是什么状态，它的每个子文件和子文件夹都要同样显示。取消选择将减少这些对话框中的混乱程度。这样一来如果你选择添加一个非版本控制的文件夹，将会非递归地添加。" +#: source/TortoiseSVN_en.xml:11874(para) +msgid "" +"What TortoiseSVN does is an \n" +"svn info URL_of_WC\n" +"svn log -v URL\n" +" where URL is the repository root and then analyzes the data returned." +msgstr "" +"TortoiseSVN执行了这些操作 \n" +"svn info URL_of_WC\n" +"svn log -v URL\n" +"其中URL是版本库的 根，返回分析数据。" -#: source/TortoiseSVN_en.xml:9404(term) -msgid "Use autocompletion of filepaths and keywords" -msgstr "自动完成文件路径和关键词" +#: source/TortoiseSVN_en.xml:11885(title) +msgid "Repo Browser" +msgstr "版本库浏览器" -#: source/TortoiseSVN_en.xml:9406(para) -msgid "The commit dialog includes a facility to parse the list of filenames being committed. When you type the first 3 letters of an item in the list, the autocompletion box pops up, and you can press Enter to complete the filename. Check the box to enable this feature." -msgstr "提交对话框包含了一个功能模块，可以解析被提交的一系列文件名。当你输入一个提交列表中某个文件的前三个字母时，自动完成对话框就会弹出来，使你随后可以点击回车来直接完成这个文件名。选择该选项来使用这个功能特性。" +#: source/TortoiseSVN_en.xml:11886(screen) +#, no-wrap +msgid "" +"\n" +"svn info URL_of_WC\n" +"svn list [-r rev] -v URL\n" +msgstr "" +"\n" +"svn info URL_of_WC\n" +"svn list [-r rev] -v URL\n" -#: source/TortoiseSVN_en.xml:9416(term) -msgid "Timeout in seconds to stop the autocompletion parsing" -msgstr "对自动完成进行多长时间的分析(秒)" +#: source/TortoiseSVN_en.xml:11890(para) +msgid "You can use svn info to determine the repository root, which is the top level shown in the repository browser. You cannot navigate Up above this level. Also, this command returns all the locking information shown in the repository browser." +msgstr "你可以使用svn info检查版本库的根，它在版本库浏览器的顶级显示。你不能浏览它的上级目录。同样，这个命令返回所有显示在版本库浏览器的锁信息。" -#: source/TortoiseSVN_en.xml:9418(para) -msgid "The autocompletion parser can be quite slow if there are a lot of large files to check. This timeout stops the commit dialog being held up for too long. If you are missing important autocompletion information, you can extend the timeout." -msgstr "如果有大量文件需要程序检查，自动完成解析器可能会非常慢。该超时时间设置可以防止提交对话框被长时间挂起。若你错过了某些重要的自动完成信息，你可以延长该超时时间。" +#: source/TortoiseSVN_en.xml:11897(para) +msgid "The svn list call will list the contents of a directory, given a URL and revision." +msgstr "给出URL和可选的版本号，svn list列出目录中的内容。" -#: source/TortoiseSVN_en.xml:9427(term) -msgid "Only use spellchecker when tsvn:projectlanguage is set" -msgstr "仅在保留了 tsvn:projectlanguage 时才进行拼写检查" +#: source/TortoiseSVN_en.xml:11903(title) +msgid "Edit Conflicts" +msgstr "编辑冲突" -#: source/TortoiseSVN_en.xml:9429(para) -msgid "If you don't wish to use the spellchecker for all commits, check this box. The spellchecker will still be enabled where the project properties require it." -msgstr "若你不愿意在所有提交操作时都进行拼写检查，就选择该选项。而后拼写检查功能将在项目属性做出明确要求时才生效。" +#: source/TortoiseSVN_en.xml:11904(para) +msgid "This command has no CLI equivalent. It invokes TortoiseMerge or an external 3-way diff/merge tool to look at the files involved in the conflict and sort out which lines to use." +msgstr "这个命令没有控制台等价实现。它调用TortoiseMerge或者外部三路差异/合并工具察看棘手的冲突，挑选出冲突行。" -#: source/TortoiseSVN_en.xml:9437(term) -msgid "Max. items to keep in the log message history" -msgstr "日志中保留的最大条目数量" +#: source/TortoiseSVN_en.xml:11911(title) +msgid "Resolved" +msgstr "已解决" -#: source/TortoiseSVN_en.xml:9439(para) -msgid "TortoiseSVN stores the last 25 log messages you entered for each repository. You can customize the number stored here. If you have many different repositories, you may wish to reduce this to avoid filling your registry." -msgstr "TSVN可以为每个版本库保存你访问时所输入的最后25条日志信息。你可以自定义该数目。若你有很多不同的版本库，你可能会希望减少该数目以防止向注册表中填入过多信息。" +#: source/TortoiseSVN_en.xml:11912(screen) +#, no-wrap +msgid "" +"\n" +"svn resolved PATH\n" +msgstr "" +"\n" +"svn resolved PATH\n" -#: source/TortoiseSVN_en.xml:9448(term) -msgid "Re-open commit dialog after a commit failed" -msgstr "如果提交失败，自动重新打开提交对话框" +#: source/TortoiseSVN_en.xml:11917(title) +msgid "Rename" +msgstr "改名" -#: source/TortoiseSVN_en.xml:9450(para) -msgid "When a commit fails for some reason (working copy needs updating, pre-commit hook rejects commit, network error, etc), you can select this option to keep the commit dialog open ready to try again. However, you should be aware that this can lead to problems. If the failure means you need to update your working copy, and that update leads to conflicts you must resolve those first." -msgstr "当一个提交操作由于某些原因(工作副本需要更新、pre-commit钩子程序拒绝了提交、网络错误等等)失败了，你可以选择该选项来使提交对话框保持打开，以便重新操作。当然，你应该注意到这可能会导致一些问题。若发生的错误意味着你需要更新你的工作副本，而此更新操作将导致冲突，那么你必须先解决这些事情再说。" +#: source/TortoiseSVN_en.xml:11918(screen) +#, no-wrap +msgid "" +"\n" +"svn rename CURR_PATH NEW_PATH\n" +msgstr "" +"\n" +"svn rename CURR_PATH NEW_PATH\n" -#: source/TortoiseSVN_en.xml:946(para) -msgid "The copy-modify-merge model may sound a bit chaotic, but in practice, it runs extremely smoothly. Users can work in parallel, never waiting for one another. When they work on the same files, it turns out that most of their concurrent changes don't overlap at all; conflicts are infrequent. And the amount of time it takes to resolve conflicts is far less than the time lost by a locking system." -msgstr "复制-修改-合并模型感觉是有一点混乱，但在实践中，通常运行的很平稳，用户可以并行的工作，不必等待别人，当工作在同一个文件上时，也很少会有重叠发生，冲突并不频繁，处理冲突的时间远比等待解锁花费的时间少。" +#: source/TortoiseSVN_en.xml:11923(title) +#: source/TortoiseSVN_en.xml:12265(glossterm) +msgid "Delete" +msgstr "删除" -#: source/TortoiseSVN_en.xml:9461(term) -msgid "Contact the repository on startup" -msgstr "启动时连接版本库" +#: source/TortoiseSVN_en.xml:11924(screen) +#, no-wrap +msgid "" +"\n" +"svn delete PATH\n" +msgstr "" +"\n" +"svn delete PATH\n" -#: source/TortoiseSVN_en.xml:9463(para) -msgid "The Check for Modifications dialog checks the working copy by default, and only contacts the repository when you click Check repository. If you always want to check the repository, you can use this setting to make that action happen automatically." -msgstr "“检查更新”对话框将默认检查工作副本，但仅当你点击 检查版本库 时才连接你的版本库做检查。若你想总是去检查版本库，就可以使用该设置来使版本库检查的动作每次都自动启动。" +#: source/TortoiseSVN_en.xml:11929(title) +#: source/TortoiseSVN_en.xml:12444(glossterm) +msgid "Revert" +msgstr "恢复" -#: source/TortoiseSVN_en.xml:9473(term) -msgid "Sort items numerically" -msgstr "按数字顺序排序" +#: source/TortoiseSVN_en.xml:11933(para) +msgid "The first stage is a status check which determines the items in your working copy which can potentially be reverted. You can review the list, diff files against BASE and select the items you want to be included in the revert." +msgstr "首先开始状态检查，察看你的工作副本有哪些项目可以被撤销。你可以复审文件列表，检查这些文件的修改，然后选择你要撤销的项目。" -#: source/TortoiseSVN_en.xml:9475(para) -msgid "The repository browser can use a more intelligent sorting algorithm which handles paths containing numbers better than a plain ascii sort. This is sometimes useful for getting version number tags in the correct order. This option controls the default sort type used." -msgstr "版本库浏览器可以使用一个更智能的排序算法，该算法处理包含数字的路径的效果比纯按ASCII排序效果要好。这在某些时候会变得很有用，比如用来使版本号标签排成正确的顺序。该选项可以控制你所使用的默认排序类型。" +#: source/TortoiseSVN_en.xml:11939(para) +msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseSVN uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." +msgstr "当你点击确认时，开始Subversion撤销操作。如果你不修改所有的文件检查框，TortoiseSVN 会递归撤销 (-R)工作副本的修改。如果你取消选择一些文件，那么就必须使用非递归撤销 ，每个路径都必须在命令行上单独指定。\"" -#: source/TortoiseSVN_en.xml:9487(title) -msgid "TortoiseSVN Colour Settings" -msgstr "TortoiseSVN 颜色设置" +#: source/TortoiseSVN_en.xml:11946(screen) +#, no-wrap +msgid "" +"\n" +"svn revert [-R] PATH...\n" +msgstr "" +"\n" +"svn revert [-R] PATH...\n" -#: source/TortoiseSVN_en.xml:9489(para) -msgid " This dialog allows you to configure the text colours used in TortoiseSVN's dialogs the way you like them." -msgstr " 此对话框允许你按照你喜欢的方式来配置TSVN对话框使用的文本颜色。" +#: source/TortoiseSVN_en.xml:11952(screen) +#, no-wrap +msgid "" +"\n" +"svn cleanup PATH\n" +msgstr "" +"\n" +"svn cleanup PATH\n" -#: source/TortoiseSVN_en.xml:9491(title) -msgid "The Settings Dialog, Colours Page" -msgstr "设置对话框，颜色页面" +#: source/TortoiseSVN_en.xml:11957(title) +msgid "Get Lock" +msgstr "获得锁" -#: source/TortoiseSVN_en.xml:9499(term) -msgid "Possible or real conflict / obstructed" -msgstr "可能或确实有冲突/有问题" +#: source/TortoiseSVN_en.xml:11961(para) +msgid "The first stage is a status check which determines the files in your working copy which can potentially be locked. You can select the items you want to be locked." +msgstr "首先开始状态检查，察看你的工作副本有哪些项目可以被加锁。你可以选择想加锁的项目。" -#: source/TortoiseSVN_en.xml:95(para) -msgid "In Basic Concepts we give a short introduction to the Subversion revision control system which underlies TortoiseSVN. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." -msgstr "在基本概念一章里简短地介绍了 Subversion 版本控制系统，Subversion 是 TortoiseSVN 的基础。这一章引用了 Subversion 工程的文档，介绍了各种版本控制模式，以及 Subversion 的工作原理。" +#: source/TortoiseSVN_en.xml:11966(screen) +#, no-wrap +msgid "" +"\n" +"svn lock -m \"LockMessage\" [--force] PATH...\n" +msgstr "" +"\n" +"svn lock -m \"LockMessage\" [--force] PATH...\n" -#: source/TortoiseSVN_en.xml:9501(para) -msgid "A conflict has occurred during update, or may occur during merge. Update is obstructed by an existing unversioned file/folder of the same name as a versioned one." -msgstr "当更新时或合并时发生了冲突。如果对应于版本控制下的文件/文件夹，存在一个同名的非版本控制的文件/文件夹，此时做更新将被阻碍。" +#: source/TortoiseSVN_en.xml:11969(para) +msgid "LockMessage here represents the contents of the lock message edit box. This can be empty." +msgstr "加锁信息是加锁编辑框的内容。它可以为空。\"" -#: source/TortoiseSVN_en.xml:9506(para) -msgid "This colour is also used for error messages in the progress dialogs." -msgstr "此颜色同样被用在进程对话框的错误信息中。" +#: source/TortoiseSVN_en.xml:11973(para) +msgid "If Steal the locks is checked, use the --force switch." +msgstr "如果选择了强制锁定 ，就使用--force开关。" -#: source/TortoiseSVN_en.xml:9512(term) -msgid "Added files" -msgstr "添加文件" +#: source/TortoiseSVN_en.xml:11979(title) +msgid "Release Lock" +msgstr "释放锁" -#: source/TortoiseSVN_en.xml:9514(para) -msgid "Items added to the repository." -msgstr "向版本库添加的条目。" +#: source/TortoiseSVN_en.xml:11980(screen) +#, no-wrap +msgid "" +"\n" +"svn unlock PATH\n" +msgstr "" +"\n" +"svn unlock PATH\n" -#: source/TortoiseSVN_en.xml:9520(term) -msgid "Missing / deleted / replaced" -msgstr "丢失/已删除/已替换" +#: source/TortoiseSVN_en.xml:11985(title) +msgid "Branch/Tag" +msgstr "分支/标记" -#: source/TortoiseSVN_en.xml:9522(para) -msgid "Items deleted from the repository, missing from the working copy, or deleted from the working copy and replaced with another file of the same name." -msgstr "已从工作副本中遗失的条目；已从版本库中删除；或已经从工作副本删除并且被另一个同名文件替换。" +#: source/TortoiseSVN_en.xml:11986(screen) +#, no-wrap +msgid "" +"\n" +"svn copy -m \"LogMessage\" URL URL\n" +" or\n" +"svn copy -m \"LogMessage\" URL@rev URL@rev\n" +" or\n" +"svn copy -m \"LogMessage\" PATH URL\n" +msgstr "" +"\n" +"svn copy -m \"LogMessage\" URL URL\n" +" 或\n" +"svn copy -m \"LogMessage\" URL@rev URL@rev\n" +" 或\n" +"svn copy -m \"LogMessage\" PATH URL\n" -#: source/TortoiseSVN_en.xml:9530(term) -msgid "Merged" -msgstr "合并" +#: source/TortoiseSVN_en.xml:11998(listitem) +msgid "Specific revision in repository" +msgstr "指定版本库中的版本" -#: source/TortoiseSVN_en.xml:9532(para) -msgid "Changes from the repository successfully merged into the WC without creating any conflicts." -msgstr "从版本库所做的更改被成功地合并到工作副本，并无任何冲突产生。" +#: source/TortoiseSVN_en.xml:11993(para) +msgid "The Branch/Tag dialog performs a copy to the repository. There are 3 radio button options: which correspond to the 3 command line variants above." +msgstr "分支/标签对话框在版本库执行复制。有三个单选按钮: 对应上面的三个命令行参数。" -#: source/TortoiseSVN_en.xml:9539(term) -msgid "Modified / copied" -msgstr "已修改/已复制" +#: source/TortoiseSVN_en.xml:12010(screen) +#, no-wrap +msgid "" +"\n" +"svn info URL_of_WC\n" +"svn switch [-r rev] URL PATH\n" +msgstr "" +"\n" +"svn info URL_of_WC\n" +"svn switch [-r rev] URL PATH\n" -#: source/TortoiseSVN_en.xml:9541(para) -msgid "Add with history, or paths copied in the repository. Also used in the log dialog for entries which include copied items." -msgstr "已经增加(现在只是修改)，或者在版本库中复制。也在包含复制条目的日志对话框中使用。" +#: source/TortoiseSVN_en.xml:12016(title) +#: source/TortoiseSVN_en.xml:12358(glossterm) +msgid "Merge" +msgstr "合并" -#: source/TortoiseSVN_en.xml:9549(term) -msgid "Deleted node" -msgstr "删除的节点" +#: source/TortoiseSVN_en.xml:12017(screen) +#, no-wrap +msgid "" +"\n" +"svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n" +msgstr "" +"\n" +"svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n" -#: source/TortoiseSVN_en.xml:955(para) -msgid "In the end, it all comes down to one critical factor: user communication. When users communicate poorly, both syntactic and semantic conflicts increase. No system can force users to communicate perfectly, and no system can detect semantic conflicts. So there's no point in being lulled into a false promise that a locking system will somehow prevent conflicts; in practice, locking seems to inhibit productivity more than anything else." -msgstr "最后，一切都要归结到一条重要的因素: 用户交流。当用户交流贫乏，语法和语义的冲突就会增加，没有系统可以强制用户完美的交流，没有系统可以检测语义上的冲突，所以没有任何证据能够承诺锁定系统可以防止冲突，实践中，锁定除了约束了生产力，并没有做什么事。" +#: source/TortoiseSVN_en.xml:12020(para) +msgid "The Dry run performs the same merge with the --dry-run switch." +msgstr "Dry run与使用--dry-run选项的merge相同。" -#: source/TortoiseSVN_en.xml:9551(para) -msgid "An item which has been deleted from the repository." -msgstr "一个已经从版本库中删除了的条目。" +#: source/TortoiseSVN_en.xml:12024(screen) +#, no-wrap +msgid "" +"\n" +"svn diff From_URL@revN To_URL@revM\n" +msgstr "" +"\n" +"svn diff From_URL@revN To_URL@revM\n" -#: source/TortoiseSVN_en.xml:9557(term) -msgid "Added node" -msgstr "添加的节点" +#: source/TortoiseSVN_en.xml:12027(para) +msgid "The Unified diff shows the diff operation which will be used to do the merge." +msgstr "Unified diff显示了用来合并的区别操作。" -#: source/TortoiseSVN_en.xml:9559(para) -msgid "An item which has been added to the repository, by an add, copy or move operation." -msgstr "一个通过添加、复制或移动操作，已经被添加到版本库的条目。" +#: source/TortoiseSVN_en.xml:12033(title) +#: source/TortoiseSVN_en.xml:12286(glossterm) +msgid "Export" +msgstr "输出" -#: source/TortoiseSVN_en.xml:9566(term) -msgid "Renamed node" -msgstr "重命名的节点" +#: source/TortoiseSVN_en.xml:12034(screen) +#, no-wrap +msgid "" +"\n" +"svn export [-r rev] [--ignore-externals] URL Export_PATH\n" +msgstr "" +"\n" +"svn export [-r rev] [--ignore-externals] URL Export_PATH\n" -#: source/TortoiseSVN_en.xml:9568(para) -msgid "An item which has been renamed within the repository." -msgstr "一个在版本库中已经被重命名的条目。" +#: source/TortoiseSVN_en.xml:12037(para) +msgid "This form is used when accessed from an unversioned folder, and the folder is used as the destination." +msgstr "这个形式是当从一个未版本控制目录访问，并且文件夹作为目标。" -#: source/TortoiseSVN_en.xml:9574(term) -msgid "Replaced node" -msgstr "替换的节点" +#: source/TortoiseSVN_en.xml:12041(para) +msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent." +msgstr "导出一个工作副本到一个目录没有使用Subversion的库，所以没有等同的命令行匹配。" -#: source/TortoiseSVN_en.xml:9576(para) -msgid "The original item has been deleted and a new item with the same name replaces it." -msgstr "该原始条目已经被删除，且有同名条目替换了的条目。" +#: source/TortoiseSVN_en.xml:12046(para) +msgid "What TortoiseSVN does is to copy all files to the new location while showing you the progress of the operation. Unversioned files/folders can optionally be exported too." +msgstr "TortoiseSVN做的只是将所有文件复制到一个新的位置，并且会显示操作的过程。未版本控制的文件/文件夹也可以被导出。" -#: source/TortoiseSVN_en.xml:9587(title) -msgid "Network Settings" -msgstr "网络设置" +#: source/TortoiseSVN_en.xml:12051(para) +msgid "In both cases, if Omit externals is checked, use the --ignore-externals switch." +msgstr "在两种情况下，如果Omit externals被选中，就相当于使用了--ignore-externals选项。" -#: source/TortoiseSVN_en.xml:9589(primary) -msgid "proxy server" -msgstr "代理服务器" +#: source/TortoiseSVN_en.xml:12058(title) +#: source/TortoiseSVN_en.xml:12404(glossterm) +msgid "Relocate" +msgstr "重新定位" -#: source/TortoiseSVN_en.xml:9591(para) -msgid " Here you can configure your proxy server, if you need one to get through your company's firewall." -msgstr " 如果需要穿透你公司的防火墙，在这里可以配置你的代理服务器。" +#: source/TortoiseSVN_en.xml:12059(screen) +#, no-wrap +msgid "" +"\n" +"svn switch --relocate From_URL To_URL\n" +msgstr "" +"\n" +"svn switch --relocate From_URL To_URL\n" -#: source/TortoiseSVN_en.xml:9593(title) -msgid "The Settings Dialog, Network Page" -msgstr "设置对话框，网络设置页面" +#: source/TortoiseSVN_en.xml:12064(title) +msgid "Create Repository Here" +msgstr "在当前位置创建版本库" -#: source/TortoiseSVN_en.xml:9599(para) -msgid "If you need to set up per-repository proxy settings, you will need to use the Subversion servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." -msgstr "如果你需要对每个版本库建立一套代理设置，你必须使用Subversion服务器文件来配置。使用编辑来直接访问该配置文件(servers.txt)。该文件的细节和使用方法可以参考运行时配置" +#: source/TortoiseSVN_en.xml:12065(screen) +#, no-wrap +msgid "" +"\n" +"svnadmin create --fs-type fsfs PATH\n" +" or\n" +"svnadmin create --fs-type bdb PATH\n" +msgstr "" +"\n" +"svnadmin create --fs-type fsfs PATH\n" +" 或\n" +"svnadmin create --fs-type bdb PATH\n" -#: source/TortoiseSVN_en.xml:9609(para) -msgid "You can also specify which program TortoiseSVN should use to establish a secure connection to a svn+ssh repository. We recommend that you use TortoisePlink.exe. This is a version of the popular Plink program, and is included with TortoiseSVN, but it is compiled as a Windowless app, so you don't get a DOS box popping up every time you authenticate." -msgstr "你同样可以在此指定SSH客户端程序，用来支持TortoiseSVN同使用svn+ssh协议的版本库建立安全连接。我们推荐您使用TortoisePlink.exe。这是著名的Plink程序的一个定制版本， 并且业已包含在TortoiseSVN之中，但它被编译成了一个无窗口的应用，因此当你每次认证的时候将不会看到弹出的DOS窗口。" +#: source/TortoiseSVN_en.xml:12072(title) +#: source/TortoiseSVN_en.xml:12148(glossterm) +msgid "Add" +msgstr "添加" -#: source/TortoiseSVN_en.xml:9617(para) -msgid "One side-effect of not having a window is that there is nowhere for any error messages to go, so if authentication fails you will simply get a message saying something like Unable to write to standard output. For this reason we recommend that you first set up using standard Plink. When everything is working, you can use TortoisePlink with exactly the same parameters." -msgstr "这里有个不弹出窗口的副作用: 将没有什么错误信息可供你追踪。因此倘若认证失败你将得到一个信息说: Unable to write to standard output。这样一来，我们就推荐你第一次设置时使用原始的Plink程序；而当一切工作正常之时，再使用定制版的TortoisePlink，并且重复利用那些相同的参数。" +#: source/TortoiseSVN_en.xml:12076(para) +msgid "If you selected a folder, TortoiseSVN first scans it recursively for items which can be added." +msgstr "如果选择了一个文件夹，TortoiseSVN会首先会递归的访问可以添加的条目。" -#: source/TortoiseSVN_en.xml:9628(title) -msgid "External Program Settings" -msgstr "外部程序设置" +#: source/TortoiseSVN_en.xml:12083(screen) +#, no-wrap +msgid "" +"\n" +"svn import -m LogMessage PATH URL\n" +msgstr "" +"\n" +"svn import -m LogMessage PATH URL\n" -#: source/TortoiseSVN_en.xml:9629(para) -msgid " Here you can define your own diff/merge programs that TortoiseSVN should use. The default setting is to use TortoiseMerge which is installed alongside TortoiseSVN." -msgstr " 在这里你可以定义你自己的差异查看/合并工具. 默认设置是使用与TortoiseSVN一同安装的TortoiseMerge。" +#: source/TortoiseSVN_en.xml:12092(title) +#: source/TortoiseSVN_en.xml:12169(glossterm) +msgid "Blame" +msgstr "追溯" -#: source/TortoiseSVN_en.xml:9631(title) -msgid "The Settings Dialog, Diff Viewer Page" -msgstr "设置对话框，差异查看页面" +#: source/TortoiseSVN_en.xml:12093(screen) +#, no-wrap +msgid "" +"\n" +"svn blame -r N:M -v PATH\n" +"svn log -r N:M PATH\n" +msgstr "" +"\n" +"svn blame -r N:M -v PATH\n" +"svn log -r N:M PATH\n" -#: source/TortoiseSVN_en.xml:9639(para) -msgid "Read for a list of some of the external diff/merge programs that people are using with TortoiseSVN." -msgstr "阅读 来了解人们为配合TortoiseSVN工作而使用的外部差异查看/合并程序列表。" +#: source/TortoiseSVN_en.xml:12097(para) +msgid "If you use TortoiseBlame to view the blame info, the file log is also required to show log messages in a tooltip. If you view blame as a textfile, this information is not required." +msgstr "如果你使用TortoiseBlame来查看追溯信息，文件日志也需要在工具提上上显示日志信息，如果你以文件方式查看追溯，这个信息不是必须的。" -#: source/TortoiseSVN_en.xml:9644(title) -msgid "Diff Viewer" -msgstr "差异查看器" +#: source/TortoiseSVN_en.xml:12105(title) +msgid "Add to Ignore List" +msgstr "加入忽略列表" -#: source/TortoiseSVN_en.xml:9646(para) -msgid "An external diff program may be used for comparing different revisions of files. The external program will need to obtain the filenames from the command line, along with any other command line options. TortoiseSVN uses substitution parameters prefixed with %. When it encounters one of these it will substitute the appropriate value. The order of the parameters will depend on the Diff program you use. " -msgstr "有时你可能需要一个外部的差异查看程序来比较不同版本的文件。在为你的命令行填写各种可选参数的同时，要确保这些外部程序从中获得文件名。在TortoiseSVN编辑命令行时，使用以 % 开头的替代参数。当外部程序执行至遇到这些替代参数，它将从TortoiseSVN那里获取那些实际的值。参数的填写顺序将依赖于你使用的差异查看程序。" +#: source/TortoiseSVN_en.xml:12106(screen) +#, no-wrap +msgid "" +"\n" +"svn propget svn:ignore PATH > tempfile\n" +"{edit new ignore item into tempfile}\n" +"svn propset svn:ignore -F tempfile PATH\n" +msgstr "" +"\n" +"svn propget svn:ignore PATH > tempfile\n" +"{编辑新的忽略内容到tempfile文件中}\n" +"svn propset svn:ignore -F tempfile PATH\n" -#: source/TortoiseSVN_en.xml:965(para) -msgid "There is one common situation where the lock-modify-unlock model comes out better, and that is where you have un-mergeable files. For example if your repository contains some graphic images, and two people change the image at the same time, there is no way for those changes to be merged together. Either Harry or Sally will lose their changes." -msgstr "有一种情况下锁定-修改-解锁模型会更好，也就是你有不可合并的文件，例如你的版本库包含了图片，两个人同时编辑这个文件，没有办法将这两个修改合并，Harry 或 Sally 会丢失他们的修改。" +#: source/TortoiseSVN_en.xml:12111(para) +msgid "Because the svn:ignore property is often a multi-line value, it is shown here as being changed via a text file rather than directly on the command line." +msgstr "因为svn:ignore通常是多行的，这里是通过文件显示，而不是直接使用命令行操作。" -#: source/TortoiseSVN_en.xml:9657(term) source/TortoiseSVN_en.xml:9748(term) -msgid "%base" -msgstr "%base" +#: source/TortoiseSVN_en.xml:12118(title) +msgid "Create Patch" +msgstr "创建补丁" -#: source/TortoiseSVN_en.xml:9659(para) -msgid "The original file without your changes" -msgstr "没更改的原始文件" +#: source/TortoiseSVN_en.xml:12119(screen) +#, no-wrap +msgid "" +"\n" +"svn diff PATH > patchfile\n" +msgstr "" +"\n" +"svn diff PATH > patchfile\n" -#: source/TortoiseSVN_en.xml:9665(term) source/TortoiseSVN_en.xml:9757(term) -msgid "%bname" -msgstr "%bname" +#: source/TortoiseSVN_en.xml:12122(para) +msgid "TortoiseSVN creates a patchfile in unified diff format by comparing the working copy with its BASE version." +msgstr "TortoiseSVN通过比较工作副本和它的基础版本产生一个标准区别格式(unified diff format)的补丁文件。" -#: source/TortoiseSVN_en.xml:9667(para) source/TortoiseSVN_en.xml:9759(para) -msgid "The window title for the base file" -msgstr "原始文件的窗口标题" +#: source/TortoiseSVN_en.xml:12128(title) +msgid "Apply Patch" +msgstr "应用补丁(Apply Patch)" -#: source/TortoiseSVN_en.xml:9673(term) source/TortoiseSVN_en.xml:9765(term) -msgid "%mine" -msgstr "%mine" +#: source/TortoiseSVN_en.xml:12129(para) +msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion." +msgstr "如果补丁和工作副本不是同一版本的话，那么应用补丁会是一件很棘手的事情。幸运的是，你可以使用 TortoiseMerge(在Subversion中没有等同的工具)。" -#: source/TortoiseSVN_en.xml:9675(para) -msgid "Your own file, with your changes" -msgstr "你更改过的新文件" +#: source/TortoiseSVN_en.xml:12146(title) +msgid "Glossary" +msgstr "术语表" -#: source/TortoiseSVN_en.xml:9681(term) source/TortoiseSVN_en.xml:9773(term) -msgid "%yname" -msgstr "%yname" +#: source/TortoiseSVN_en.xml:12150(para) +msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." +msgstr "向你的工作副本中增加文件或者目录时使用的Subversion命令。在你提交的时候新的项就会被加入到版本库中。" -#: source/TortoiseSVN_en.xml:9683(para) source/TortoiseSVN_en.xml:9775(para) -msgid "The window title for your file" -msgstr "你新文件的窗口标题" +#: source/TortoiseSVN_en.xml:12158(glossterm) +msgid "BASE revision" +msgstr "基础版本(BASE revision)" -#: source/TortoiseSVN_en.xml:9690(para) -msgid "The window titles are not pure filenames. TortoiseSVN treats that as a name to display and creates the names accordingly. So e.g. if you're doing a diff from a file in revision 123 with a file in your working copy, the names will be filename : revision 123 and filename : working copy" -msgstr "窗口标题并不一定代表真正的文件名。TortoiseSVN把它伪装成一个名字用来创建和显示。因此，倘若你在对比一个版本为123的文件和你当前工作副本中的文件，名字将显示为 文件名 : 版本 123 和 文件名 : 工作副本" +#: source/TortoiseSVN_en.xml:12160(para) +msgid "The current base revision of a file or folder in your working copy. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision." +msgstr "当前工作副本里的文件或目录的基础版本。是文件或目录最后被检出、更新或者提交时的版本。基础版本通常和HEAD版本不一致。" -#: source/TortoiseSVN_en.xml:9700(para) -msgid "" -"For example, with ExamDiff Pro: \n" -"C:\\Path-To\\ExamDiff.exe %base %mine\n" -" or with KDiff3: \n" -"C:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n" -" or with WinMerge: \n" -"C:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n" -" or with Araxis: \n" -"C:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n" -" %base %mine\n" -"" -msgstr "" -"例如，使用 ExamDiff Pro：\n" -"C:\\Path-To\\ExamDiff.exe %base %mine\n" -" 或者使用 KDiff3：\n" -"C:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n" -" 或者使用 WinMerge：\n" -"C:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n" -" 或者使用 Araxis：\n" -"C:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n" -" %base %mine\n" -"" +#: source/TortoiseSVN_en.xml:12171(para) +msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number." +msgstr "这个命令只能用于文本文件，它将会标记每一行来显示版本库修订版本的最后修改的修订和作出修改的人。我们的GUI实现叫做TortoiseBlame，在你将鼠标移到修订版本号码上时，它也会显示时间和日志信息。" -#: source/TortoiseSVN_en.xml:9719(para) -msgid "If you use the svn:keywords property to expand keywords, and in particular the revision of a file, then there may be a difference between files which is purely due to the current value of the keyword. Also if you use svn:eol-style = native the BAsE file will have pure LF line endings whereas your file will have CR-LF line endings. TSVN will normally hide these differences automatically by first parsing the BASE file to expand keywords and line endings before doing the diff operation. However, this can take a long time with large files. If Convert files when diffing against BASE is unchecked then TSVN will skip pre-processing the files." -msgstr "如果你使用了 svn:keywords 属性来扩展关键词，特别是那些 revision 版本关键词，那么在那些纯粹在关键词上取值不同的文件之间对比将有一些不同。同样如果你使用 svn:eol-style = native，那么在工作基础版本文件只有纯粹的 LF (换行)结束符的地方，你的文件将有完整的 CR-LF (回车-换行)结束符。TSVN在做差异对比操作之前，通常会先行对那些扩展关键词和结束符等格式进行解析转换，从而自动隐藏这些差异。无论如何，在遇到大文件时这样做无疑会经过一个很长的处理时间。如果取消对 与基础版本比较时转换文件 的勾选，那么TSVN将忽略这些对文件的预处理。" +#: source/TortoiseSVN_en.xml:12181(glossterm) +msgid "BDB" +msgstr "BDB" -#: source/TortoiseSVN_en.xml:9733(para) -msgid "You can also specify a different diff tool to use on Subversion properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." -msgstr "" +#: source/TortoiseSVN_en.xml:12183(para) +msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." +msgstr "伯克利DB(Berkeley DB)，版本库可以使用的一种经过充分测试的后台数据库实现，不能在通过网络共享的文件系统上使用，伯克利DB是Subversion 1.2版以前的缺省版本库格式。" -#: source/TortoiseSVN_en.xml:9740(title) -msgid "Merge Tool" -msgstr "合并工具" +#: source/TortoiseSVN_en.xml:12190(glossterm) +msgid "Branch" +msgstr "分支" -#: source/TortoiseSVN_en.xml:9742(para) -msgid "An external merge program used to resolve conflicted files. Parameter substitution is used in the same way as with the Diff Program. " -msgstr "外部合并程序被用来解决文件冲突。像差异查看程序那样，替代参数同样被用在命令行中。" +#: source/TortoiseSVN_en.xml:12192(para) +msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bugfixes, while new developments take place on the unstable trunk. In Subversion a branch is implemented as a cheap copy." +msgstr "有一个版本控制系统经常使用，来描述在某个时间点的两个人追随不同的路径的术语。你可以创建一个分支离开开发的主线来添加一个新特性，而不必影响主线的稳定，或者你可以创建一个分支用来发布bug修正，而新的开发发生在不稳定的主干。在Subversion，分支是使用廉价的复制实现的。" -#: source/TortoiseSVN_en.xml:975(title) -msgid "What does Subversion Do?" -msgstr "Subversion 怎么做？" +#: source/TortoiseSVN_en.xml:12207(para) +msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." +msgstr "一个Subversion命令在空目录通过从版本库下载版本控制的文件来创建本地工作副本。" -#: source/TortoiseSVN_en.xml:9750(para) -msgid "the original file without your or the others changes" -msgstr "没有被你或他人更改的原始文件" +#: source/TortoiseSVN_en.xml:12216(para) +msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." +msgstr "来自《Subversion手册》的引用: 递归的清理工作副本，删除锁定和保留的未完成操作。如果你得到工作副本已锁定的错误，运行这个命令删除无用的锁定，并将工作副本恢复到可用状态。" -#: source/TortoiseSVN_en.xml:976(para) -msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." -msgstr "Subversion 缺省使用复制-修改-合并模型，大多数情况下可以满足你的需求。然而，Subversion 1.2 后还是支持锁定，如果你有不可合并的文件，或者你只是想实行强制管理策略，Subversion 仍然会提供你需要的特性。" +#: source/TortoiseSVN_en.xml:12233(para) +msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." +msgstr "一个Subversion操作，用来将本地修改的内容传递回版本库，创建一个新的版本库修订版本。" -#: source/TortoiseSVN_en.xml:9767(para) -msgid "your own file, with your changes" -msgstr "你更改过的新文件" +#: source/TortoiseSVN_en.xml:12241(glossterm) +msgid "Conflict" +msgstr "冲突" -#: source/TortoiseSVN_en.xml:9781(term) -msgid "%theirs" -msgstr "%theirs" +#: source/TortoiseSVN_en.xml:12243(para) +msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." +msgstr "当版本库的修改合并到本地修改，有时候修改发生在同一行，这种情况下，Subversion不能自动决定使用文件的那一行，在提交之前，你需要手工编辑文件解决冲突。" -#: source/TortoiseSVN_en.xml:9783(para) -msgid "the file as it is in the repository" -msgstr "档案库中存放的文件" +#: source/TortoiseSVN_en.xml:12253(glossterm) +msgid "Copy" +msgstr "复制" -#: source/TortoiseSVN_en.xml:9789(term) -msgid "%tname" -msgstr "%tname" +#: source/TortoiseSVN_en.xml:12255(para) +msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." +msgstr "在Subversion版本库，你可以创建一个文件或整个目录树的副本，这是通过廉价复制实现的，看起来很像链接到原来的位置，几乎不占用任何空间。创建一个保存历史的副本，这样你就可以跟踪副本之前的修改。" -#: source/TortoiseSVN_en.xml:9791(para) -msgid "The window title for the file in the repository" -msgstr "档案库中文件的窗口标题" +#: source/TortoiseSVN_en.xml:12267(para) +msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the commited revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and resurrect it complete with history." +msgstr "当你删除了一个版本控制的条目(并且提交这个修改)，这个条目将不会存在于版本库以后的修订。但它还是存在于版本库的以前的修订版本里，如果必要，你可以复制一个删除的条目回来，并且保持所有的历史。" -#: source/TortoiseSVN_en.xml:9797(term) -msgid "%merged" -msgstr "%merged" +#: source/TortoiseSVN_en.xml:12279(para) +msgid "Shorthand for Show Differences. Very useful when you want to see exactly what changes have been made." +msgstr "显示区别的快捷方式，当你希望查看你所做修改的时候非常有用。" -#: source/TortoiseSVN_en.xml:9799(para) -msgid "the conflicted file, the result of the merge operation" -msgstr "发生冲突的文件，同时将被合并后的文件替换" +#: source/TortoiseSVN_en.xml:12288(para) +msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local .svn folders." +msgstr "这个命令创建了一个版本控制目录的副本，就像工作副本，但是没有.svn目录。" -#: source/TortoiseSVN_en.xml:9806(term) -msgid "%mname" -msgstr "%mname" +#: source/TortoiseSVN_en.xml:12296(glossterm) +msgid "FSFS" +msgstr "FSFS" -#: source/TortoiseSVN_en.xml:9808(para) -msgid "The window title for the merged file" -msgstr "合并文件的窗口标题" +#: source/TortoiseSVN_en.xml:12298(para) +msgid "FS Filesystem. A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." +msgstr "FS文件系统，版本库可以使用的一种Subversion专用的后台文件系统格式，能够在通过网络共享的文件系统上使用，FSFS是Subversion 1.2版以后的缺省版本库格式。" -#: source/TortoiseSVN_en.xml:9815(para) -msgid "" -"For example, with Perforce Merge: \n" -"C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n" -" or with KDiff3: \n" -"C:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n" -" --L1 %bname --L2 %yname --L3 %tname\n" -" or with Araxis: \n" -"C:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n" -" /title3:%yname %theirs %base %mine %merged /a2\n" -"" -msgstr "" -"例如，使用 Perforce Merge：\n" -"C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n" -" 或者使用 KDiff3：\n" -"C:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n" -" --L1 %bname --L2 %yname --L3 %tname\n" -" 或者使用 Araxis：\n" -"C:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n" -" /title3:%yname %theirs %base %mine %merged /a2\n" -"" +#: source/TortoiseSVN_en.xml:12307(para) +msgid "Group policy object" +msgstr "组策略对象" -#: source/TortoiseSVN_en.xml:9833(title) -msgid "Diff/Merge Advanced Settings" -msgstr "差异查看/合并工具的高级设置" +#: source/TortoiseSVN_en.xml:12313(glossterm) +msgid "HEAD revision" +msgstr "最新版本(HEAD revision)" -#: source/TortoiseSVN_en.xml:9835(para) -msgid " In the advanced settings, you can define a different diff and merge program for every file extension. For instance you could associate Photoshop as the Diff Program for .jpg files :-) You can also associate the svn:mime-type property with a diff or merge program." -msgstr " 在高级设置中，你可以为每种文件类型都定义一个不同的差异比较/合并程序。例如，你可以指定Photoshop作为.jpg文件的 比较 程序 :-) 也可以按照 svn:mime-type 属性指定差异/合并程序。" +#: source/TortoiseSVN_en.xml:12315(para) +msgid "The latest revision of a file or folder in the repository." +msgstr "版本库里文件或目录的最新版本。" -#: source/TortoiseSVN_en.xml:9837(title) -msgid "The Settings Dialog, Diff/Merge Advanced Dialog" -msgstr "高级差异比较设置/高级合并设置的对话框" +#: source/TortoiseSVN_en.xml:12323(para) +msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." +msgstr "在一个修订里将整个目录导入到版本库的Subversion命令。" -#: source/TortoiseSVN_en.xml:9846(para) -msgid "To associate using a file extension, you need to specify just the extension, with the leading dot but with no wildcard spec. Use .BMP to describe Windows bitmap files, not*.BMP. To associate using the svn:mime-type property, specify the mime type, including a slash, for example text/xml." -msgstr "无需任何通配符，你仅需指定文件的扩展名，包含开始的点，但是没有任何通配符。使用 .BMP 来描述Windows位图文件，而 不是*.BMP。如果使用svn:mime-type属性，要指定多媒体文件类型，包含斜线，例如text/xml。" +#: source/TortoiseSVN_en.xml:12330(glossterm) +msgid "Lock" +msgstr "锁" -#: source/TortoiseSVN_en.xml:9858(title) -msgid "Unified Diff Viewer" -msgstr "统一的差异查看器" +#: source/TortoiseSVN_en.xml:12332(para) +msgid "When you take out a lock on a versioned item, you mark it in the repository as uncommittable, except from the working copy where the lock was taken out." +msgstr "当一个版本控制条目的被你锁定，就是将它在版本库里标示为不可提交，只有作出锁定的工作副本可以提交。" -#: source/TortoiseSVN_en.xml:9860(para) -msgid "A viewer program for unified-diff files (patch files). No parameters are required. The Default option is to check for a file association for .diff files, and then for .txt files. If you don't have a viewer for .diff files, you will most likely get NotePad." -msgstr "一个统一差异文件(补丁文件)的查看程序。不需要任何参数。默认 选项遵循先检查 .diff 文件，再检查 .txt 文件的顺序。如果你没有 .diff 文件的查看器，就需要用记事本来查看了。" +#: source/TortoiseSVN_en.xml:12340(glossterm) +msgid "Log" +msgstr "日志" -#: source/TortoiseSVN_en.xml:9869(para) -msgid "The original Windows NotePad program does not behave well on files which do not have standard CR-LF line-endings. Since most unified diff files have pure LF line-endings, they do not view well in NotePad. However, you can download a free NotePad replacement Notepad2 which not only displays the line-endings correctly, but also colour codes the added and removed lines." -msgstr "原始Windows记事本程序对未使用标准“回车-换行”结束符的文件支持的并不好。而很多统一差异文件都仅仅使用“换行”结束符，因此他们的格式在记事本中显示的并不好。无论如何，你可以下载一个免费的记事本2 Notepad2，它不但可以正确地显示结束符，更可以为差异文件中添加和删除的那些行做颜色标记。" +#: source/TortoiseSVN_en.xml:12342(para) +msgid "Show the revision history of a file or folder. Also known as History." +msgstr "显示一个文件或是文件夹的版本历史。也就是历史。" -#: source/TortoiseSVN_en.xml:988(title) -msgid "Subversion in Action" -msgstr "Subversion 实战" +#: source/TortoiseSVN_en.xml:12349(glossterm) +msgid "History" +msgstr "历史" -#: source/TortoiseSVN_en.xml:9885(title) -msgid "Saved Data Settings" -msgstr "已保存数据的设置" +#: source/TortoiseSVN_en.xml:12351(para) +msgid "Show the revision history of a file or folder. Also known as Log." +msgstr "显示文件或目录的历史修订，也被称为Log。" -#: source/TortoiseSVN_en.xml:9886(para) -msgid " For your convenience, TortoiseSVN saves many of the settings you use, and remembers where you have been lately. If you want to clear out that cache of data, you can do it here." -msgstr " 为您方便着想，TortoiseSVN保存了很多你用过的设置，并记录你最近浏览过的地址。如果你想清空这些数据缓存，就在这里操作。" +#: source/TortoiseSVN_en.xml:12360(para) +msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict." +msgstr "这个过程会查看版本库添加到工作副本的的修改，而不会破坏你在本地的修改，有时候这些修改可能不会自动的结合，也就是冲突了。" -#: source/TortoiseSVN_en.xml:9888(title) -msgid "The Settings Dialog, Saved Data Page" -msgstr "设置对话框，已保存数据设置页面" +#: source/TortoiseSVN_en.xml:12366(para) +msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseSVN's Merge command." +msgstr "在你更新工作副本时会自动合并，你也可以使用TortoiseSVN的合并命令从另一条分支进行合并。" -#: source/TortoiseSVN_en.xml:9897(term) -msgid "URL history" -msgstr "URL历史记录" +#: source/TortoiseSVN_en.xml:12374(glossterm) +msgid "Patch" +msgstr "补丁" -#: source/TortoiseSVN_en.xml:9899(para) -msgid "Whenever you checkout a working copy, merge changes or use the repository browser, TortoiseSVN keeps a record of recently used URLs and offers them in a combo box. Sometimes that list gets cluttered with outdated URLs so it is useful to flush it out periodically." -msgstr "每次你检出一个工作副本，合并那些更改的文件，或仅仅是在使用版本库浏览器时，TortoiseSVN都将保存一个记录，记录那些最近使用过的URL，并在一个下拉列表框中显示出来。有时列表会被逐渐增多的过期URL弄得乱糟糟的，所以有定期清理一下的必要。" +#: source/TortoiseSVN_en.xml:12376(para) +msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." +msgstr "如果工作副本只有文本文件有修改，也可以使用Subversion的Diff命令生成标准区别格式的单文件的修改摘要。这种文件通常被叫做补丁，可以邮寄给任何人，使之可以应用到另一个工作副本。一些没有提交访问的人可以通过提交补丁文件给有授权的人来应用补丁，或者是在不确定修改时提交补丁给别人进行评审。" -#: source/TortoiseSVN_en.xml:990(title) -msgid "Working Copies" -msgstr "工作副本" +#: source/TortoiseSVN_en.xml:12389(glossterm) +msgid "Property" +msgstr "属性" -#: source/TortoiseSVN_en.xml:9906(para) -msgid "If you want to remove a single item from one of the combo boxes you can do that in-place. Just click on the arrow to drop the combo box down, move the mouse over the item you want to remove and type SHIFT+DELETE." -msgstr "如果你希望从列表中删除单独的条目，可以点击下拉列表，移动鼠标到你要删除的项上，然后按组合键SHIFT+DELETE。" +#: source/TortoiseSVN_en.xml:12391(para) +msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseSVN has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." +msgstr "除了版本控制文件和目录，Subversion允许你添加版本控制的元数据 - 被称作每个文件和目录的属性 。每个属性都有一个名称和一个值，非常类似于注册表键。Subversion有一些内置的特别属性，例如svn:eol-style。TortoiseSVN也有一些类似的，例如tsvn:logminsize，你可以选择名称和值添加你自己的属性。" -#: source/TortoiseSVN_en.xml:9915(term) -msgid "Log messages" -msgstr "日志信息" +#: source/TortoiseSVN_en.xml:12406(para) +msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to relocate your working copy so that its repository URLs point to the new location." +msgstr "如果你的版本库移动了，或许是因为移动到了一个新的目录，或者是域名改变，你需要relocate你的工作副本，这样你的版本库URL指向新的地址。" -#: source/TortoiseSVN_en.xml:9917(para) -msgid "TortoiseSVN stores recent commit log messages that you enter. These are stored per repository, so if you access many repositories this list can grow quite large." -msgstr "TortoiseSVN同时也储存你最近提交时填写的日志信息。对应每个版本库都要储存这些信息，所以如果你访问过很多版本库，这个列表将变得非常大。" +#: source/TortoiseSVN_en.xml:12412(para) +msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the Switch command instead." +msgstr "注意: 工作副本必须是指向同一个版本库的同一个位置，是版本库本身移动了。在其他几种情况下，你很有可能是需要Switch命令。" -#: source/TortoiseSVN_en.xml:992(primary) -msgid "working copy" -msgstr "工作副本" +#: source/TortoiseSVN_en.xml:12423(para) +msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network." +msgstr "版本库是进行数据存储和维护的中心。版本库既可以由分布在网络上的若干数据库或者文件组成，也可以存放在用户不需要通过网络就可以直接访问的某个位置。" -#: source/TortoiseSVN_en.xml:9925(term) -msgid "Dialog sizes and positions" -msgstr "窗口大小及位置" +#: source/TortoiseSVN_en.xml:12432(glossterm) +msgid "Resolve" +msgstr "解决" -#: source/TortoiseSVN_en.xml:9927(para) -msgid "Many dialogs remember the size and screen position that you last used." -msgstr "许多对话框都可以记录你最后一次使用时的窗口大小和位置。" +#: source/TortoiseSVN_en.xml:12434(para) +msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as Resolving Conflicts. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed." +msgstr "当合并之后版本库的文件进入了冲突状态，必须有人用编辑器解决冲突(或者是TortoiseMerge)，这个过程称作解决冲突，当此过程结束，你可以将冲突文件标示为解决，将会运行提交这个文件。" -#: source/TortoiseSVN_en.xml:9934(term) -msgid "Authentication data" -msgstr "认证数据" +#: source/TortoiseSVN_en.xml:12446(para) +msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." +msgstr "Subversion会为每个更新到工作副本的文件保留一份原始副本。如果你做出了修改，并希望取消修改，你可以使用revert回到原始状态。" -#: source/TortoiseSVN_en.xml:9936(para) -msgid "When you authenticate with a Subversion server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" -msgstr "当你在登陆某个Subversion服务器，填写认证信息时，用户名和密码也可以被保存在本地，你也就不用每次都输入了。但考虑到一些安全因素，你可能会有清除这些认证信息的愿望，或者你仅仅是想换个不同的用户名登陆...John知道你正在用他的机器么？(规范点儿，用你自己的用户名登陆版本库吧，伙计 *by Jax)" +#: source/TortoiseSVN_en.xml:12455(glossterm) +msgid "Revision" +msgstr "版本" -#: source/TortoiseSVN_en.xml:994(para) -msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." -msgstr "你已经阅读过了关于工作副本的内容，现在我们要讲一讲客户端怎样建立和使用它。" +#: source/TortoiseSVN_en.xml:12457(para) +msgid "Every time you commit a set of changes, you create one new revision in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N." +msgstr "每当你提交一组修改，你会在版本库创建一个修订版本，每个修订代表了版本库树在历史上某一点的状态，如果你希望回到历史，你可以回到以前的修订版本N。" -#: source/TortoiseSVN_en.xml:9943(para) -msgid "If you want to clear auth data for one particular server only, read for instructions on how to find the cached data." -msgstr "如果你仅想清除某个特定版本库的认证数据，读一下 有关怎样寻找缓存数据的说明。" +#: source/TortoiseSVN_en.xml:12464(para) +msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created." +msgstr "另一种情况下，你可以把修订看作修订版本建立的修改集。" -#: source/TortoiseSVN_en.xml:9953(title) -msgid "Registry Settings" -msgstr "注册表设置" +#: source/TortoiseSVN_en.xml:12471(glossterm) +msgid "Revision Property (revprop)" +msgstr "版本属性(revprop)" -#: source/TortoiseSVN_en.xml:9955(primary) -msgid "registry" -msgstr "注册表" +#: source/TortoiseSVN_en.xml:12473(para) +msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: svn:date svn:author svn:log which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone." +msgstr "就像文件，版本库的每个修订也可以有属性。一些特殊的修订属性会在修订版本创建时自动生成，例如: svn:date svn:author svn:log代表了提交的时间，提交者和日志信息。这些属性可以编辑，但是这些属性都不是版本控制的，所以任何修改都是永久的，不可回退的。" -#: source/TortoiseSVN_en.xml:9957(para) -msgid "A few infrequently used settings are available only by editing the registry directly." -msgstr "一些极不常用的设置只有通过直接修改注册表的方式才能生效。" +#: source/TortoiseSVN_en.xml:12485(glossterm) +msgid "SVN" +msgstr "SVN" -#: source/TortoiseSVN_en.xml:9965(para) -msgid "You can specify a different location for the Subversion configuration file using registry location HKCU\\Software\\TortoiseSVN\\ConfigDir. This will affect all TortoiseSVN operations." -msgstr "通过编辑注册表 HKCU\\Software\\TortoiseSVN\\ConfigDir，你可以为Subversion的配置文件指定一个不同位置。这将影响到TSVN的所有操作。" +#: source/TortoiseSVN_en.xml:12487(para) +msgid "A frequently-used abbreviation for Subversion." +msgstr "Subversion的常见缩写形式。" -#: source/TortoiseSVN_en.xml:9974(term) -msgid "Cache Tray Icon" -msgstr "缓存托盘图标" +#: source/TortoiseSVN_en.xml:12490(para) +msgid "The name of the Subversion custom protocol used by the svnserve repository server." +msgstr "Subversion的svnserve版本库服务器使用的自定义协议名称。" -#: source/TortoiseSVN_en.xml:9976(para) -msgid "To add a cache tray icon for the TSVNCache program, create a DWORD key with a value of 1 at HKCU\\Software\\TortoiseSVN\\CacheTrayIcon. This is really only useful for developers as it allows you to terminate the program gracefully." -msgstr "要为TSVNCache程序添加一个缓存托盘图标，先在 HKCU\\Software\\TortoiseSVN\\CacheTrayIcon 的位置，创建一个 DWORD 值，取值为1。这确实只对开发者才有点用处，因为它允许你来优雅地关闭TSVNCache，而不是在进程列表里kill掉它。(托盘图标可以显示当前已缓存了的文件夹数目 *by Jax)" +#: source/TortoiseSVN_en.xml:12499(para) +msgid "Just as Update-to-revision changes the time window of a working copy to look at a different point in history, so Switch changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred." +msgstr "就像Update-to-revision从历史上改变了工作副本的视点，Switch改变了工作副本空间上的视点。当主干和分支只有微小差别时，这个命令非常有用，你可以在目录之间跳转，而只会有很小区别需要传输。" -#: source/TortoiseSVN_en.xml:9988(title) -msgid "Subversion Working Folders" -msgstr "Subversion 的工作文件夹" +#: source/TortoiseSVN_en.xml:12513(para) +msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." +msgstr "这个命令将最新的修改从版本库下载到工作副本，合并其他人的修改和工作副本的本地修改。" -#: source/TortoiseSVN_en.xml:999(para) -msgid "A Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." -msgstr "一个 Subversion 工作副本是你本地机器一个普通的目录，保存着一些文件，你可以任意的编辑文件，而且如果是源代码文件，你可以像平常一样编译，你的工作副本是你的私有工作区，在你明确的做了特定操作之前，Subversion 不会把你的修改与其他人的合并，也不会把你的修改展示给别人。" +#: source/TortoiseSVN_en.xml:12521(glossterm) +msgid "Working Copy" +msgstr "工作副本" -#: source/TortoiseSVN_en.xml:9990(primary) -msgid ".svn folder" -msgstr "名为 .svn 的文件夹" +#: source/TortoiseSVN_en.xml:12523(para) +msgid "This is your local sandbox, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a Checkout from a repository, and you feed your changes back into the repository using Commit." +msgstr "这是你的本地沙盒，这个区域是你工作在版本控制文件的地方，它一般存在于你的本地磁盘，你可以使用Checkout从版本库创建一个工作副本，然后使用Commit将修改传递回版本库。" -#: source/TortoiseSVN_en.xml:9993(primary) -msgid "_svn folder" -msgstr "名为 _svn 的文件夹" +#. Put one translator per line, in the form of NAME . +#: source/TortoiseSVN_en.xml:0(None) +msgid "translator-credits" +msgstr "" +"Dongsheng Song \n" +"rocksun \n" +"Stan \n" +"xingyu.wang \n" +"Tan Ruyan \n" +"liuheqi \n" +"Jaxx_chen \n" +"sunjing \n" +"kkeric \n" +"lulu2me \n" +"yasakya \n" +"amo " -#: source/TortoiseSVN_en.xml:9995(para) -msgid "VS.NET when used with web projects can't handle the .svn folders that Subversion uses to store its internal information. This is not a bug in Subversion. The bug is in VS.NET and the frontpage extensions it uses." -msgstr "在使用VS.NET环境做web工程时，遇到.svn文件夹会出问题，但Subversion是要用这些文件夹来储存自己的内部信息的。这可不是Subversion的bug，这bug是VS.NET和它使用的frontpage扩展带来的。" +#. Place the translation of 'translation' here. +#: source/TortoiseSVN_en.xml:0(None) +msgid "translator-translation" +msgstr "译者" -- 2.11.4.GIT